From ed34886cace347b02d133c63c8f1d16f0991d468 Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Thu, 20 Jul 2023 15:42:39 -0400
Subject: [PATCH 01/28] fixes #60 and #61, adding delete endpoints

---
 .../v2/modules/phenotype/ImagesApi.java       |  72 +++++++++-
 .../v2/modules/phenotype/ObservationsApi.java |  71 ++++++++-
 .../v2/modules/phenotype/ImagesApiTest.java   |  20 +++
 .../phenotype/ObservationsApiTest.java        |  31 +++-
 .../response/BrAPIImageDeleteResponse.java    | 133 +++++++++++++++++
 .../BrAPIImageDeleteResponseResult.java       |  91 ++++++++++++
 .../BrAPIObservationDeleteResponse.java       | 135 ++++++++++++++++++
 .../BrAPIObservationDeleteResponseResult.java |  92 ++++++++++++
 8 files changed, 639 insertions(+), 6 deletions(-)
 create mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIImageDeleteResponse.java
 create mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIImageDeleteResponseResult.java
 create mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIObservationDeleteResponse.java
 create mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIObservationDeleteResponseResult.java

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ImagesApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ImagesApi.java
index db0b8826..c6c6b926 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ImagesApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ImagesApi.java
@@ -35,6 +35,7 @@
 
 import okhttp3.Call;
 import org.brapi.v2.model.pheno.response.BrAPIObservationUnitListResponse;
+import org.brapi.v2.model.pheno.response.BrAPIImageDeleteResponse;
 
 public class ImagesApi {
     private BrAPIClient apiClient;
@@ -448,9 +449,6 @@ public Call imagesPostAsync(List<BrAPIImage> body, final ApiCallback<BrAPIImageL
     /**
      * Build call for searchImagesPost
      * @param body  (optional)
-
-
-
      * @return Call to execute
      * @throws ApiException If fail to serialize the request body object
      */
@@ -600,4 +598,72 @@ public Call searchImagesSearchResultsDbIdGetAsync(String searchResultsDbId, Inte
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
+    /**
+     * Build call for deleteImage
+     * @param body  (optional)
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     */
+    private Call deleteImagesPostCall(BrAPIImageSearchRequest body) throws ApiException {
+        if(body == null) {
+        	throw new IllegalArgumentException("body cannot be null");
+        }
+        Object localVarPostBody = body;
+        
+        // create path and map variables
+        String localVarPath = "/delete/images";
+
+        Map<String, String> localVarQueryParams = new HashMap<>();
+        Map<String, String> localVarCollectionQueryParams = new HashMap<>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        
+        
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            "application/json"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] { "AuthorizationToken" };
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames);
+    }
+
+    /**
+     * delete a set of images based on search criteria
+     * @param body  (optional)
+
+     * @return ApiResponse&lt;ImageListResponse&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<BrAPIImageDeleteResponse> deleteImagesPost(BrAPIImageSearchRequest body) throws ApiException {
+        Call call = deleteImagesPostCall(body);
+        Type localVarReturnType = new TypeToken<BrAPIImageDeleteResponse>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     * 
+     * delete a set of images based on search criteria
+     * @param body  (optional)
+
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call deleteImagesPostAsync(BrAPIImageSearchRequest body, final ApiCallback<BrAPIImageListResponse> callback) throws ApiException {
+        Call call = deleteImagesPostCall(body);
+        Type localVarReturnType = new TypeToken<BrAPIImageDeleteResponse>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationsApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationsApi.java
index e0331f0c..acd4987d 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationsApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationsApi.java
@@ -32,11 +32,11 @@
 import org.brapi.v2.model.BrAPIAcceptedSearchResponse;
 import org.brapi.v2.model.BrAPIWSMIMEDataTypes;
 import org.brapi.v2.model.pheno.BrAPIObservation;
+import org.brapi.v2.model.pheno.response.BrAPIObservationDeleteResponse;
 import org.brapi.v2.model.pheno.response.BrAPIObservationListResponse;
 import org.brapi.v2.model.pheno.request.BrAPIObservationSearchRequest;
 import org.brapi.v2.model.pheno.response.BrAPIObservationSingleResponse;
 import org.brapi.v2.model.pheno.response.BrAPIObservationTableResponse;
-import org.brapi.v2.model.pheno.response.BrAPIObservationUnitListResponse;
 
 public class ObservationsApi {
     private BrAPIClient apiClient;
@@ -708,4 +708,73 @@ public Call searchObservationsSearchResultsDbIdGetAsync(BrAPIWSMIMEDataTypes acc
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
+    
+    /**
+     * Build call for deleteObservation
+     * @param body  (optional)
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     */
+    private Call deleteObservationsPostCall(BrAPIObservationSearchRequest body) throws ApiException {
+        if(body == null) {
+        	throw new IllegalArgumentException("body cannot be null");
+        }
+        Object localVarPostBody = body;
+        
+        // create path and map variables
+        String localVarPath = "/delete/observations";
+
+        Map<String, String> localVarQueryParams = new HashMap<>();
+        Map<String, String> localVarCollectionQueryParams = new HashMap<>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        
+        
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            "application/json"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] { "AuthorizationToken" };
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames);
+    }
+
+    /**
+     * delete a set of Observations based on search criteria
+     * @param body  (optional)
+
+     * @return ApiResponse&lt;ObservationListResponse&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<BrAPIObservationDeleteResponse> deleteObservationsPost(BrAPIObservationSearchRequest body) throws ApiException {
+        Call call = deleteObservationsPostCall(body);
+        Type localVarReturnType = new TypeToken<BrAPIObservationDeleteResponse>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     * 
+     * delete a set of Observations based on search criteria
+     * @param body  (optional)
+
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call deleteObservationsPostAsync(BrAPIObservationSearchRequest body, final ApiCallback<BrAPIObservationListResponse> callback) throws ApiException {
+        Call call = deleteObservationsPostCall(body);
+        Type localVarReturnType = new TypeToken<BrAPIObservationDeleteResponse>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
 }
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ImagesApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ImagesApiTest.java
index 7fcda15b..35b58660 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ImagesApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ImagesApiTest.java
@@ -22,9 +22,11 @@
 import org.brapi.v2.model.pheno.request.BrAPIImageSearchRequest;
 import org.brapi.v2.model.pheno.response.BrAPIImageSingleResponse;
 import org.brapi.v2.model.pheno.response.BrAPIObservationUnitListResponse;
+import org.brapi.v2.model.pheno.response.BrAPIImageDeleteResponse;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.Assert.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.List;
@@ -240,4 +242,22 @@ public void searchImagesSearchResultsDbIdGetTest() throws ApiException {
 
 		// TODO: test validations
 	}
+	
+	@Test
+	public void deleteImagesPostTest() throws ApiException {
+		
+		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
+			ApiResponse<BrAPIImageDeleteResponse> res = api.deleteImagesPost(null);
+		});
+		
+		BrAPIImageSearchRequest body = new BrAPIImageSearchRequest();
+		ApiResponse<BrAPIImageDeleteResponse> response = api.deleteImagesPost(body);
+		
+		assertNotNull(response);
+		assertNotNull(response.getBody());
+		assertNotNull(response.getBody().getMetadata());
+		assertNotNull(response.getBody().getResult());
+		assertNotNull(response.getBody().getResult().getImageDbIds());
+		// TODO: test validations
+	}
 }
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ObservationsApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ObservationsApiTest.java
index d3e02326..b10064d6 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ObservationsApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ObservationsApiTest.java
@@ -20,13 +20,15 @@
 import org.brapi.v2.model.BrAPIAcceptedSearchResponse;
 import org.brapi.v2.model.BrAPIWSMIMEDataTypes;
 import org.brapi.v2.model.pheno.BrAPIObservation;
+import org.brapi.v2.model.pheno.response.BrAPIObservationDeleteResponse;
 import org.brapi.v2.model.pheno.response.BrAPIObservationListResponse;
 import org.brapi.v2.model.pheno.request.BrAPIObservationSearchRequest;
 import org.brapi.v2.model.pheno.response.BrAPIObservationSingleResponse;
 import org.brapi.v2.model.pheno.response.BrAPIObservationTableResponse;
-import org.brapi.v2.model.pheno.response.BrAPIObservationUnitListResponse;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.Assert.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.time.OffsetDateTime;
@@ -39,8 +41,15 @@
  */
 public class ObservationsApiTest {
 
-	private final ObservationsApi api = new ObservationsApi();
+	private static ObservationsApi api;
 
+	@BeforeAll
+	public static void setup() throws ApiException {
+		api = new ObservationsApi();
+		api.getApiClient().authenticate((v) -> {
+			return "XXXX";
+		});
+	}
 	/**
 	 * Get a filtered set of Observations
 	 *
@@ -259,6 +268,24 @@ public void searchObservationsSearchResultsDbIdGetTest() throws ApiException {
 					searchResultsDbId, page, pageSize);
 		});
 
+		// TODO: test validations
+	}	
+	
+	@Test
+	public void deleteObservationsPostTest() throws ApiException {
+		
+		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
+			ApiResponse<BrAPIObservationDeleteResponse> res = api.deleteObservationsPost(null);
+		});
+		
+		BrAPIObservationSearchRequest body = new BrAPIObservationSearchRequest();
+		ApiResponse<BrAPIObservationDeleteResponse> response = api.deleteObservationsPost(body);
+		
+		assertNotNull(response);
+		assertNotNull(response.getBody());
+		assertNotNull(response.getBody().getMetadata());
+		assertNotNull(response.getBody().getResult());
+		assertNotNull(response.getBody().getResult().getObservationDbIds());
 		// TODO: test validations
 	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIImageDeleteResponse.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIImageDeleteResponse.java
new file mode 100644
index 00000000..7cccdfe7
--- /dev/null
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIImageDeleteResponse.java
@@ -0,0 +1,133 @@
+/*
+ * BrAPI-Phenotyping
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ *
+ * OpenAPI spec version: 2.1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package org.brapi.v2.model.pheno.response;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.brapi.v2.model.BrAPIResponse;
+import org.brapi.v2.model.BrAPIContext;
+import org.brapi.v2.model.BrAPIMetadata;
+/**
+ * ImageDeleteResponse
+ */
+
+public class BrAPIImageDeleteResponse implements BrAPIResponse<BrAPIImageDeleteResponseResult> {
+	@JsonProperty("@context")
+    private BrAPIContext _atContext = null;
+
+	@JsonProperty("metadata")
+    private BrAPIMetadata metadata = null;
+
+	@JsonProperty("result")
+    private BrAPIImageDeleteResponseResult result = null;
+
+    public BrAPIImageDeleteResponse _atContext(BrAPIContext _atContext) {
+        this._atContext = _atContext;
+        return this;
+    }
+
+    /**
+     * Get _atContext
+     *
+     * @return _atContext
+     **/
+    public BrAPIContext getAtContext() {
+        return _atContext;
+    }
+
+    public void setAtContext(BrAPIContext _atContext) {
+        this._atContext = _atContext;
+    }
+
+    public BrAPIImageDeleteResponse metadata(BrAPIMetadata metadata) {
+        this.metadata = metadata;
+        return this;
+    }
+
+    /**
+     * Get metadata
+     *
+     * @return metadata
+     **/
+    public BrAPIMetadata getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(BrAPIMetadata metadata) {
+        this.metadata = metadata;
+    }
+
+    public BrAPIImageDeleteResponse result(BrAPIImageDeleteResponseResult result) {
+        this.result = result;
+        return this;
+    }
+
+    /**
+     * Get result
+     *
+     * @return result
+     **/
+    public BrAPIImageDeleteResponseResult getResult() {
+        return result;
+    }
+
+    public void setResult(BrAPIImageDeleteResponseResult result) {
+        this.result = result;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        BrAPIImageDeleteResponse imageDeleteResponse = (BrAPIImageDeleteResponse) o;
+        return Objects.equals(this._atContext, imageDeleteResponse._atContext) &&
+                Objects.equals(this.metadata, imageDeleteResponse.metadata) &&
+                Objects.equals(this.result, imageDeleteResponse.result);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(_atContext, metadata, result);
+    }
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ImageDeleteResponse {\n");
+
+        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
+        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
+        sb.append("    result: ").append(toIndentedString(result)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+
+}
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIImageDeleteResponseResult.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIImageDeleteResponseResult.java
new file mode 100644
index 00000000..92d82f6c
--- /dev/null
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIImageDeleteResponseResult.java
@@ -0,0 +1,91 @@
+/*
+ * BrAPI-Phenotyping
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ *
+ * OpenAPI spec version: 2.1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package org.brapi.v2.model.pheno.response;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * ImageDeleteResponseResult
+ */
+public class BrAPIImageDeleteResponseResult {
+	@JsonProperty("imageDbIds")
+    private List<String> imageDbIds = new ArrayList<String>();
+
+    public BrAPIImageDeleteResponseResult imageDbIds(List<String> imageDbIds) {
+        this.imageDbIds = imageDbIds;
+        return this;
+    }
+
+    public BrAPIImageDeleteResponseResult addImageDbIdsItem(String imageDbIdsItem) {
+        this.imageDbIds.add(imageDbIdsItem);
+        return this;
+    }
+
+    /**
+     * The unique ids of the Image records which have been successfully deleted
+     *
+     * @return imageDbIds
+     **/
+    public List<String> getImageDbIds() {
+        return imageDbIds;
+    }
+
+    public void setImageDbIds(List<String> imageDbIds) {
+        this.imageDbIds = imageDbIds;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        BrAPIImageDeleteResponseResult imageDeleteResponseResult = (BrAPIImageDeleteResponseResult) o;
+        return Objects.equals(this.imageDbIds, imageDeleteResponseResult.imageDbIds);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(imageDbIds);
+    }
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ImageDeleteResponseResult {\n");
+
+        sb.append("    imageDbIds: ").append(toIndentedString(imageDbIds)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+
+}
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIObservationDeleteResponse.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIObservationDeleteResponse.java
new file mode 100644
index 00000000..6b4831bb
--- /dev/null
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIObservationDeleteResponse.java
@@ -0,0 +1,135 @@
+/*
+ * BrAPI-Phenotyping
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ *
+ * OpenAPI spec version: 2.1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package org.brapi.v2.model.pheno.response;
+
+import org.brapi.v2.model.BrAPIContext;
+import org.brapi.v2.model.BrAPIMetadata;
+import org.brapi.v2.model.BrAPIResponse;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+/**
+ * ObservationDeleteResponse
+ */
+
+public class BrAPIObservationDeleteResponse  implements BrAPIResponse<BrAPIObservationDeleteResponseResult>{
+	@JsonProperty("@context")
+    private BrAPIContext _atContext = null;
+
+	@JsonProperty("metadata")
+    private BrAPIMetadata metadata = null;
+
+	@JsonProperty("result")
+    private BrAPIObservationDeleteResponseResult result = null;
+
+    public BrAPIObservationDeleteResponse _atContext(BrAPIContext _atContext) {
+        this._atContext = _atContext;
+        return this;
+    }
+
+    /**
+     * Get _atContext
+     *
+     * @return _atContext
+     **/
+    public BrAPIContext getAtContext() {
+        return _atContext;
+    }
+
+    public void setAtContext(BrAPIContext _atContext) {
+        this._atContext = _atContext;
+    }
+
+    public BrAPIObservationDeleteResponse metadata(BrAPIMetadata metadata) {
+        this.metadata = metadata;
+        return this;
+    }
+
+    /**
+     * Get metadata
+     *
+     * @return metadata
+     **/
+    public BrAPIMetadata getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(BrAPIMetadata metadata) {
+        this.metadata = metadata;
+    }
+
+    public BrAPIObservationDeleteResponse result(BrAPIObservationDeleteResponseResult result) {
+        this.result = result;
+        return this;
+    }
+
+    /**
+     * Get result
+     *
+     * @return result
+     **/
+    public BrAPIObservationDeleteResponseResult getResult() {
+        return result;
+    }
+
+    public void setResult(BrAPIObservationDeleteResponseResult result) {
+        this.result = result;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        BrAPIObservationDeleteResponse observationDeleteResponse = (BrAPIObservationDeleteResponse) o;
+        return Objects.equals(this._atContext, observationDeleteResponse._atContext) &&
+                Objects.equals(this.metadata, observationDeleteResponse.metadata) &&
+                Objects.equals(this.result, observationDeleteResponse.result);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(_atContext, metadata, result);
+    }
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ObservationDeleteResponse {\n");
+
+        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
+        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
+        sb.append("    result: ").append(toIndentedString(result)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+
+}
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIObservationDeleteResponseResult.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIObservationDeleteResponseResult.java
new file mode 100644
index 00000000..ee2c25e1
--- /dev/null
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIObservationDeleteResponseResult.java
@@ -0,0 +1,92 @@
+/*
+ * BrAPI-Phenotyping
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ *
+ * OpenAPI spec version: 2.1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package org.brapi.v2.model.pheno.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * ObservationDeleteResponseResult
+ */
+
+public class BrAPIObservationDeleteResponseResult {
+	@JsonProperty("observationDbIds")
+    private List<String> observationDbIds = new ArrayList<String>();
+
+    public BrAPIObservationDeleteResponseResult observationDbIds(List<String> observationDbIds) {
+        this.observationDbIds = observationDbIds;
+        return this;
+    }
+
+    public BrAPIObservationDeleteResponseResult addObservationDbIdsItem(String observationDbIdsItem) {
+        this.observationDbIds.add(observationDbIdsItem);
+        return this;
+    }
+
+    /**
+     * The unique ids of the Observation records which have been successfully deleted
+     *
+     * @return observationDbIds
+     **/
+    public List<String> getObservationDbIds() {
+        return observationDbIds;
+    }
+
+    public void setObservationDbIds(List<String> observationDbIds) {
+        this.observationDbIds = observationDbIds;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        BrAPIObservationDeleteResponseResult observationDeleteResponseResult = (BrAPIObservationDeleteResponseResult) o;
+        return Objects.equals(this.observationDbIds, observationDeleteResponseResult.observationDbIds);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(observationDbIds);
+    }
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ObservationDeleteResponseResult {\n");
+
+        sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+
+}

From c0fcdfefe314c2cfa894ccc68ebec345ea328ca2 Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Thu, 20 Jul 2023 16:25:20 -0400
Subject: [PATCH 02/28] fixes #63, #64, and #65, add new ontology endpoints

---
 .../v2/modules/phenotype/OntologiesApi.java   | 232 +++++++++++++++++-
 .../modules/phenotype/OntologiesApiTest.java  | 127 +++++++++-
 .../response/BrAPIOntologySingleResponse.java | 135 ++++++++++
 3 files changed, 484 insertions(+), 10 deletions(-)
 create mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIOntologySingleResponse.java

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/OntologiesApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/OntologiesApi.java
index 7b6ce1ba..da56addb 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/OntologiesApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/OntologiesApi.java
@@ -1,6 +1,6 @@
 /*
  * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/URL_Structure.md\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Response_Structure.md\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Date_Time_Encoding.md\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Location_Encoding.md\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Error_Handling.md\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Search_Services.md\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/URL_Structure.md\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Response_Structure.md\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Date_Time_Encoding.md\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Location_Encoding.md\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Error_Handling.md\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Search_Services.md\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic ontologies. This includes Ontology Units, Ontologies, Ontology Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
  *
  * OpenAPI spec version: 2.0
  * 
@@ -14,6 +14,7 @@
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.brapi.client.v2.ApiCallback;
@@ -22,7 +23,9 @@
 import org.brapi.client.v2.Configuration;
 import org.brapi.client.v2.model.exceptions.ApiException;
 import org.brapi.client.v2.model.queryParams.phenotype.OntologyQueryParams;
+import org.brapi.v2.model.pheno.BrAPIOntology;
 import org.brapi.v2.model.pheno.response.BrAPIOntologyListResponse;
+import org.brapi.v2.model.pheno.response.BrAPIOntologySingleResponse;
 
 import com.google.gson.reflect.TypeToken;
 
@@ -95,7 +98,7 @@ private Call ontologiesGetCall(OntologyQueryParams queryParams) throws ApiExcept
     
     /**
      * Get the Ontologies
-     * Call to retrieve a list of observation variable ontologies available in the system.
+     * Call to retrieve a list of ontology variable ontologies available in the system.
      * @param queryParams
      * @return ApiResponse&lt;OntologyListResponse&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
@@ -108,7 +111,7 @@ public ApiResponse<BrAPIOntologyListResponse> ontologiesGet(OntologyQueryParams
 
     /**
      * Get the Ontologies (asynchronously)
-     * Call to retrieve a list of observation variable ontologies available in the system.
+     * Call to retrieve a list of ontology variable ontologies available in the system.
      * @param queryParams
      * @param callback The callback to be executed when the API call finishes
      * @return The request call
@@ -120,4 +123,227 @@ public Call ontologiesGetAsync(OntologyQueryParams queryParams, final ApiCallbac
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
+    
+
+    /**
+     * Build call for ontologiesOntologyDbIdGet
+     * @param ontologyDbId The unique ID of an ontology (required)
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     */
+    private Call ontologiesOntologyDbIdGetCall(String ontologyDbId) throws ApiException {
+        if(ontologyDbId == null) {
+        	throw new IllegalArgumentException("ontologyDbId cannot be null");
+        }
+        Object localVarPostBody = null;
+        
+        // create path and map variables
+        String localVarPath = "/ontologies/{ontologyDbId}"
+            .replaceAll("\\{" + "ontologyDbId" + "\\}", apiClient.escapeString(ontologyDbId));
+
+        Map<String, String> localVarQueryParams = new HashMap<>();
+        Map<String, String> localVarCollectionQueryParams = new HashMap<>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        
+        
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] { "AuthorizationToken" };
+        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames);
+    }
+
+    /**
+     * Get the details of a specific Ontologies
+     * Get the details of a specific Ontologies  ontologyTimestamp should be ISO8601 format with timezone -&gt; YYYY-MM-DDThh:mm:ss+hhmm
+     * @param ontologyDbId The unique ID of an ontology (required)
+
+     * @return ApiResponse&lt;OntologiesingleResponse&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<BrAPIOntologySingleResponse> ontologiesOntologyDbIdGet(String ontologyDbId) throws ApiException {
+        Call call = ontologiesOntologyDbIdGetCall(ontologyDbId);
+        Type localVarReturnType = new TypeToken<BrAPIOntologySingleResponse>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     * Get the details of a specific Ontologies (asynchronously)
+     * Get the details of a specific Ontologies  ontologyTimestamp should be ISO8601 format with timezone -&gt; YYYY-MM-DDThh:mm:ss+hhmm
+     * @param ontologyDbId The unique ID of an ontology (required)
+
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call ontologiesOntologyDbIdGetAsync(String ontologyDbId, final ApiCallback<BrAPIOntologySingleResponse> callback) throws ApiException {
+        Call call = ontologiesOntologyDbIdGetCall(ontologyDbId);
+        Type localVarReturnType = new TypeToken<BrAPIOntologySingleResponse>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
+    /**
+     * Build call for ontologiesOntologyDbIdPut
+     * @param ontologyDbId The unique ID of an ontology (required)
+     * @param body  (optional)
+
+
+
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     */
+    private Call ontologiesOntologyDbIdPutCall(String ontologyDbId, BrAPIOntology body) throws ApiException {
+        if(ontologyDbId == null) {
+        	throw new IllegalArgumentException("ontologyDbId cannot be null");
+        }
+        if(body == null) {
+        	throw new IllegalArgumentException("body cannot be null");
+        }
+        Object localVarPostBody = body;
+        
+        // create path and map variables
+        String localVarPath = "/ontologies/{ontologyDbId}"
+            .replaceAll("\\{" + "ontologyDbId" + "\\}", apiClient.escapeString(ontologyDbId));
+
+        Map<String, String> localVarQueryParams = new HashMap<>();
+        Map<String, String> localVarCollectionQueryParams = new HashMap<>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        
+        
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            "application/json"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] { "AuthorizationToken" };
+        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames);
+    }
+
+    /**
+     * Update an existing Ontology
+     * Update an existing Ontology
+     * @param ontologyDbId The unique ID of an ontology (required)
+     * @param body  (optional)
+
+     * @return ApiResponse&lt;OntologiesingleResponse&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<BrAPIOntologySingleResponse> ontologiesOntologyDbIdPut(String ontologyDbId, BrAPIOntology body) throws ApiException {
+        Call call = ontologiesOntologyDbIdPutCall(ontologyDbId, body);
+        Type localVarReturnType = new TypeToken<BrAPIOntologySingleResponse>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     * Update an existing Ontology (asynchronously)
+     * Update an existing Ontology
+     * @param ontologyDbId The unique ID of an ontology (required)
+     * @param body  (optional)
+
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call ontologiesOntologyDbIdPutAsync(String ontologyDbId, BrAPIOntology body, final ApiCallback<BrAPIOntologySingleResponse> callback) throws ApiException {
+        Call call = ontologiesOntologyDbIdPutCall(ontologyDbId, body);
+        Type localVarReturnType = new TypeToken<BrAPIOntologySingleResponse>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
+    /**
+     * Build call for ontologiesPost
+     * @param body  (optional)
+
+
+
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     */
+    private Call ontologiesPostCall(List<BrAPIOntology> body) throws ApiException {
+        if(body == null) {
+        	throw new IllegalArgumentException("body cannot be null");
+        }
+        Object localVarPostBody = body;
+        
+        // create path and map variables
+        String localVarPath = "/ontologies";
+
+        Map<String, String> localVarQueryParams = new HashMap<>();
+        Map<String, String> localVarCollectionQueryParams = new HashMap<>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        
+        
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            "application/json"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] { "AuthorizationToken" };
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames);
+    }
+
+    /**
+     * Add new Ontology entities
+     * Add new Ontology entities
+     * @param body  (optional)
+
+     * @return ApiResponse&lt;OntologyListResponse&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<BrAPIOntologyListResponse> ontologiesPost(List<BrAPIOntology> body) throws ApiException {
+        Call call = ontologiesPostCall(body);
+        Type localVarReturnType = new TypeToken<BrAPIOntologyListResponse>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     * Add new Ontology entities (asynchronously)
+     * Add new Ontology entities
+     * @param body  (optional)
+
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call ontologiesPostAsync(List<BrAPIOntology> body, final ApiCallback<BrAPIOntologyListResponse> callback) throws ApiException {
+        Call call = ontologiesPostCall(body);
+        Type localVarReturnType = new TypeToken<BrAPIOntologyListResponse>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
 }
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/OntologiesApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/OntologiesApiTest.java
index e2f553ea..22fed57f 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/OntologiesApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/OntologiesApiTest.java
@@ -1,6 +1,6 @@
 /*
  * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/URL_Structure.md\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Response_Structure.md\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Date_Time_Encoding.md\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Location_Encoding.md\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Error_Handling.md\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Search_Services.md\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/URL_Structure.md\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Response_Structure.md\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Date_Time_Encoding.md\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Location_Encoding.md\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Error_Handling.md\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Search_Services.md\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic ontologies. This includes Ontology Units, Ontologies, Ontology Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
  *
  * OpenAPI spec version: 2.0
  * 
@@ -12,10 +12,21 @@
 
 package org.brapi.client.v2.modules.phenotype;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.Arrays;
+import java.util.List;
+
 import org.brapi.client.v2.ApiResponse;
 import org.brapi.client.v2.model.exceptions.ApiException;
 import org.brapi.client.v2.model.queryParams.phenotype.OntologyQueryParams;
+import org.brapi.v2.model.pheno.BrAPIOntology;
 import org.brapi.v2.model.pheno.response.BrAPIOntologyListResponse;
+import org.brapi.v2.model.pheno.response.BrAPIOntologySingleResponse;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -23,25 +34,127 @@
  */
 public class OntologiesApiTest {
 
-    private final OntologiesApi api = new OntologiesApi();
+    private static OntologiesApi api;
+    
+	@BeforeAll
+	public static void setup() throws ApiException {
+		api = new OntologiesApi();
+		api.getApiClient().authenticate((v) -> {
+			return "XXXX";
+		});
+	}
 
     /**
      * Get the Ontologies
      *
-     * Call to retrieve a list of observation variable ontologies available in the system.
+     * Call to retrieve a list of ontology variable ontologies available in the system.
      *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
     public void ontologiesGetTest() throws ApiException {
-        String ontologyDbId = null;
-        Integer page = null;
-        Integer pageSize = null;
+        String ontologyDbId = "ontology_variable1";
+        Integer page = 0;
+        Integer pageSize = 2;
         
         OntologyQueryParams queryParams = new OntologyQueryParams();
+        queryParams.pageSize(pageSize);
+        queryParams.page(page);
+        queryParams.ontologyDbId(ontologyDbId);
         ApiResponse<BrAPIOntologyListResponse> response = api.ontologiesGet(queryParams);
 
-        // TODO: test validations
+        assertNotNull(response);
+        assertNotNull(response.getBody());
+        assertNotNull(response.getBody().getMetadata());
+        assertNotNull(response.getBody().getResult());
+        assertNotNull(response.getBody().getResult().getData());
+        assertEquals(response.getStatusCode(), 200);
+        assertTrue(response.getBody().getResult().getData().size() <= 2);
     }
+
+	/**
+	 * Get the details of a specific Ontologies
+	 *
+	 * Get the details of a specific Ontologies ontologyTimestamp should be
+	 * ISO8601 format with timezone -&gt; YYYY-MM-DDThh:mm:ss+hhmm
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void ontologiesOntologyDbIdGetTest() throws ApiException {
+        String ontologyDbId = "ontology_variable1";
+
+		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
+			ApiResponse<BrAPIOntologySingleResponse> res = api.ontologiesOntologyDbIdGet(null);
+		});
+
+		ApiResponse<BrAPIOntologySingleResponse> response = api.ontologiesOntologyDbIdGet(ontologyDbId);
+		
+        assertNotNull(response);
+        assertNotNull(response.getBody());
+        assertNotNull(response.getBody().getMetadata());
+        assertNotNull(response.getBody().getResult());
+        assertEquals(response.getStatusCode(), 200);
+        assertEquals(response.getBody().getResult().getOntologyDbId(), ontologyDbId);
+	}
+
+	/**
+	 * Update an existing Ontology
+	 *
+	 * Update an existing Ontology
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void ontologiesOntologyDbIdPutTest() throws ApiException {
+        String ontologyDbId = "ontology_variable1";
+        String ontologyName = "Ontology.org";
+		BrAPIOntology body = new BrAPIOntology();
+		body.setOntologyName(ontologyName);
+
+		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
+			ApiResponse<BrAPIOntologySingleResponse> res = api.ontologiesOntologyDbIdPut(null, null);
+		});
+
+		ApiResponse<BrAPIOntologySingleResponse> response = api.ontologiesOntologyDbIdPut(ontologyDbId, body);
+		
+        assertNotNull(response);
+        assertNotNull(response.getBody());
+        assertNotNull(response.getBody().getMetadata());
+        assertNotNull(response.getBody().getResult());
+        assertEquals(response.getStatusCode(), 200);
+        assertEquals(response.getBody().getResult().getOntologyDbId(), ontologyDbId);
+        assertEquals(response.getBody().getResult().getOntologyName(), ontologyName);
+	}
+
+	/**
+	 * Add new Ontology entities
+	 *
+	 * Add new Ontology entities
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void ontologiesPostTest() throws ApiException {
+        String ontologyName = "Ontology.org";
+		BrAPIOntology bodyItem = new BrAPIOntology();
+		bodyItem.setOntologyName(ontologyName);
+		
+		List<BrAPIOntology> body = Arrays.asList(bodyItem);
+
+		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
+			ApiResponse<BrAPIOntologyListResponse> res = api.ontologiesPost(null);
+		});
+
+		ApiResponse<BrAPIOntologyListResponse> response = api.ontologiesPost(body);
+
+        assertNotNull(response);
+        assertNotNull(response.getBody());
+        assertNotNull(response.getBody().getMetadata());
+        assertNotNull(response.getBody().getResult());
+        assertEquals(response.getStatusCode(), 200);
+        assertEquals(response.getBody().getResult().getData().size(), 1);
+        assertEquals(response.getBody().getResult().getData().get(0).getOntologyName(), ontologyName);
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIOntologySingleResponse.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIOntologySingleResponse.java
new file mode 100644
index 00000000..5266fd3a
--- /dev/null
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/response/BrAPIOntologySingleResponse.java
@@ -0,0 +1,135 @@
+/*
+ * BrAPI-Phenotyping
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ *
+ * OpenAPI spec version: 2.1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package org.brapi.v2.model.pheno.response;
+
+import java.util.Objects;
+
+import org.brapi.v2.model.BrAPIContext;
+import org.brapi.v2.model.BrAPIMetadata;
+import org.brapi.v2.model.pheno.BrAPIOntology;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * OntologySingleResponse
+ */
+
+public class BrAPIOntologySingleResponse {
+    @JsonProperty("@context")
+    private BrAPIContext _atContext = null;
+
+    @JsonProperty("metadata")
+    private BrAPIMetadata metadata = null;
+
+    @JsonProperty("result")
+    private BrAPIOntology result = null;
+
+    public BrAPIOntologySingleResponse _atContext(BrAPIContext _atContext) {
+        this._atContext = _atContext;
+        return this;
+    }
+
+    /**
+     * Get _atContext
+     *
+     * @return _atContext
+     **/
+    public BrAPIContext getAtContext() {
+        return _atContext;
+    }
+
+    public void setAtContext(BrAPIContext _atContext) {
+        this._atContext = _atContext;
+    }
+
+    public BrAPIOntologySingleResponse metadata(BrAPIMetadata metadata) {
+        this.metadata = metadata;
+        return this;
+    }
+
+    /**
+     * Get metadata
+     *
+     * @return metadata
+     **/
+    public BrAPIMetadata getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(BrAPIMetadata metadata) {
+        this.metadata = metadata;
+    }
+
+    public BrAPIOntologySingleResponse result(BrAPIOntology result) {
+        this.result = result;
+        return this;
+    }
+
+    /**
+     * Get result
+     *
+     * @return result
+     **/
+    public BrAPIOntology getResult() {
+        return result;
+    }
+
+    public void setResult(BrAPIOntology result) {
+        this.result = result;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        BrAPIOntologySingleResponse ontologySingleResponse = (BrAPIOntologySingleResponse) o;
+        return Objects.equals(this._atContext, ontologySingleResponse._atContext) &&
+                Objects.equals(this.metadata, ontologySingleResponse.metadata) &&
+                Objects.equals(this.result, ontologySingleResponse.result);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(_atContext, metadata, result);
+    }
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class OntologySingleResponse {\n");
+
+        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
+        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
+        sb.append("    result: ").append(toIndentedString(result)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+
+}

From 9b672e37603bc97367a239f427ac460198eec4f9 Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Wed, 16 Aug 2023 13:48:35 -0400
Subject: [PATCH 03/28] solves issues #66, #67, #68, #69, and #70

---
 .../germplasm/PedigreeQueryParams.java        |  61 ++
 .../v2/modules/germplasm/PedigreeApi.java     | 473 +++++++++
 .../org/brapi/client/v2/BrAPIClientTest.java  |   2 +
 .../modules/germplasm/PedigreeAPITests.java   | 177 ++++
 .../src/test/resources/sql/germplasm.sql      |   5 +
 .../brapi/v2/model/germ/BrAPIParentType.java  |   6 +-
 .../v2/model/germ/BrAPIPedigreeNode.java      | 653 ++++++++-----
 ...ts.java => BrAPIPedigreeNodeRelative.java} |  10 +-
 ...ngs.java => BrAPIPedigreeNodeSibling.java} |   8 +-
 .../germ/BrAPIPedigreeNode_Deprecated.java    | 292 ++++++
 .../request/BrAPIPedigreeSearchRequest.java   | 899 ++++++++++++++++++
 .../BrAPIGermplasmPedigreeResponse.java       |  12 +-
 .../response/BrAPIPedigreeListResponse.java   | 134 +++
 .../BrAPIPedigreeListResponseResult.java      |  94 ++
 14 files changed, 2569 insertions(+), 257 deletions(-)
 create mode 100644 brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/PedigreeQueryParams.java
 create mode 100644 brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/PedigreeApi.java
 create mode 100644 brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/PedigreeAPITests.java
 rename brapi-java-model/src/main/java/org/brapi/v2/model/germ/{BrAPIPedigreeNodeParents.java => BrAPIPedigreeNodeRelative.java} (88%)
 rename brapi-java-model/src/main/java/org/brapi/v2/model/germ/{BrAPIPedigreeNodeSiblings.java => BrAPIPedigreeNodeSibling.java} (88%)
 create mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode_Deprecated.java
 create mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIPedigreeSearchRequest.java
 create mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIPedigreeListResponse.java
 create mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIPedigreeListResponseResult.java

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/PedigreeQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/PedigreeQueryParams.java
new file mode 100644
index 00000000..eff4a575
--- /dev/null
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/PedigreeQueryParams.java
@@ -0,0 +1,61 @@
+/*
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.brapi.client.v2.model.queryParams.germplasm;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import lombok.experimental.SuperBuilder;
+
+import org.brapi.client.v2.model.queryParams.core.BrAPIQueryParams;
+
+
+@Getter
+@Setter
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(fluent=true)
+public class PedigreeQueryParams extends BrAPIQueryParams {
+
+    private String accessionNumber;
+    private String collection;
+    private String familyCode;
+    private String binomialName;
+    private String genus;
+    private String species;
+    private String synonym;
+    private Boolean includeParents;
+    private Boolean includeSiblings;
+    private Boolean includeProgeny;
+    private Boolean includeFullTree;
+    private Integer pedigreeDepth;
+    private Integer progenyDepth;
+    private String commonCropName;
+    private String programDbId;
+    private String trialDbId;
+    private String studyDbId;
+    private String germplasmDbId;
+    private String germplasmName;
+    private String germplasmPUI;
+    private String externalReferenceId;
+    private String externalReferenceSource;
+
+}
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/PedigreeApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/PedigreeApi.java
new file mode 100644
index 00000000..82760397
--- /dev/null
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/PedigreeApi.java
@@ -0,0 +1,473 @@
+/*
+ * BrAPI-Pedigree
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/URL_Structure.md\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Response_Structure.md\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Date_Time_Encoding.md\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Location_Encoding.md\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Error_Handling.md\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Search_Services.md\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Pedigree</h2> <div class=\"brapi-section-description\">The BrAPI Pedigree module contains entities related to pedigree management. This includes Pedigree, Pedigree Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Pedigree\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Pedigree\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapipedigree.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ *
+ * OpenAPI spec version: 2.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package org.brapi.client.v2.modules.germplasm;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.brapi.client.v2.ApiCallback;
+import org.brapi.client.v2.BrAPIClient;
+import org.brapi.client.v2.ApiResponse;
+import org.brapi.client.v2.Configuration;
+import org.brapi.client.v2.model.exceptions.ApiException;
+import org.brapi.client.v2.model.queryParams.germplasm.PedigreeQueryParams;
+import org.brapi.v2.model.BrAPIAcceptedSearchResponse;
+import org.brapi.v2.model.germ.response.BrAPIPedigreeListResponse;
+import org.brapi.v2.model.germ.BrAPIPedigreeNode;
+import org.brapi.v2.model.germ.request.BrAPIPedigreeSearchRequest;
+
+import com.google.gson.reflect.TypeToken;
+
+import okhttp3.Call;
+
+public class PedigreeApi {
+    private BrAPIClient apiClient;
+
+    public PedigreeApi() {
+        this(Configuration.getDefaultApiClient());
+    }
+
+    public PedigreeApi(BrAPIClient apiClient) {
+        this.apiClient = apiClient;
+    }
+
+    public BrAPIClient getApiClient() {
+        return apiClient;
+    }
+
+    public void setApiClient(BrAPIClient apiClient) {
+        this.apiClient = apiClient;
+    }
+
+    /**
+     * Build call for pedigreePedigreeDbIdPut
+     * @param pedigreeDbId The internal id of the pedigree (required)
+     * @param body  (optional)
+
+
+
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     */
+    private Call pedigreePutCall(Map<String, BrAPIPedigreeNode> body) throws ApiException {
+        if(body == null) {
+            throw new IllegalArgumentException("body cannot be null"); 
+        }
+        Object localVarPostBody = body;
+        
+        // create path and map variables
+        String localVarPath = "/pedigree";
+
+        Map<String, String> localVarQueryParams = new HashMap<>();
+        Map<String, String> localVarCollectionQueryParams = new HashMap<>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            "application/json"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] { "AuthorizationToken" };
+        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames);
+    }
+
+    /**
+     * Update the details of an existing Pedigree
+     * Pedigree Details by pedigreeDbId was merged with Pedigree Multi Crop Passport Data. The MCPD fields are optional and marked with the prefix [MCPD].
+     * @param pedigreeDbId The internal id of the pedigree (required)
+     * @param body  (optional)
+
+     * @return ApiResponse&lt;PedigreeSingleResponse&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<BrAPIPedigreeListResponse> pedigreePut(Map<String, BrAPIPedigreeNode> body) throws ApiException {
+        Call call = pedigreePutCall(body);
+        Type localVarReturnType = new TypeToken<BrAPIPedigreeListResponse>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     * Update the details of an existing Pedigree (asynchronously)
+     * Pedigree Details by pedigreeDbId was merged with Pedigree Multi Crop Passport Data. The MCPD fields are optional and marked with the prefix [MCPD].
+     * @param pedigreeDbId The internal id of the pedigree (required)
+     * @param body  (optional)
+
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call pedigreePutAsync(Map<String, BrAPIPedigreeNode> body, final ApiCallback<BrAPIPedigreeListResponse> callback) throws ApiException {
+        Call call = pedigreePutCall(body);
+        Type localVarReturnType = new TypeToken<BrAPIPedigreeListResponse>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
+    /**
+     * Build call for pedigreeGet
+     * @param queryParams
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     */
+    private Call pedigreeGetCall(PedigreeQueryParams queryParams) throws ApiException {
+        if(queryParams == null) {
+            throw new IllegalArgumentException("queryParams cannot be null"); 
+        }
+        Object localVarPostBody = null;
+        
+        // create path and map variables
+        String localVarPath = "/pedigree";
+
+        Map<String, String> localVarQueryParams = new HashMap<>();
+        Map<String, String> localVarCollectionQueryParams = new HashMap<>();
+        if (queryParams.accessionNumber() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "accessionNumber", queryParams.accessionNumber());
+        if (queryParams.collection() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "collection", queryParams.collection());
+        if (queryParams.familyCode() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "familyCode", queryParams.familyCode());
+        if (queryParams.binomialName() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "binomialName", queryParams.binomialName());
+        if (queryParams.genus() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "genus", queryParams.genus());
+        if (queryParams.species() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "species", queryParams.species());
+        if (queryParams.synonym() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "synonym", queryParams.synonym());
+        if (queryParams.includeParents() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "includeParents", queryParams.includeParents());
+        if (queryParams.includeSiblings() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "includeSiblings", queryParams.includeSiblings());
+        if (queryParams.includeProgeny() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "includeProgeny", queryParams.includeProgeny());
+        if (queryParams.includeFullTree() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "includeFullTree", queryParams.includeFullTree());
+        if (queryParams.pedigreeDepth() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "pedigreeDepth", queryParams.pedigreeDepth());
+        if (queryParams.progenyDepth() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "progenyDepth", queryParams.progenyDepth());
+        if (queryParams.commonCropName() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "commonCropName", queryParams.commonCropName());
+        if (queryParams.programDbId() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "programDbId", queryParams.programDbId());
+        if (queryParams.trialDbId() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "trialDbId", queryParams.trialDbId());
+        if (queryParams.studyDbId() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "studyDbId", queryParams.studyDbId());
+        if (queryParams.germplasmDbId() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "germplasmDbId", queryParams.germplasmDbId());
+        if (queryParams.germplasmName() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "germplasmName", queryParams.germplasmName());        
+        if (queryParams.germplasmPUI() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "germplasmPUI", queryParams.germplasmPUI());
+        if (queryParams.externalReferenceId() != null) {
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceId());
+        }
+        if (queryParams.externalReferenceSource() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
+        if (queryParams.page() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "page", queryParams.page());
+        if (queryParams.pageSize() != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "pageSize", queryParams.pageSize());
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        
+        
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] { "AuthorizationToken" };
+        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames);
+    }
+
+    /**
+     * Get a filtered list of Pedigree
+     * Addresses these needs  - General pedigree search mechanism that accepts POST for complex queries   - Possibility to search pedigree by more parameters than those allowed by the existing pedigree search   - Possibility to get MCPD details by PUID rather than dbId
+     * @param queryParams
+     * @return ApiResponse&lt;PedigreeListResponse&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<BrAPIPedigreeListResponse> pedigreeGet(PedigreeQueryParams queryParams) throws ApiException {
+        Call call = pedigreeGetCall(queryParams);
+        Type localVarReturnType = new TypeToken<BrAPIPedigreeListResponse>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     * Get a filtered list of Pedigree (asynchronously)
+     * Addresses these needs  - General pedigree search mechanism that accepts POST for complex queries   - Possibility to search pedigree by more parameters than those allowed by the existing pedigree search   - Possibility to get MCPD details by PUID rather than dbId
+     * @param queryParams
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call pedigreeGetAsync(PedigreeQueryParams queryParams, final ApiCallback<BrAPIPedigreeListResponse> callback) throws ApiException {
+        Call call = pedigreeGetCall(queryParams);
+        Type localVarReturnType = new TypeToken<BrAPIPedigreeListResponse>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
+    /**
+     * Build call for pedigreePost
+     * @param body  (optional)
+
+
+
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     */
+    private Call pedigreePostCall(List<BrAPIPedigreeNode> body) throws ApiException {
+        if(body == null) {
+            throw new IllegalArgumentException("body cannot be null"); 
+        }
+        Object localVarPostBody = body;
+        
+        // create path and map variables
+        String localVarPath = "/pedigree";
+
+        Map<String, String> localVarQueryParams = new HashMap<>();
+        Map<String, String> localVarCollectionQueryParams = new HashMap<>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        
+        
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            "application/json"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] { "AuthorizationToken" };
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames);
+    }
+
+    /**
+     * Create new Pedigree entities on this server
+     * Create new Pedigree entities on this server
+     * @param body  (optional)
+
+     * @return ApiResponse&lt;PedigreeListResponse&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<BrAPIPedigreeListResponse> pedigreePost(List<BrAPIPedigreeNode> body) throws ApiException {
+        Call call = pedigreePostCall(body);
+        Type localVarReturnType = new TypeToken<BrAPIPedigreeListResponse>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     * Create new Pedigree entities on this server (asynchronously)
+     * Create new Pedigree entities on this server
+     * @param body  (optional)
+
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call pedigreePostAsync(List<BrAPIPedigreeNode> body, final ApiCallback<BrAPIPedigreeListResponse> callback) throws ApiException {
+        Call call = pedigreePostCall(body);
+        Type localVarReturnType = new TypeToken<BrAPIPedigreeListResponse>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
+    /**
+     * Build call for searchPedigreePost
+     * @param body  (optional)
+
+
+
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     */
+    private Call searchPedigreePostCall(BrAPIPedigreeSearchRequest body) throws ApiException {
+        if(body == null) {
+            throw new IllegalArgumentException("body cannot be null"); 
+        }
+        Object localVarPostBody = body;
+        
+        // create path and map variables
+        String localVarPath = "/search/pedigree";
+
+        Map<String, String> localVarQueryParams = new HashMap<>();
+        Map<String, String> localVarCollectionQueryParams = new HashMap<>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        
+        
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            "application/json"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] { "AuthorizationToken" };
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames);
+    }
+
+    /**
+     * Submit a search request for Pedigree
+     * Search for a set of pedigree based on some criteria  Addresses these needs   - General pedigree search mechanism that accepts POST for complex queries   - Possibility to search pedigree by more parameters than those allowed by the existing pedigree search   - Possibility to get MCPD details by PUID rather than dbId  See Search Services for additional implementation details.
+     * @param body  (optional)
+
+     * @return ApiResponse&lt;PedigreeListResponse&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Pair<Optional<BrAPIPedigreeListResponse>, Optional<BrAPIAcceptedSearchResponse>>> searchPedigreePost(BrAPIPedigreeSearchRequest body) throws ApiException {
+        Call call = searchPedigreePostCall(body);
+        Type localVarReturnType = new TypeToken<BrAPIPedigreeListResponse>(){}.getType();
+        return apiClient.executeSearch(call, localVarReturnType);
+    }
+
+    /**
+     * Submit a search request for Pedigree (asynchronously)
+     * Search for a set of pedigree based on some criteria  Addresses these needs   - General pedigree search mechanism that accepts POST for complex queries   - Possibility to search pedigree by more parameters than those allowed by the existing pedigree search   - Possibility to get MCPD details by PUID rather than dbId  See Search Services for additional implementation details.
+     * @param body  (optional)
+
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call searchPedigreePostAsync(BrAPIPedigreeSearchRequest body, final ApiCallback<BrAPIPedigreeListResponse> callback) throws ApiException {
+        Call call = searchPedigreePostCall(body);
+        Type localVarReturnType = new TypeToken<BrAPIPedigreeListResponse>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
+    /**
+     * Build call for searchPedigreeSearchResultsDbIdGet
+     * @param searchResultsDbId Unique identifier which references the search results (required)
+     * @param page Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
+     * @param pageSize The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
+
+
+
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     */
+    private Call searchPedigreeSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize) throws ApiException {
+        if(searchResultsDbId == null) {
+            throw new IllegalArgumentException("searchResultsDbId cannot be null"); 
+        }
+        Object localVarPostBody = null;
+        
+        // create path and map variables
+        String localVarPath = "/search/pedigree/{searchResultsDbId}"
+            .replaceAll("\\{" + "searchResultsDbId" + "\\}", apiClient.escapeString(searchResultsDbId));
+
+        Map<String, String> localVarQueryParams = new HashMap<>();
+        Map<String, String> localVarCollectionQueryParams = new HashMap<>();
+        if (page != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "page", page);
+        if (pageSize != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "pageSize", pageSize);
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        
+        
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] { "AuthorizationToken" };
+        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames);
+    }
+
+    /**
+     * Get the results of a Pedigree search request
+     * See Search Services for additional implementation details.  Addresses these needs:   1. General pedigree search mechanism that accepts POST for complex queries   2. possibility to search pedigree by more parameters than those allowed by the existing pedigree search   3. possibility to get MCPD details by PUID rather than dbId
+     * @param searchResultsDbId Unique identifier which references the search results (required)
+     * @param page Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
+     * @param pageSize The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
+
+     * @return ApiResponse&lt;PedigreeListResponse&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Pair<Optional<BrAPIPedigreeListResponse>, Optional<BrAPIAcceptedSearchResponse>>> searchPedigreeSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize) throws ApiException {
+        Call call = searchPedigreeSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize);
+        Type localVarReturnType = new TypeToken<BrAPIPedigreeListResponse>(){}.getType();
+        return apiClient.executeSearch(call, localVarReturnType);
+    }
+
+    /**
+     * Get the results of a Pedigree search request (asynchronously)
+     * See Search Services for additional implementation details.  Addresses these needs:   1. General pedigree search mechanism that accepts POST for complex queries   2. possibility to search pedigree by more parameters than those allowed by the existing pedigree search   3. possibility to get MCPD details by PUID rather than dbId
+     * @param searchResultsDbId Unique identifier which references the search results (required)
+     * @param page Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
+     * @param pageSize The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
+
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call searchPedigreeSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, final ApiCallback<BrAPIPedigreeListResponse> callback) throws ApiException {
+        Call call = searchPedigreeSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize);
+        Type localVarReturnType = new TypeToken<BrAPIPedigreeListResponse>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
+}
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/BrAPIClientTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/BrAPIClientTest.java
index fb8ab94e..0aaff245 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/BrAPIClientTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/BrAPIClientTest.java
@@ -57,6 +57,7 @@ public BrAPIClientTest() {
                 .waitingFor(Wait.forLogMessage(".*LOG:  database system is ready to accept connections.*", 1).withStartupTimeout(Duration.of(2, ChronoUnit.MINUTES)));
 
         brapiContainer = new GenericContainer<>("breedinginsight/brapi-java-server:develop")
+//          brapiContainer = new GenericContainer<>("brapicoordinatorselby/brapi-java-server:v2")
                 .withNetwork(network)
                 .withImagePullPolicy(PullPolicy.alwaysPull())
                 .withExposedPorts(8080)
@@ -68,6 +69,7 @@ public BrAPIClientTest() {
                 .withEnv("BRAPI_DB_USER", "postgres")
                 .withEnv("BRAPI_DB_PASSWORD", "postgres")
                 .withClasspathResourceMapping("brapi/properties/application.properties", "/home/brapi/properties/application.properties", BindMode.READ_ONLY)
+                .withClasspathResourceMapping("sql/", "/home/brapi/sql/", BindMode.READ_ONLY)
                 .waitingFor(Wait.forLogMessage(".*: Started BrapiTestServer in \\d*.\\d* seconds.*", 1).withStartupTimeout(Duration.ofMinutes(1)));
 
         dbContainer.start();
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/PedigreeAPITests.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/PedigreeAPITests.java
new file mode 100644
index 00000000..94f97352
--- /dev/null
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/PedigreeAPITests.java
@@ -0,0 +1,177 @@
+/*
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.brapi.client.v2.modules.germplasm;
+
+import org.brapi.client.v2.ApiResponse;
+import org.brapi.client.v2.BrAPIClientTest;
+import org.brapi.client.v2.model.exceptions.ApiException;
+import org.brapi.client.v2.model.queryParams.germplasm.PedigreeQueryParams;
+import org.brapi.v2.model.BrAPIExternalReference;
+import org.brapi.v2.model.germ.BrAPIPedigreeNode;
+import org.brapi.v2.model.germ.response.BrAPIPedigreeListResponse;
+import org.junit.jupiter.api.*;
+
+import java.util.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class PedigreeAPITests extends BrAPIClientTest {
+
+    private PedigreeApi pedigreeAPI = new PedigreeApi(this.apiClient);
+    
+    //From src/test/resources/sql/germplasm.sql
+    private LinkedList<String> germplasmDbIds = new LinkedList<String>(Arrays.asList("pedigreeTest1", "pedigreeTest2", "pedigreeTest3", "pedigreeTest4"));
+    
+    @Test
+    public void getPedigreeSuccess() throws Exception {
+
+        ApiResponse<BrAPIPedigreeListResponse> pedigree = this.pedigreeAPI.pedigreeGet(new PedigreeQueryParams());
+
+        assertEquals(false, pedigree.getBody().getResult().getData().isEmpty(), "List of pedigree was empty");
+    }
+
+    @Test
+    public void getsPedigreePageFilter() throws Exception {
+        PedigreeQueryParams baseRequest = PedigreeQueryParams.builder()
+                .page(0)
+                .pageSize(1)
+                .build();
+
+        ApiResponse<BrAPIPedigreeListResponse> pedigree = this.pedigreeAPI.pedigreeGet(baseRequest);
+
+        assertEquals(true, pedigree.getBody().getResult().getData().size() == 1, "More than one pedigree was returned");
+    }
+
+    @Test
+    public void createPedigreeSuccess() throws Exception {
+
+        Map<String, String> additionalInfo = new HashMap<String, String>();
+        additionalInfo.put("test_key", "test_value");
+        List<BrAPIExternalReference> externalReferences = new ArrayList<>();
+        externalReferences.add(new BrAPIExternalReference()
+                .referenceID(UUID.randomUUID().toString())
+                .referenceSource("http://brapi.org")
+        );
+        BrAPIPedigreeNode pedigreeNode = new BrAPIPedigreeNode()
+                .additionalInfo(additionalInfo)
+                .defaultDisplayName("Resistant Tamatillo")
+                .externalReferences(externalReferences)
+                .germplasmDbId(germplasmDbIds.pop())
+                .germplasmPUI("0000000001")
+                .pedigreeString("A000003/A000002");
+
+        ApiResponse<BrAPIPedigreeListResponse> createdPedigree = this.pedigreeAPI.pedigreePost(Arrays.asList(pedigreeNode));
+
+        assertNotNull(createdPedigree);
+        BrAPIPedigreeNode pedigree = createdPedigree.getBody().getResult().getData().get(0);
+        assertEquals(true, pedigree.getGermplasmDbId() != null, "Pedigree Id was not parsed properly");
+        assertEquals(pedigreeNode.getPedigreeString(), pedigree.getPedigreeString(), "Pedigree Name was not parsed properly");
+    }
+
+    @Test
+    public void createMultiplePedigreeSuccess() throws Exception {
+
+        BrAPIPedigreeNode brApiPedigree1 = new BrAPIPedigreeNode().germplasmDbId(germplasmDbIds.pop());
+        BrAPIPedigreeNode brApiPedigree2 = new BrAPIPedigreeNode().germplasmDbId(germplasmDbIds.pop());
+        List<BrAPIPedigreeNode> brApiPedigreeList = new ArrayList<>();
+        brApiPedigreeList.add(brApiPedigree1);
+        brApiPedigreeList.add(brApiPedigree2);
+
+        ApiResponse<BrAPIPedigreeListResponse> createdPedigreeRes = this.pedigreeAPI.pedigreePost(brApiPedigreeList);
+
+        List<BrAPIPedigreeNode> createdPedigree = createdPedigreeRes.getBody().getResult().getData();
+        assertEquals(true, createdPedigree.size() == 2);
+        assertEquals(brApiPedigree1.getGermplasmDbId(), createdPedigree.get(0).getGermplasmDbId(), "Sent name and returned pedigree name does not match");
+        assertEquals(brApiPedigree2.getGermplasmDbId(), createdPedigree.get(1).getGermplasmDbId(), "Sent name and returned pedigree name does not match");
+    }
+
+    @Test
+    public void createPedigreeIdPresentFailure() throws Exception {
+        BrAPIPedigreeNode brApiPedigree = new BrAPIPedigreeNode()
+                .germplasmDbId("new test pedigree");
+
+        ApiException exception = assertThrows(ApiException.class, () -> {
+            this.pedigreeAPI.pedigreePost(Arrays.asList(brApiPedigree));
+        });
+        
+        assertEquals(400, exception.getCode()); //germplasm id not found
+    }
+
+    @Test
+    public void getPedigreeByExternalReferenceIDSuccess() throws Exception {
+    	List<BrAPIExternalReference> externalReferences = new ArrayList<>();
+        externalReferences.add(new BrAPIExternalReference()
+                .referenceID(UUID.randomUUID().toString())
+                .referenceSource("http://test")
+        );
+        BrAPIPedigreeNode brApiPedigree = new BrAPIPedigreeNode().externalReferences(externalReferences).germplasmDbId(germplasmDbIds.pop());
+        this.pedigreeAPI.pedigreePost(Arrays.asList(brApiPedigree));
+    	
+        PedigreeQueryParams pedigreeRequest = PedigreeQueryParams.builder()
+                .externalReferenceId(externalReferences.get(0).getReferenceID())
+                .externalReferenceSource(externalReferences.get(0).getReferenceSource())
+                .build();
+
+        ApiResponse<BrAPIPedigreeListResponse> pedigree = this.pedigreeAPI.pedigreeGet(pedigreeRequest);
+
+        assertEquals(true, pedigree.getBody().getResult().getData().size() == 1, "Wrong number of pedigree returned");
+    }
+
+    @Test
+    public void getPedigreeByExternalReferenceIDDoesNotExist() throws Exception {
+        PedigreeQueryParams pedigreeRequest = PedigreeQueryParams.builder()
+                .externalReferenceId("will not exist")
+                .build();
+
+        ApiResponse<BrAPIPedigreeListResponse> pedigree = this.pedigreeAPI.pedigreeGet(pedigreeRequest);
+
+        assertEquals(true, pedigree.getBody().getResult().getData().size() == 0, "List of pedigree was not empty");
+    }
+
+    @Test
+    public void updatePedigreeSuccess() throws Exception {
+        ApiResponse<BrAPIPedigreeListResponse> pedigreeList = this.pedigreeAPI.pedigreeGet(new PedigreeQueryParams());
+    	BrAPIPedigreeNode pedigree = pedigreeList.getBody().getResult().getData().get(0);
+        pedigree.setPedigreeString("updatePedString");
+
+        Map<String, BrAPIPedigreeNode> req = new HashMap<String, BrAPIPedigreeNode>();
+        req.put(pedigree.getGermplasmDbId(), pedigree);
+        
+        ApiResponse<BrAPIPedigreeListResponse> updatedPedigreeResult = this.pedigreeAPI.pedigreePut(req);
+
+        assertNotNull(updatedPedigreeResult, "Pedigree was not returned");
+        BrAPIPedigreeNode updatedPedigree = updatedPedigreeResult.getBody().getResult().getData().get(0);
+        assertEquals(pedigree.getPedigreeString(), updatedPedigree.getPedigreeString(), "Wrong pedigree name");
+    }
+
+    @Test
+    public void updatePedigreeBadId() throws Exception {
+        // Check that it throws a 404
+        BrAPIPedigreeNode pedigree = new BrAPIPedigreeNode();
+        pedigree.setGermplasmDbId("i_do_not_exist");
+
+        Map<String, BrAPIPedigreeNode> req = new HashMap<String, BrAPIPedigreeNode>();
+        req.put(pedigree.getGermplasmDbId(), pedigree);
+        
+        ApiException exception = assertThrows(ApiException.class, () -> {
+        	this.pedigreeAPI.pedigreePut(req);
+        });
+        assertEquals(400, exception.getCode());
+    }
+}
diff --git a/brapi-java-client/src/test/resources/sql/germplasm.sql b/brapi-java-client/src/test/resources/sql/germplasm.sql
index 23c80c95..de07ff66 100644
--- a/brapi-java-client/src/test/resources/sql/germplasm.sql
+++ b/brapi-java-client/src/test/resources/sql/germplasm.sql
@@ -62,3 +62,8 @@ INSERT INTO germplasm_additional_info(germplasm_entity_id, additional_info_id) V
 INSERT INTO external_reference(id, external_reference_id, external_reference_source) VALUES ('germplasm_er_3', 'https://brapi.org/specification', 'BrAPI Doc');
 INSERT INTO germplasm_external_references(germplasm_entity_id, external_references_id) VALUES ('germplasm3', 'germplasm_er_3');
 
+-- pedigree API tests
+INSERT INTO germplasm (auth_user_id, id, germplasm_name, crop_id) VALUES('anonymousUser', 'pedigreeTest1', 'Pedigree Test 1', '1');
+INSERT INTO germplasm (auth_user_id, id, germplasm_name, crop_id) VALUES('anonymousUser', 'pedigreeTest2', 'Pedigree Test 2', '1');
+INSERT INTO germplasm (auth_user_id, id, germplasm_name, crop_id) VALUES('anonymousUser', 'pedigreeTest3', 'Pedigree Test 3', '1');
+INSERT INTO germplasm (auth_user_id, id, germplasm_name, crop_id) VALUES('anonymousUser', 'pedigreeTest4', 'Pedigree Test 4', '1');
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIParentType.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIParentType.java
index 9af1040a..0e9f441c 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIParentType.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIParentType.java
@@ -7,12 +7,10 @@
 
 public enum BrAPIParentType implements BrAPIEnum {
     MALE("MALE"),
-    
     FEMALE("FEMALE"),
-    
     SELF("SELF"),
-    
-    POPULATION("POPULATION");
+    POPULATION("POPULATION"),
+    CLONAL("CLONAL");
 
     private String value;
 
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode.java
index ccdd29d6..25c73231 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode.java
@@ -1,268 +1,445 @@
-package org.brapi.v2.model.germ;
+/*
+ * BrAPI-Germplasm
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ *
+ * OpenAPI spec version: 2.1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
 
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
+package org.brapi.v2.model.germ;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
-import javax.validation.Valid;
-
-import org.brapi.v2.model.germ.BrAPIPedigreeNodeParents;
-import org.brapi.v2.model.germ.BrAPIPedigreeNodeSiblings;
+import org.brapi.v2.model.BrAPIExternalReference;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * PedigreeNode
  */
 
+public class BrAPIPedigreeNode {
+    @JsonProperty("additionalInfo")
+    private Map<String, String> additionalInfo = null;
+
+    @JsonProperty("breedingMethodDbId")
+    private String breedingMethodDbId = null;
+
+    @JsonProperty("breedingMethodName")
+    private String breedingMethodName = null;
+
+    @JsonProperty("crossingProjectDbId")
+    private String crossingProjectDbId = null;
+
+    @JsonProperty("crossingYear")
+    private Integer crossingYear = null;
+
+    @JsonProperty("defaultDisplayName")
+    private String defaultDisplayName = null;
+
+    @JsonProperty("externalReferences")
+    private List<BrAPIExternalReference> externalReferences = null;
+
+    @JsonProperty("familyCode")
+    private String familyCode = null;
 
-public class BrAPIPedigreeNode   {
-  @JsonProperty("crossingProjectDbId")
-  private String crossingProjectDbId = null;
+    @JsonProperty("germplasmDbId")
+    private String germplasmDbId = null;
 
-  @JsonProperty("crossingYear")
-  private Integer crossingYear = null;
+    @JsonProperty("germplasmName")
+    private String germplasmName = null;
 
-  @JsonProperty("familyCode")
-  private String familyCode = null;
+    @JsonProperty("germplasmPUI")
+    private String germplasmPUI = null;
 
-  @JsonProperty("germplasmDbId")
-  private String germplasmDbId = null;
+    @JsonProperty("parents")
+    private List<BrAPIPedigreeNodeRelative> parents = null;
+
+    @JsonProperty("pedigreeString")
+    private String pedigreeString = null;
+
+    @JsonProperty("progeny")
+    private List<BrAPIPedigreeNodeRelative> progeny = null;
+
+    @JsonProperty("siblings")
+    private List<BrAPIPedigreeNodeSibling> siblings = null;
+
+    public BrAPIPedigreeNode additionalInfo(Map<String, String> additionalInfo) {
+        this.additionalInfo = additionalInfo;
+        return this;
+    }
+
+    public BrAPIPedigreeNode putAdditionalInfoItem(String key, String additionalInfoItem) {
+        if (this.additionalInfo == null) {
+            this.additionalInfo = new HashMap<String, String>();
+        }
+        this.additionalInfo.put(key, additionalInfoItem);
+        return this;
+    }
+
+    /**
+     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
+     *
+     * @return additionalInfo
+     **/
+    public Map<String, String> getAdditionalInfo() {
+        return additionalInfo;
+    }
+
+    public void setAdditionalInfo(Map<String, String> additionalInfo) {
+        this.additionalInfo = additionalInfo;
+    }
+
+    public BrAPIPedigreeNode breedingMethodDbId(String breedingMethodDbId) {
+        this.breedingMethodDbId = breedingMethodDbId;
+        return this;
+    }
+
+    /**
+     * The unique identifier for the breeding method used to create this germplasm
+     *
+     * @return breedingMethodDbId
+     **/
+    public String getBreedingMethodDbId() {
+        return breedingMethodDbId;
+    }
 
-  @JsonProperty("germplasmName")
-  private String germplasmName = null;
+    public void setBreedingMethodDbId(String breedingMethodDbId) {
+        this.breedingMethodDbId = breedingMethodDbId;
+    }
 
-  @JsonProperty("parents")
-  @Valid
-  private List<BrAPIPedigreeNodeParents> parents = null;
+    public BrAPIPedigreeNode breedingMethodName(String breedingMethodName) {
+        this.breedingMethodName = breedingMethodName;
+        return this;
+    }
 
-  @JsonProperty("pedigree")
-  private String pedigree = null;
+    /**
+     * The human readable name of the breeding method used to create this germplasm
+     *
+     * @return breedingMethodName
+     **/
+    public String getBreedingMethodName() {
+        return breedingMethodName;
+    }
 
-  @JsonProperty("siblings")
-  @Valid
-  private List<BrAPIPedigreeNodeSiblings> siblings = null;
+    public void setBreedingMethodName(String breedingMethodName) {
+        this.breedingMethodName = breedingMethodName;
+    }
 
-  public BrAPIPedigreeNode crossingProjectDbId(String crossingProjectDbId) {
-    this.crossingProjectDbId = crossingProjectDbId;
-    return this;
-  }
+    public BrAPIPedigreeNode crossingProjectDbId(String crossingProjectDbId) {
+        this.crossingProjectDbId = crossingProjectDbId;
+        return this;
+    }
 
-  /**
-   * The crossing project used to generate this germplasm
-   * @return crossingProjectDbId
-  **/
-  
-  
+    /**
+     * The crossing project used to generate this germplasm
+     *
+     * @return crossingProjectDbId
+     **/
     public String getCrossingProjectDbId() {
-    return crossingProjectDbId;
-  }
-
-  public void setCrossingProjectDbId(String crossingProjectDbId) {
-    this.crossingProjectDbId = crossingProjectDbId;
-  }
-
-  public BrAPIPedigreeNode crossingYear(Integer crossingYear) {
-    this.crossingYear = crossingYear;
-    return this;
-  }
-
-  /**
-   * The year the parents were originally crossed
-   * @return crossingYear
-  **/
-  
-  
+        return crossingProjectDbId;
+    }
+
+    public void setCrossingProjectDbId(String crossingProjectDbId) {
+        this.crossingProjectDbId = crossingProjectDbId;
+    }
+
+    public BrAPIPedigreeNode crossingYear(Integer crossingYear) {
+        this.crossingYear = crossingYear;
+        return this;
+    }
+
+    /**
+     * The year the parents were originally crossed
+     *
+     * @return crossingYear
+     **/
     public Integer getCrossingYear() {
-    return crossingYear;
-  }
-
-  public void setCrossingYear(Integer crossingYear) {
-    this.crossingYear = crossingYear;
-  }
-
-  public BrAPIPedigreeNode familyCode(String familyCode) {
-    this.familyCode = familyCode;
-    return this;
-  }
-
-  /**
-   * The code representing the family
-   * @return familyCode
-  **/
-  
-  
-    public String getFamilyCode() {
-    return familyCode;
-  }
+        return crossingYear;
+    }
+
+    public void setCrossingYear(Integer crossingYear) {
+        this.crossingYear = crossingYear;
+    }
 
-  public void setFamilyCode(String familyCode) {
-    this.familyCode = familyCode;
-  }
+    public BrAPIPedigreeNode defaultDisplayName(String defaultDisplayName) {
+        this.defaultDisplayName = defaultDisplayName;
+        return this;
+    }
+
+    /**
+     * Human readable name used for display purposes
+     *
+     * @return defaultDisplayName
+     **/
+    public String getDefaultDisplayName() {
+        return defaultDisplayName;
+    }
+
+    public void setDefaultDisplayName(String defaultDisplayName) {
+        this.defaultDisplayName = defaultDisplayName;
+    }
 
-  public BrAPIPedigreeNode germplasmDbId(String germplasmDbId) {
-    this.germplasmDbId = germplasmDbId;
-    return this;
-  }
+    public BrAPIPedigreeNode externalReferences(List<BrAPIExternalReference> externalReferences) {
+        this.externalReferences = externalReferences;
+        return this;
+    }
 
-  /**
-   * The ID which uniquely identifies a germplasm
-   * @return germplasmDbId
-  **/
-  
-      
+    /**
+     * Get externalReferences
+     *
+     * @return externalReferences
+     **/
+    public List<BrAPIExternalReference> getExternalReferences() {
+        return externalReferences;
+    }
 
+    public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
+        this.externalReferences = externalReferences;
+    }
+
+    public BrAPIPedigreeNode familyCode(String familyCode) {
+        this.familyCode = familyCode;
+        return this;
+    }
+
+    /**
+     * The code representing the family of this germplasm
+     *
+     * @return familyCode
+     **/
+    public String getFamilyCode() {
+        return familyCode;
+    }
+
+    public void setFamilyCode(String familyCode) {
+        this.familyCode = familyCode;
+    }
+
+    public BrAPIPedigreeNode germplasmDbId(String germplasmDbId) {
+        this.germplasmDbId = germplasmDbId;
+        return this;
+    }
+
+    /**
+     * The ID which uniquely identifies a germplasm
+     *
+     * @return germplasmDbId
+     **/
     public String getGermplasmDbId() {
-    return germplasmDbId;
-  }
-
-  public void setGermplasmDbId(String germplasmDbId) {
-    this.germplasmDbId = germplasmDbId;
-  }
-
-  public BrAPIPedigreeNode germplasmName(String germplasmName) {
-    this.germplasmName = germplasmName;
-    return this;
-  }
-
-  /**
-   * A human readable name for a germplasm
-   * @return germplasmName
-  **/
-  
-  
+        return germplasmDbId;
+    }
+
+    public void setGermplasmDbId(String germplasmDbId) {
+        this.germplasmDbId = germplasmDbId;
+    }
+
+    public BrAPIPedigreeNode germplasmName(String germplasmName) {
+        this.germplasmName = germplasmName;
+        return this;
+    }
+
+    /**
+     * A human readable name for a germplasm
+     *
+     * @return germplasmName
+     **/
     public String getGermplasmName() {
-    return germplasmName;
-  }
-
-  public void setGermplasmName(String germplasmName) {
-    this.germplasmName = germplasmName;
-  }
-
-  public BrAPIPedigreeNode parents(List<BrAPIPedigreeNodeParents> parents) {
-    this.parents = parents;
-    return this;
-  }
-
-  public BrAPIPedigreeNode addParentsItem(BrAPIPedigreeNodeParents parentsItem) {
-    if (this.parents == null) {
-      this.parents = new ArrayList<BrAPIPedigreeNodeParents>();
-    }
-    this.parents.add(parentsItem);
-    return this;
-  }
-
-  /**
-   * List of parent nodes in the pedigree tree.
-   * @return parents
-  **/
-  
-      @Valid
-    public List<BrAPIPedigreeNodeParents> getParents() {
-    return parents;
-  }
-
-  public void setParents(List<BrAPIPedigreeNodeParents> parents) {
-    this.parents = parents;
-  }
-
-  public BrAPIPedigreeNode pedigree(String pedigree) {
-    this.pedigree = pedigree;
-    return this;
-  }
-
-  /**
-   * The string representation of the pedigree.
-   * @return pedigree
-  **/
-  
-  
-    public String getPedigree() {
-    return pedigree;
-  }
-
-  public void setPedigree(String pedigree) {
-    this.pedigree = pedigree;
-  }
-
-  public BrAPIPedigreeNode siblings(List<BrAPIPedigreeNodeSiblings> siblings) {
-    this.siblings = siblings;
-    return this;
-  }
-
-  public BrAPIPedigreeNode addSiblingsItem(BrAPIPedigreeNodeSiblings siblingsItem) {
-    if (this.siblings == null) {
-      this.siblings = new ArrayList<BrAPIPedigreeNodeSiblings>();
-    }
-    this.siblings.add(siblingsItem);
-    return this;
-  }
-
-  /**
-   * List of sibling germplasm
-   * @return siblings
-  **/
-  
-      @Valid
-    public List<BrAPIPedigreeNodeSiblings> getSiblings() {
-    return siblings;
-  }
-
-  public void setSiblings(List<BrAPIPedigreeNodeSiblings> siblings) {
-    this.siblings = siblings;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIPedigreeNode pedigreeNode = (BrAPIPedigreeNode) o;
-    return Objects.equals(this.crossingProjectDbId, pedigreeNode.crossingProjectDbId) &&
-        Objects.equals(this.crossingYear, pedigreeNode.crossingYear) &&
-        Objects.equals(this.familyCode, pedigreeNode.familyCode) &&
-        Objects.equals(this.germplasmDbId, pedigreeNode.germplasmDbId) &&
-        Objects.equals(this.germplasmName, pedigreeNode.germplasmName) &&
-        Objects.equals(this.parents, pedigreeNode.parents) &&
-        Objects.equals(this.pedigree, pedigreeNode.pedigree) &&
-        Objects.equals(this.siblings, pedigreeNode.siblings);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(crossingProjectDbId, crossingYear, familyCode, germplasmDbId, germplasmName, parents, pedigree, siblings);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PedigreeNode {\n");
-    
-    sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
-    sb.append("    crossingYear: ").append(toIndentedString(crossingYear)).append("\n");
-    sb.append("    familyCode: ").append(toIndentedString(familyCode)).append("\n");
-    sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-    sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-    sb.append("    parents: ").append(toIndentedString(parents)).append("\n");
-    sb.append("    pedigree: ").append(toIndentedString(pedigree)).append("\n");
-    sb.append("    siblings: ").append(toIndentedString(siblings)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+        return germplasmName;
+    }
+
+    public void setGermplasmName(String germplasmName) {
+        this.germplasmName = germplasmName;
+    }
+
+    public BrAPIPedigreeNode germplasmPUI(String germplasmPUI) {
+        this.germplasmPUI = germplasmPUI;
+        return this;
+    }
+
+    /**
+     * The Permanent Unique Identifier which represents a germplasm  MIAPPE V1.1 (DM-41) Biological material ID - Code used to identify the biological material in the data file. Should be unique within the Investigation. Can correspond to experimental plant ID, seed lot ID, etc This material identification is different from a BiosampleID which corresponds to Observation Unit or Samples sections below.  MIAPPE V1.1 (DM-51) Material source DOI - Digital Object Identifier (DOI) of the material source  MCPD (v2.1) (PUID) 0. Any persistent, unique identifier assigned to the accession so it can be unambiguously referenced at the global level and the information associated with it harvested through automated means. Report one PUID for each accession. The Secretariat of the International Treaty on Plant Genetic Resources for Food and Agriculture (PGRFA) is facilitating the assignment of a persistent unique identifier (PUID), in the form of a DOI, to PGRFA at the accession level. Genebanks not applying a true PUID to their accessions should use, and request recipients to use, the concatenation of INSTCODE, ACCENUMB, and GENUS as a globally unique identifier similar in most respects to the PUID whenever they exchange information on accessions with third parties.
+     *
+     * @return germplasmPUI
+     **/
+    public String getGermplasmPUI() {
+        return germplasmPUI;
+    }
+
+    public void setGermplasmPUI(String germplasmPUI) {
+        this.germplasmPUI = germplasmPUI;
+    }
+
+    public BrAPIPedigreeNode parents(List<BrAPIPedigreeNodeRelative> parents) {
+        this.parents = parents;
+        return this;
+    }
+
+    public BrAPIPedigreeNode addParentsItem(BrAPIPedigreeNodeRelative parentsItem) {
+        if (this.parents == null) {
+            this.parents = new ArrayList<BrAPIPedigreeNodeRelative>();
+        }
+        this.parents.add(parentsItem);
+        return this;
+    }
+
+    /**
+     * A list of parent germplasm references in the pedigree tree for this germplasm. These represent edges in the tree, connecting to other nodes. &lt;br/&gt; Typically, this array should only have one parent (clonal or self) or two parents (cross). In some special cases, there may be more parents, usually when the exact parent is not known.  &lt;br/&gt; If the parameter &#x27;includeParents&#x27; is set to false, then this array should be empty, null, or not present in the response.
+     *
+     * @return parents
+     **/
+    public List<BrAPIPedigreeNodeRelative> getParents() {
+        return parents;
+    }
+
+    public void setParents(List<BrAPIPedigreeNodeRelative> parents) {
+        this.parents = parents;
+    }
+
+    public BrAPIPedigreeNode pedigreeString(String pedigreeString) {
+        this.pedigreeString = pedigreeString;
+        return this;
+    }
+
+    /**
+     * The string representation of the pedigree for this germplasm in PURDY notation
+     *
+     * @return pedigreeString
+     **/
+    public String getPedigreeString() {
+        return pedigreeString;
+    }
+
+    public void setPedigreeString(String pedigreeString) {
+        this.pedigreeString = pedigreeString;
+    }
+
+    public BrAPIPedigreeNode progeny(List<BrAPIPedigreeNodeRelative> progeny) {
+        this.progeny = progeny;
+        return this;
+    }
+
+    public BrAPIPedigreeNode addProgenyItem(BrAPIPedigreeNodeRelative progenyItem) {
+        if (this.progeny == null) {
+            this.progeny = new ArrayList<BrAPIPedigreeNodeRelative>();
+        }
+        this.progeny.add(progenyItem);
+        return this;
+    }
+
+    /**
+     * A list of germplasm references that are direct children of this germplasm. These represent edges in the tree, connecting to other nodes. &lt;br/&gt; The given germplasm could have a large number of progeny, across a number of different breeding methods. The &#x27;parentType&#x27; shows        the type of parent this germplasm is to each of the child germplasm references. &lt;br/&gt; If the parameter &#x27;includeProgeny&#x27; is set to false, then this array should be empty, null, or not present in the response.
+     *
+     * @return progeny
+     **/
+    public List<BrAPIPedigreeNodeRelative> getProgeny() {
+        return progeny;
+    }
+
+    public void setProgeny(List<BrAPIPedigreeNodeRelative> progeny) {
+        this.progeny = progeny;
+    }
+
+    public BrAPIPedigreeNode siblings(List<BrAPIPedigreeNodeSibling> siblings) {
+        this.siblings = siblings;
+        return this;
+    }
+
+    public BrAPIPedigreeNode addSiblingsItem(BrAPIPedigreeNodeSibling siblingsItem) {
+        if (this.siblings == null) {
+            this.siblings = new ArrayList<BrAPIPedigreeNodeSibling>();
+        }
+        this.siblings.add(siblingsItem);
+        return this;
+    }
+
+    /**
+     * A list of sibling germplasm references in the pedigree tree for this germplasm. These represent edges in the tree, connecting to other nodes. &lt;br/&gt; Siblings share at least one parent with the given germplasm.  &lt;br/&gt; If the parameter &#x27;includeSiblings&#x27; is set to false, then this array should be empty, null, or not present in the response.
+     *
+     * @return siblings
+     **/
+    public List<BrAPIPedigreeNodeSibling> getSiblings() {
+        return siblings;
+    }
+
+    public void setSiblings(List<BrAPIPedigreeNodeSibling> siblings) {
+        this.siblings = siblings;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        BrAPIPedigreeNode pedigreeNode = (BrAPIPedigreeNode) o;
+        return Objects.equals(this.additionalInfo, pedigreeNode.additionalInfo) &&
+                Objects.equals(this.breedingMethodDbId, pedigreeNode.breedingMethodDbId) &&
+                Objects.equals(this.breedingMethodName, pedigreeNode.breedingMethodName) &&
+                Objects.equals(this.crossingProjectDbId, pedigreeNode.crossingProjectDbId) &&
+                Objects.equals(this.crossingYear, pedigreeNode.crossingYear) &&
+                Objects.equals(this.defaultDisplayName, pedigreeNode.defaultDisplayName) &&
+                Objects.equals(this.externalReferences, pedigreeNode.externalReferences) &&
+                Objects.equals(this.familyCode, pedigreeNode.familyCode) &&
+                Objects.equals(this.germplasmDbId, pedigreeNode.germplasmDbId) &&
+                Objects.equals(this.germplasmName, pedigreeNode.germplasmName) &&
+                Objects.equals(this.germplasmPUI, pedigreeNode.germplasmPUI) &&
+                Objects.equals(this.parents, pedigreeNode.parents) &&
+                Objects.equals(this.pedigreeString, pedigreeNode.pedigreeString) &&
+                Objects.equals(this.progeny, pedigreeNode.progeny) &&
+                Objects.equals(this.siblings, pedigreeNode.siblings);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(additionalInfo, breedingMethodDbId, breedingMethodName, crossingProjectDbId, crossingYear, defaultDisplayName, externalReferences, familyCode, germplasmDbId, germplasmName, germplasmPUI, parents, pedigreeString, progeny, siblings);
+    }
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class PedigreeNode {\n");
+
+        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
+        sb.append("    breedingMethodDbId: ").append(toIndentedString(breedingMethodDbId)).append("\n");
+        sb.append("    breedingMethodName: ").append(toIndentedString(breedingMethodName)).append("\n");
+        sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
+        sb.append("    crossingYear: ").append(toIndentedString(crossingYear)).append("\n");
+        sb.append("    defaultDisplayName: ").append(toIndentedString(defaultDisplayName)).append("\n");
+        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
+        sb.append("    familyCode: ").append(toIndentedString(familyCode)).append("\n");
+        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
+        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
+        sb.append("    germplasmPUI: ").append(toIndentedString(germplasmPUI)).append("\n");
+        sb.append("    parents: ").append(toIndentedString(parents)).append("\n");
+        sb.append("    pedigreeString: ").append(toIndentedString(pedigreeString)).append("\n");
+        sb.append("    progeny: ").append(toIndentedString(progeny)).append("\n");
+        sb.append("    siblings: ").append(toIndentedString(siblings)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeParents.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeRelative.java
similarity index 88%
rename from brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeParents.java
rename to brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeRelative.java
index 0a7949a1..e1e07d09 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeParents.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeRelative.java
@@ -12,7 +12,7 @@
  */
 
 
-public class BrAPIPedigreeNodeParents   {
+public class BrAPIPedigreeNodeRelative   {
   @JsonProperty("germplasmDbId")
   private String germplasmDbId = null;
 
@@ -22,7 +22,7 @@ public class BrAPIPedigreeNodeParents   {
   @JsonProperty("parentType")
   private BrAPIParentType parentType = null;
 
-  public BrAPIPedigreeNodeParents germplasmDbId(String germplasmDbId) {
+  public BrAPIPedigreeNodeRelative germplasmDbId(String germplasmDbId) {
     this.germplasmDbId = germplasmDbId;
     return this;
   }
@@ -41,7 +41,7 @@ public void setGermplasmDbId(String germplasmDbId) {
     this.germplasmDbId = germplasmDbId;
   }
 
-  public BrAPIPedigreeNodeParents germplasmName(String germplasmName) {
+  public BrAPIPedigreeNodeRelative germplasmName(String germplasmName) {
     this.germplasmName = germplasmName;
     return this;
   }
@@ -60,7 +60,7 @@ public void setGermplasmName(String germplasmName) {
     this.germplasmName = germplasmName;
   }
 
-  public BrAPIPedigreeNodeParents parentType(BrAPIParentType parentType) {
+  public BrAPIPedigreeNodeRelative parentType(BrAPIParentType parentType) {
     this.parentType = parentType;
     return this;
   }
@@ -88,7 +88,7 @@ public boolean equals(java.lang.Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    BrAPIPedigreeNodeParents pedigreeNodeParents = (BrAPIPedigreeNodeParents) o;
+    BrAPIPedigreeNodeRelative pedigreeNodeParents = (BrAPIPedigreeNodeRelative) o;
     return Objects.equals(this.germplasmDbId, pedigreeNodeParents.germplasmDbId) &&
         Objects.equals(this.germplasmName, pedigreeNodeParents.germplasmName) &&
         Objects.equals(this.parentType, pedigreeNodeParents.parentType);
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeSiblings.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeSibling.java
similarity index 88%
rename from brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeSiblings.java
rename to brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeSibling.java
index c6c237cd..8ab6a2bb 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeSiblings.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeSibling.java
@@ -12,14 +12,14 @@
  */
 
 
-public class BrAPIPedigreeNodeSiblings   {
+public class BrAPIPedigreeNodeSibling {
   @JsonProperty("germplasmDbId")
   private String germplasmDbId = null;
 
   @JsonProperty("germplasmName")
   private String germplasmName = null;
 
-  public BrAPIPedigreeNodeSiblings germplasmDbId(String germplasmDbId) {
+  public BrAPIPedigreeNodeSibling germplasmDbId(String germplasmDbId) {
     this.germplasmDbId = germplasmDbId;
     return this;
   }
@@ -38,7 +38,7 @@ public void setGermplasmDbId(String germplasmDbId) {
     this.germplasmDbId = germplasmDbId;
   }
 
-  public BrAPIPedigreeNodeSiblings germplasmName(String germplasmName) {
+  public BrAPIPedigreeNodeSibling germplasmName(String germplasmName) {
     this.germplasmName = germplasmName;
     return this;
   }
@@ -66,7 +66,7 @@ public boolean equals(java.lang.Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    BrAPIPedigreeNodeSiblings pedigreeNodeSiblings = (BrAPIPedigreeNodeSiblings) o;
+    BrAPIPedigreeNodeSibling pedigreeNodeSiblings = (BrAPIPedigreeNodeSibling) o;
     return Objects.equals(this.germplasmDbId, pedigreeNodeSiblings.germplasmDbId) &&
         Objects.equals(this.germplasmName, pedigreeNodeSiblings.germplasmName);
   }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode_Deprecated.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode_Deprecated.java
new file mode 100644
index 00000000..942a2d2e
--- /dev/null
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode_Deprecated.java
@@ -0,0 +1,292 @@
+package org.brapi.v2.model.germ;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.Valid;
+
+/**
+ * PedigreeNode
+ */
+
+@Deprecated
+public class BrAPIPedigreeNode_Deprecated {
+	@JsonProperty("crossingProjectDbId")
+	private String crossingProjectDbId = null;
+
+	@JsonProperty("crossingYear")
+	private Integer crossingYear = null;
+
+	@JsonProperty("familyCode")
+	private String familyCode = null;
+
+	@JsonProperty("germplasmDbId")
+	private String germplasmDbId = null;
+
+	@JsonProperty("germplasmName")
+	private String germplasmName = null;
+
+	@JsonProperty("parents")
+	@Valid
+	private List<BrAPIPedigreeNodeRelative> parents = null;
+
+	@JsonProperty("pedigree")
+	private String pedigree = null;
+
+	@JsonProperty("siblings")
+	@Valid
+	private List<BrAPIPedigreeNodeSibling> siblings = null;
+
+	@Deprecated
+	public BrAPIPedigreeNode_Deprecated crossingProjectDbId(String crossingProjectDbId) {
+		this.crossingProjectDbId = crossingProjectDbId;
+		return this;
+	}
+
+	/**
+	 * The crossing project used to generate this germplasm
+	 * 
+	 * @return crossingProjectDbId
+	 **/
+
+	@Deprecated
+	public String getCrossingProjectDbId() {
+		return crossingProjectDbId;
+	}
+
+	@Deprecated
+	public void setCrossingProjectDbId(String crossingProjectDbId) {
+		this.crossingProjectDbId = crossingProjectDbId;
+	}
+
+	@Deprecated
+	public BrAPIPedigreeNode_Deprecated crossingYear(Integer crossingYear) {
+		this.crossingYear = crossingYear;
+		return this;
+	}
+
+	/**
+	 * The year the parents were originally crossed
+	 * 
+	 * @return crossingYear
+	 **/
+
+	@Deprecated
+	public Integer getCrossingYear() {
+		return crossingYear;
+	}
+
+	@Deprecated
+	public void setCrossingYear(Integer crossingYear) {
+		this.crossingYear = crossingYear;
+	}
+
+	@Deprecated
+	public BrAPIPedigreeNode_Deprecated familyCode(String familyCode) {
+		this.familyCode = familyCode;
+		return this;
+	}
+
+	/**
+	 * The code representing the family
+	 * 
+	 * @return familyCode
+	 **/
+
+	@Deprecated
+	public String getFamilyCode() {
+		return familyCode;
+	}
+
+	@Deprecated
+	public void setFamilyCode(String familyCode) {
+		this.familyCode = familyCode;
+	}
+
+	@Deprecated
+	public BrAPIPedigreeNode_Deprecated germplasmDbId(String germplasmDbId) {
+		this.germplasmDbId = germplasmDbId;
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a germplasm
+	 * 
+	 * @return germplasmDbId
+	 **/
+
+	@Deprecated
+	public String getGermplasmDbId() {
+		return germplasmDbId;
+	}
+
+	@Deprecated
+	public void setGermplasmDbId(String germplasmDbId) {
+		this.germplasmDbId = germplasmDbId;
+	}
+
+	@Deprecated
+	public BrAPIPedigreeNode_Deprecated germplasmName(String germplasmName) {
+		this.germplasmName = germplasmName;
+		return this;
+	}
+
+	/**
+	 * A human readable name for a germplasm
+	 * 
+	 * @return germplasmName
+	 **/
+
+	@Deprecated
+	public String getGermplasmName() {
+		return germplasmName;
+	}
+
+	@Deprecated
+	public void setGermplasmName(String germplasmName) {
+		this.germplasmName = germplasmName;
+	}
+
+	@Deprecated
+	public BrAPIPedigreeNode_Deprecated parents(List<BrAPIPedigreeNodeRelative> parents) {
+		this.parents = parents;
+		return this;
+	}
+
+	@Deprecated
+	public BrAPIPedigreeNode_Deprecated addParentsItem(BrAPIPedigreeNodeRelative parentsItem) {
+		if (this.parents == null) {
+			this.parents = new ArrayList<BrAPIPedigreeNodeRelative>();
+		}
+		this.parents.add(parentsItem);
+		return this;
+	}
+
+	/**
+	 * List of parent nodes in the pedigree tree.
+	 * 
+	 * @return parents
+	 **/
+
+	@Deprecated
+	public List<BrAPIPedigreeNodeRelative> getParents() {
+		return parents;
+	}
+
+	@Deprecated
+	public void setParents(List<BrAPIPedigreeNodeRelative> parents) {
+		this.parents = parents;
+	}
+
+	@Deprecated
+	public BrAPIPedigreeNode_Deprecated pedigree(String pedigree) {
+		this.pedigree = pedigree;
+		return this;
+	}
+
+	/**
+	 * The string representation of the pedigree.
+	 * 
+	 * @return pedigree
+	 **/
+
+	@Deprecated
+	public String getPedigree() {
+		return pedigree;
+	}
+
+	@Deprecated
+	public void setPedigree(String pedigree) {
+		this.pedigree = pedigree;
+	}
+
+	@Deprecated
+	public BrAPIPedigreeNode_Deprecated siblings(List<BrAPIPedigreeNodeSibling> siblings) {
+		this.siblings = siblings;
+		return this;
+	}
+
+	@Deprecated
+	public BrAPIPedigreeNode_Deprecated addSiblingsItem(BrAPIPedigreeNodeSibling siblingsItem) {
+		if (this.siblings == null) {
+			this.siblings = new ArrayList<BrAPIPedigreeNodeSibling>();
+		}
+		this.siblings.add(siblingsItem);
+		return this;
+	}
+
+	/**
+	 * List of sibling germplasm
+	 * 
+	 * @return siblings
+	 **/
+
+	@Deprecated
+	public List<BrAPIPedigreeNodeSibling> getSiblings() {
+		return siblings;
+	}
+
+	@Deprecated
+	public void setSiblings(List<BrAPIPedigreeNodeSibling> siblings) {
+		this.siblings = siblings;
+	}
+
+	@Override
+	@Deprecated
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIPedigreeNode_Deprecated pedigreeNode = (BrAPIPedigreeNode_Deprecated) o;
+		return Objects.equals(this.crossingProjectDbId, pedigreeNode.crossingProjectDbId)
+				&& Objects.equals(this.crossingYear, pedigreeNode.crossingYear)
+				&& Objects.equals(this.familyCode, pedigreeNode.familyCode)
+				&& Objects.equals(this.germplasmDbId, pedigreeNode.germplasmDbId)
+				&& Objects.equals(this.germplasmName, pedigreeNode.germplasmName)
+				&& Objects.equals(this.parents, pedigreeNode.parents)
+				&& Objects.equals(this.pedigree, pedigreeNode.pedigree)
+				&& Objects.equals(this.siblings, pedigreeNode.siblings);
+	}
+
+	@Override
+	@Deprecated
+	public int hashCode() {
+		return Objects.hash(crossingProjectDbId, crossingYear, familyCode, germplasmDbId, germplasmName, parents,
+				pedigree, siblings);
+	}
+
+	@Override
+	@Deprecated
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class PedigreeNode {\n");
+
+		sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
+		sb.append("    crossingYear: ").append(toIndentedString(crossingYear)).append("\n");
+		sb.append("    familyCode: ").append(toIndentedString(familyCode)).append("\n");
+		sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
+		sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
+		sb.append("    parents: ").append(toIndentedString(parents)).append("\n");
+		sb.append("    pedigree: ").append(toIndentedString(pedigree)).append("\n");
+		sb.append("    siblings: ").append(toIndentedString(siblings)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
+}
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIPedigreeSearchRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIPedigreeSearchRequest.java
new file mode 100644
index 00000000..4d19f569
--- /dev/null
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIPedigreeSearchRequest.java
@@ -0,0 +1,899 @@
+/*
+ * BrAPI-Germplasm
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ *
+ * OpenAPI spec version: 2.1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package org.brapi.v2.model.germ.request;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * PedigreeSearchRequest
+ */
+
+public class BrAPIPedigreeSearchRequest {
+    @JsonProperty("accessionNumbers")
+    private List<String> accessionNumbers = null;
+
+    @JsonProperty("binomialNames")
+    private List<String> binomialNames = null;
+
+    @JsonProperty("collections")
+    private List<String> collections = null;
+
+    @JsonProperty("commonCropNames")
+    private List<String> commonCropNames = null;
+
+    @JsonProperty("externalReferenceIDs")
+    private List<String> externalReferenceIDs = null;
+
+    @JsonProperty("externalReferenceIds")
+    private List<String> externalReferenceIds = null;
+
+    @JsonProperty("externalReferenceSources")
+    private List<String> externalReferenceSources = null;
+
+    @JsonProperty("familyCodes")
+    private List<String> familyCodes = null;
+
+    @JsonProperty("genus")
+    private List<String> genus = null;
+
+    @JsonProperty("germplasmDbIds")
+    private List<String> germplasmDbIds = null;
+
+    @JsonProperty("germplasmNames")
+    private List<String> germplasmNames = null;
+
+    @JsonProperty("germplasmPUIs")
+    private List<String> germplasmPUIs = null;
+
+    @JsonProperty("includeFullTree")
+    private Boolean includeFullTree = null;
+
+    @JsonProperty("includeParents")
+    private Boolean includeParents = null;
+
+    @JsonProperty("includeProgeny")
+    private Boolean includeProgeny = null;
+
+    @JsonProperty("includeSiblings")
+    private Boolean includeSiblings = null;
+
+    @JsonProperty("instituteCodes")
+    private List<String> instituteCodes = null;
+
+    @JsonProperty("page")
+    private Integer page = null;
+
+    @JsonProperty("pageSize")
+    private Integer pageSize = null;
+
+    @JsonProperty("pedigreeDepth")
+    private Integer pedigreeDepth = null;
+
+    @JsonProperty("progenyDepth")
+    private Integer progenyDepth = null;
+
+    @JsonProperty("programDbIds")
+    private List<String> programDbIds = null;
+
+    @JsonProperty("programNames")
+    private List<String> programNames = null;
+
+    @JsonProperty("species")
+    private List<String> species = null;
+
+    @JsonProperty("studyDbIds")
+    private List<String> studyDbIds = null;
+
+    @JsonProperty("studyNames")
+    private List<String> studyNames = null;
+
+    @JsonProperty("synonyms")
+    private List<String> synonyms = null;
+
+    @JsonProperty("trialDbIds")
+    private List<String> trialDbIds = null;
+
+    @JsonProperty("trialNames")
+    private List<String> trialNames = null;
+
+    public BrAPIPedigreeSearchRequest accessionNumbers(List<String> accessionNumbers) {
+        this.accessionNumbers = accessionNumbers;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addAccessionNumbersItem(String accessionNumbersItem) {
+        if (this.accessionNumbers == null) {
+            this.accessionNumbers = new ArrayList<String>();
+        }
+        this.accessionNumbers.add(accessionNumbersItem);
+        return this;
+    }
+
+    /**
+     * A collection of unique identifiers for materials or germplasm within a genebank  MCPD (v2.1) (ACCENUMB) 2. This is the unique identifier for accessions within a genebank, and is assigned when a sample is entered into the genebank collection (e.g. \&quot;PI 113869\&quot;).
+     *
+     * @return accessionNumbers
+     **/
+    public List<String> getAccessionNumbers() {
+        return accessionNumbers;
+    }
+
+    public void setAccessionNumbers(List<String> accessionNumbers) {
+        this.accessionNumbers = accessionNumbers;
+    }
+
+    public BrAPIPedigreeSearchRequest binomialNames(List<String> binomialNames) {
+        this.binomialNames = binomialNames;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addBinomialNamesItem(String binomialNamesItem) {
+        if (this.binomialNames == null) {
+            this.binomialNames = new ArrayList<String>();
+        }
+        this.binomialNames.add(binomialNamesItem);
+        return this;
+    }
+
+    /**
+     * List of the full binomial name (scientific name) to identify a germplasm
+     *
+     * @return binomialNames
+     **/
+    public List<String> getBinomialNames() {
+        return binomialNames;
+    }
+
+    public void setBinomialNames(List<String> binomialNames) {
+        this.binomialNames = binomialNames;
+    }
+
+    public BrAPIPedigreeSearchRequest collections(List<String> collections) {
+        this.collections = collections;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addCollectionsItem(String collectionsItem) {
+        if (this.collections == null) {
+            this.collections = new ArrayList<String>();
+        }
+        this.collections.add(collectionsItem);
+        return this;
+    }
+
+    /**
+     * A specific panel/collection/population name this germplasm belongs to.
+     *
+     * @return collections
+     **/
+    public List<String> getCollections() {
+        return collections;
+    }
+
+    public void setCollections(List<String> collections) {
+        this.collections = collections;
+    }
+
+    public BrAPIPedigreeSearchRequest commonCropNames(List<String> commonCropNames) {
+        this.commonCropNames = commonCropNames;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
+        if (this.commonCropNames == null) {
+            this.commonCropNames = new ArrayList<String>();
+        }
+        this.commonCropNames.add(commonCropNamesItem);
+        return this;
+    }
+
+    /**
+     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
+     *
+     * @return commonCropNames
+     **/
+    public List<String> getCommonCropNames() {
+        return commonCropNames;
+    }
+
+    public void setCommonCropNames(List<String> commonCropNames) {
+        this.commonCropNames = commonCropNames;
+    }
+
+    public BrAPIPedigreeSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
+        this.externalReferenceIDs = externalReferenceIDs;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
+        if (this.externalReferenceIDs == null) {
+            this.externalReferenceIDs = new ArrayList<String>();
+        }
+        this.externalReferenceIDs.add(externalReferenceIDsItem);
+        return this;
+    }
+
+    /**
+     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
+     *
+     * @return externalReferenceIDs
+     **/
+    public List<String> getExternalReferenceIDs() {
+        return externalReferenceIDs;
+    }
+
+    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
+        this.externalReferenceIDs = externalReferenceIDs;
+    }
+
+    public BrAPIPedigreeSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
+        this.externalReferenceIds = externalReferenceIds;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
+        if (this.externalReferenceIds == null) {
+            this.externalReferenceIds = new ArrayList<String>();
+        }
+        this.externalReferenceIds.add(externalReferenceIdsItem);
+        return this;
+    }
+
+    /**
+     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
+     *
+     * @return externalReferenceIds
+     **/
+    public List<String> getExternalReferenceIds() {
+        return externalReferenceIds;
+    }
+
+    public void setExternalReferenceIds(List<String> externalReferenceIds) {
+        this.externalReferenceIds = externalReferenceIds;
+    }
+
+    public BrAPIPedigreeSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
+        this.externalReferenceSources = externalReferenceSources;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
+        if (this.externalReferenceSources == null) {
+            this.externalReferenceSources = new ArrayList<String>();
+        }
+        this.externalReferenceSources.add(externalReferenceSourcesItem);
+        return this;
+    }
+
+    /**
+     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
+     *
+     * @return externalReferenceSources
+     **/
+    public List<String> getExternalReferenceSources() {
+        return externalReferenceSources;
+    }
+
+    public void setExternalReferenceSources(List<String> externalReferenceSources) {
+        this.externalReferenceSources = externalReferenceSources;
+    }
+
+    public BrAPIPedigreeSearchRequest familyCodes(List<String> familyCodes) {
+        this.familyCodes = familyCodes;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addFamilyCodesItem(String familyCodesItem) {
+        if (this.familyCodes == null) {
+            this.familyCodes = new ArrayList<String>();
+        }
+        this.familyCodes.add(familyCodesItem);
+        return this;
+    }
+
+    /**
+     * A familyCode representing the family this germplasm belongs to.
+     *
+     * @return familyCodes
+     **/
+    public List<String> getFamilyCodes() {
+        return familyCodes;
+    }
+
+    public void setFamilyCodes(List<String> familyCodes) {
+        this.familyCodes = familyCodes;
+    }
+
+    public BrAPIPedigreeSearchRequest genus(List<String> genus) {
+        this.genus = genus;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addGenusItem(String genusItem) {
+        if (this.genus == null) {
+            this.genus = new ArrayList<String>();
+        }
+        this.genus.add(genusItem);
+        return this;
+    }
+
+    /**
+     * List of Genus names to identify germplasm
+     *
+     * @return genus
+     **/
+    public List<String> getGenus() {
+        return genus;
+    }
+
+    public void setGenus(List<String> genus) {
+        this.genus = genus;
+    }
+
+    public BrAPIPedigreeSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
+        this.germplasmDbIds = germplasmDbIds;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
+        if (this.germplasmDbIds == null) {
+            this.germplasmDbIds = new ArrayList<String>();
+        }
+        this.germplasmDbIds.add(germplasmDbIdsItem);
+        return this;
+    }
+
+    /**
+     * List of IDs which uniquely identify germplasm to search for
+     *
+     * @return germplasmDbIds
+     **/
+    public List<String> getGermplasmDbIds() {
+        return germplasmDbIds;
+    }
+
+    public void setGermplasmDbIds(List<String> germplasmDbIds) {
+        this.germplasmDbIds = germplasmDbIds;
+    }
+
+    public BrAPIPedigreeSearchRequest germplasmNames(List<String> germplasmNames) {
+        this.germplasmNames = germplasmNames;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
+        if (this.germplasmNames == null) {
+            this.germplasmNames = new ArrayList<String>();
+        }
+        this.germplasmNames.add(germplasmNamesItem);
+        return this;
+    }
+
+    /**
+     * List of human readable names to identify germplasm to search for
+     *
+     * @return germplasmNames
+     **/
+    public List<String> getGermplasmNames() {
+        return germplasmNames;
+    }
+
+    public void setGermplasmNames(List<String> germplasmNames) {
+        this.germplasmNames = germplasmNames;
+    }
+
+    public BrAPIPedigreeSearchRequest germplasmPUIs(List<String> germplasmPUIs) {
+        this.germplasmPUIs = germplasmPUIs;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addGermplasmPUIsItem(String germplasmPUIsItem) {
+        if (this.germplasmPUIs == null) {
+            this.germplasmPUIs = new ArrayList<String>();
+        }
+        this.germplasmPUIs.add(germplasmPUIsItem);
+        return this;
+    }
+
+    /**
+     * List of Permanent Unique Identifiers to identify germplasm
+     *
+     * @return germplasmPUIs
+     **/
+    public List<String> getGermplasmPUIs() {
+        return germplasmPUIs;
+    }
+
+    public void setGermplasmPUIs(List<String> germplasmPUIs) {
+        this.germplasmPUIs = germplasmPUIs;
+    }
+
+    public BrAPIPedigreeSearchRequest includeFullTree(Boolean includeFullTree) {
+        this.includeFullTree = includeFullTree;
+        return this;
+    }
+
+    /**
+     * If this parameter is true, recursively include ALL of the nodes available in this pedigree tree
+     *
+     * @return includeFullTree
+     **/
+    public Boolean isIncludeFullTree() {
+        return includeFullTree;
+    }
+
+    public void setIncludeFullTree(Boolean includeFullTree) {
+        this.includeFullTree = includeFullTree;
+    }
+
+    public BrAPIPedigreeSearchRequest includeParents(Boolean includeParents) {
+        this.includeParents = includeParents;
+        return this;
+    }
+
+    /**
+     * If this parameter is true, include the array of parents in the response
+     *
+     * @return includeParents
+     **/
+    public Boolean isIncludeParents() {
+        return includeParents;
+    }
+
+    public void setIncludeParents(Boolean includeParents) {
+        this.includeParents = includeParents;
+    }
+
+    public BrAPIPedigreeSearchRequest includeProgeny(Boolean includeProgeny) {
+        this.includeProgeny = includeProgeny;
+        return this;
+    }
+
+    /**
+     * If this parameter is true, include the array of progeny in the response
+     *
+     * @return includeProgeny
+     **/
+    public Boolean isIncludeProgeny() {
+        return includeProgeny;
+    }
+
+    public void setIncludeProgeny(Boolean includeProgeny) {
+        this.includeProgeny = includeProgeny;
+    }
+
+    public BrAPIPedigreeSearchRequest includeSiblings(Boolean includeSiblings) {
+        this.includeSiblings = includeSiblings;
+        return this;
+    }
+
+    /**
+     * If this parameter is true, include the array of siblings in the response
+     *
+     * @return includeSiblings
+     **/
+    public Boolean isIncludeSiblings() {
+        return includeSiblings;
+    }
+
+    public void setIncludeSiblings(Boolean includeSiblings) {
+        this.includeSiblings = includeSiblings;
+    }
+
+    public BrAPIPedigreeSearchRequest instituteCodes(List<String> instituteCodes) {
+        this.instituteCodes = instituteCodes;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addInstituteCodesItem(String instituteCodesItem) {
+        if (this.instituteCodes == null) {
+            this.instituteCodes = new ArrayList<String>();
+        }
+        this.instituteCodes.add(instituteCodesItem);
+        return this;
+    }
+
+    /**
+     * The code for the institute that maintains the material.  &lt;br/&gt; MCPD (v2.1) (INSTCODE) 1. FAO WIEWS code of the institute where the accession is maintained. The codes consist of the 3-letter ISO 3166 country code of the country where the institute is located plus a number (e.g. PER001). The current set of institute codes is available from http://www.fao.org/wiews. For those institutes not yet having an FAO Code, or for those with \&quot;obsolete\&quot; codes, see \&quot;Common formatting rules (v)\&quot;.
+     *
+     * @return instituteCodes
+     **/
+    public List<String> getInstituteCodes() {
+        return instituteCodes;
+    }
+
+    public void setInstituteCodes(List<String> instituteCodes) {
+        this.instituteCodes = instituteCodes;
+    }
+
+    public BrAPIPedigreeSearchRequest page(Integer page) {
+        this.page = page;
+        return this;
+    }
+
+    /**
+     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
+     *
+     * @return page
+     **/
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public BrAPIPedigreeSearchRequest pageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+        return this;
+    }
+
+    /**
+     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
+     *
+     * @return pageSize
+     **/
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public BrAPIPedigreeSearchRequest pedigreeDepth(Integer pedigreeDepth) {
+        this.pedigreeDepth = pedigreeDepth;
+        return this;
+    }
+
+    /**
+     * Recursively include this number of levels up the tree in the response (parents, grand-parents, great-grand-parents, etc)
+     *
+     * @return pedigreeDepth
+     **/
+    public Integer getPedigreeDepth() {
+        return pedigreeDepth;
+    }
+
+    public void setPedigreeDepth(Integer pedigreeDepth) {
+        this.pedigreeDepth = pedigreeDepth;
+    }
+
+    public BrAPIPedigreeSearchRequest progenyDepth(Integer progenyDepth) {
+        this.progenyDepth = progenyDepth;
+        return this;
+    }
+
+    /**
+     * Recursively include this number of levels down the tree in the response (children, grand-children, great-grand-children, etc)
+     *
+     * @return progenyDepth
+     **/
+    public Integer getProgenyDepth() {
+        return progenyDepth;
+    }
+
+    public void setProgenyDepth(Integer progenyDepth) {
+        this.progenyDepth = progenyDepth;
+    }
+
+    public BrAPIPedigreeSearchRequest programDbIds(List<String> programDbIds) {
+        this.programDbIds = programDbIds;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
+        if (this.programDbIds == null) {
+            this.programDbIds = new ArrayList<String>();
+        }
+        this.programDbIds.add(programDbIdsItem);
+        return this;
+    }
+
+    /**
+     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
+     *
+     * @return programDbIds
+     **/
+    public List<String> getProgramDbIds() {
+        return programDbIds;
+    }
+
+    public void setProgramDbIds(List<String> programDbIds) {
+        this.programDbIds = programDbIds;
+    }
+
+    public BrAPIPedigreeSearchRequest programNames(List<String> programNames) {
+        this.programNames = programNames;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addProgramNamesItem(String programNamesItem) {
+        if (this.programNames == null) {
+            this.programNames = new ArrayList<String>();
+        }
+        this.programNames.add(programNamesItem);
+        return this;
+    }
+
+    /**
+     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
+     *
+     * @return programNames
+     **/
+    public List<String> getProgramNames() {
+        return programNames;
+    }
+
+    public void setProgramNames(List<String> programNames) {
+        this.programNames = programNames;
+    }
+
+    public BrAPIPedigreeSearchRequest species(List<String> species) {
+        this.species = species;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addSpeciesItem(String speciesItem) {
+        if (this.species == null) {
+            this.species = new ArrayList<String>();
+        }
+        this.species.add(speciesItem);
+        return this;
+    }
+
+    /**
+     * List of Species names to identify germplasm
+     *
+     * @return species
+     **/
+    public List<String> getSpecies() {
+        return species;
+    }
+
+    public void setSpecies(List<String> species) {
+        this.species = species;
+    }
+
+    public BrAPIPedigreeSearchRequest studyDbIds(List<String> studyDbIds) {
+        this.studyDbIds = studyDbIds;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
+        if (this.studyDbIds == null) {
+            this.studyDbIds = new ArrayList<String>();
+        }
+        this.studyDbIds.add(studyDbIdsItem);
+        return this;
+    }
+
+    /**
+     * List of study identifiers to search for
+     *
+     * @return studyDbIds
+     **/
+    public List<String> getStudyDbIds() {
+        return studyDbIds;
+    }
+
+    public void setStudyDbIds(List<String> studyDbIds) {
+        this.studyDbIds = studyDbIds;
+    }
+
+    public BrAPIPedigreeSearchRequest studyNames(List<String> studyNames) {
+        this.studyNames = studyNames;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addStudyNamesItem(String studyNamesItem) {
+        if (this.studyNames == null) {
+            this.studyNames = new ArrayList<String>();
+        }
+        this.studyNames.add(studyNamesItem);
+        return this;
+    }
+
+    /**
+     * List of study names to filter search results
+     *
+     * @return studyNames
+     **/
+    public List<String> getStudyNames() {
+        return studyNames;
+    }
+
+    public void setStudyNames(List<String> studyNames) {
+        this.studyNames = studyNames;
+    }
+
+    public BrAPIPedigreeSearchRequest synonyms(List<String> synonyms) {
+        this.synonyms = synonyms;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addSynonymsItem(String synonymsItem) {
+        if (this.synonyms == null) {
+            this.synonyms = new ArrayList<String>();
+        }
+        this.synonyms.add(synonymsItem);
+        return this;
+    }
+
+    /**
+     * List of alternative names or IDs used to reference this germplasm
+     *
+     * @return synonyms
+     **/
+    public List<String> getSynonyms() {
+        return synonyms;
+    }
+
+    public void setSynonyms(List<String> synonyms) {
+        this.synonyms = synonyms;
+    }
+
+    public BrAPIPedigreeSearchRequest trialDbIds(List<String> trialDbIds) {
+        this.trialDbIds = trialDbIds;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
+        if (this.trialDbIds == null) {
+            this.trialDbIds = new ArrayList<String>();
+        }
+        this.trialDbIds.add(trialDbIdsItem);
+        return this;
+    }
+
+    /**
+     * The ID which uniquely identifies a trial to search for
+     *
+     * @return trialDbIds
+     **/
+    public List<String> getTrialDbIds() {
+        return trialDbIds;
+    }
+
+    public void setTrialDbIds(List<String> trialDbIds) {
+        this.trialDbIds = trialDbIds;
+    }
+
+    public BrAPIPedigreeSearchRequest trialNames(List<String> trialNames) {
+        this.trialNames = trialNames;
+        return this;
+    }
+
+    public BrAPIPedigreeSearchRequest addTrialNamesItem(String trialNamesItem) {
+        if (this.trialNames == null) {
+            this.trialNames = new ArrayList<String>();
+        }
+        this.trialNames.add(trialNamesItem);
+        return this;
+    }
+
+    /**
+     * The human readable name of a trial to search for
+     *
+     * @return trialNames
+     **/
+    public List<String> getTrialNames() {
+        return trialNames;
+    }
+
+    public void setTrialNames(List<String> trialNames) {
+        this.trialNames = trialNames;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        BrAPIPedigreeSearchRequest pedigreeSearchRequest = (BrAPIPedigreeSearchRequest) o;
+        return Objects.equals(this.accessionNumbers, pedigreeSearchRequest.accessionNumbers) &&
+                Objects.equals(this.binomialNames, pedigreeSearchRequest.binomialNames) &&
+                Objects.equals(this.collections, pedigreeSearchRequest.collections) &&
+                Objects.equals(this.commonCropNames, pedigreeSearchRequest.commonCropNames) &&
+                Objects.equals(this.externalReferenceIDs, pedigreeSearchRequest.externalReferenceIDs) &&
+                Objects.equals(this.externalReferenceIds, pedigreeSearchRequest.externalReferenceIds) &&
+                Objects.equals(this.externalReferenceSources, pedigreeSearchRequest.externalReferenceSources) &&
+                Objects.equals(this.familyCodes, pedigreeSearchRequest.familyCodes) &&
+                Objects.equals(this.genus, pedigreeSearchRequest.genus) &&
+                Objects.equals(this.germplasmDbIds, pedigreeSearchRequest.germplasmDbIds) &&
+                Objects.equals(this.germplasmNames, pedigreeSearchRequest.germplasmNames) &&
+                Objects.equals(this.germplasmPUIs, pedigreeSearchRequest.germplasmPUIs) &&
+                Objects.equals(this.includeFullTree, pedigreeSearchRequest.includeFullTree) &&
+                Objects.equals(this.includeParents, pedigreeSearchRequest.includeParents) &&
+                Objects.equals(this.includeProgeny, pedigreeSearchRequest.includeProgeny) &&
+                Objects.equals(this.includeSiblings, pedigreeSearchRequest.includeSiblings) &&
+                Objects.equals(this.instituteCodes, pedigreeSearchRequest.instituteCodes) &&
+                Objects.equals(this.page, pedigreeSearchRequest.page) &&
+                Objects.equals(this.pageSize, pedigreeSearchRequest.pageSize) &&
+                Objects.equals(this.pedigreeDepth, pedigreeSearchRequest.pedigreeDepth) &&
+                Objects.equals(this.progenyDepth, pedigreeSearchRequest.progenyDepth) &&
+                Objects.equals(this.programDbIds, pedigreeSearchRequest.programDbIds) &&
+                Objects.equals(this.programNames, pedigreeSearchRequest.programNames) &&
+                Objects.equals(this.species, pedigreeSearchRequest.species) &&
+                Objects.equals(this.studyDbIds, pedigreeSearchRequest.studyDbIds) &&
+                Objects.equals(this.studyNames, pedigreeSearchRequest.studyNames) &&
+                Objects.equals(this.synonyms, pedigreeSearchRequest.synonyms) &&
+                Objects.equals(this.trialDbIds, pedigreeSearchRequest.trialDbIds) &&
+                Objects.equals(this.trialNames, pedigreeSearchRequest.trialNames);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(accessionNumbers, binomialNames, collections, commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, familyCodes, genus, germplasmDbIds, germplasmNames, germplasmPUIs, includeFullTree, includeParents, includeProgeny, includeSiblings, instituteCodes, page, pageSize, pedigreeDepth, progenyDepth, programDbIds, programNames, species, studyDbIds, studyNames, synonyms, trialDbIds, trialNames);
+    }
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class PedigreeSearchRequest {\n");
+
+        sb.append("    accessionNumbers: ").append(toIndentedString(accessionNumbers)).append("\n");
+        sb.append("    binomialNames: ").append(toIndentedString(binomialNames)).append("\n");
+        sb.append("    collections: ").append(toIndentedString(collections)).append("\n");
+        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
+        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
+        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
+        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
+        sb.append("    familyCodes: ").append(toIndentedString(familyCodes)).append("\n");
+        sb.append("    genus: ").append(toIndentedString(genus)).append("\n");
+        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
+        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
+        sb.append("    germplasmPUIs: ").append(toIndentedString(germplasmPUIs)).append("\n");
+        sb.append("    includeFullTree: ").append(toIndentedString(includeFullTree)).append("\n");
+        sb.append("    includeParents: ").append(toIndentedString(includeParents)).append("\n");
+        sb.append("    includeProgeny: ").append(toIndentedString(includeProgeny)).append("\n");
+        sb.append("    includeSiblings: ").append(toIndentedString(includeSiblings)).append("\n");
+        sb.append("    instituteCodes: ").append(toIndentedString(instituteCodes)).append("\n");
+        sb.append("    page: ").append(toIndentedString(page)).append("\n");
+        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
+        sb.append("    pedigreeDepth: ").append(toIndentedString(pedigreeDepth)).append("\n");
+        sb.append("    progenyDepth: ").append(toIndentedString(progenyDepth)).append("\n");
+        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
+        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
+        sb.append("    species: ").append(toIndentedString(species)).append("\n");
+        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
+        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
+        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
+        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
+        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+
+}
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIGermplasmPedigreeResponse.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIGermplasmPedigreeResponse.java
index c7b920e0..7b8ae424 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIGermplasmPedigreeResponse.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIGermplasmPedigreeResponse.java
@@ -8,7 +8,7 @@
 import org.brapi.v2.model.BrAPIResponse;
 import org.brapi.v2.model.BrAPIContext;
 import org.brapi.v2.model.BrAPIMetadata;
-import org.brapi.v2.model.germ.BrAPIPedigreeNode;
+import org.brapi.v2.model.germ.BrAPIPedigreeNode_Deprecated;
 
 
 /**
@@ -16,7 +16,7 @@
  */
 
 
-public class BrAPIGermplasmPedigreeResponse implements BrAPIResponse<BrAPIPedigreeNode>  {
+public class BrAPIGermplasmPedigreeResponse implements BrAPIResponse<BrAPIPedigreeNode_Deprecated>  {
   @JsonProperty("@context")
   private BrAPIContext _atContext = null;
 
@@ -24,7 +24,7 @@ public class BrAPIGermplasmPedigreeResponse implements BrAPIResponse<BrAPIPedigr
   private BrAPIMetadata metadata = null;
 
   @JsonProperty("result")
-  private BrAPIPedigreeNode result = null;
+  private BrAPIPedigreeNode_Deprecated result = null;
 
   public BrAPIGermplasmPedigreeResponse _atContext(BrAPIContext _atContext) {
     this._atContext = _atContext;
@@ -58,7 +58,7 @@ public void setMetadata(BrAPIMetadata metadata) {
     this.metadata = metadata;
   }
 
-  public BrAPIGermplasmPedigreeResponse result(BrAPIPedigreeNode result) {
+  public BrAPIGermplasmPedigreeResponse result(BrAPIPedigreeNode_Deprecated result) {
     this.result = result;
     return this;
   }
@@ -71,11 +71,11 @@ public BrAPIGermplasmPedigreeResponse result(BrAPIPedigreeNode result) {
       
 
     @Valid
-    public BrAPIPedigreeNode getResult() {
+    public BrAPIPedigreeNode_Deprecated getResult() {
     return result;
   }
 
-  public void setResult(BrAPIPedigreeNode result) {
+  public void setResult(BrAPIPedigreeNode_Deprecated result) {
     this.result = result;
   }
 
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIPedigreeListResponse.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIPedigreeListResponse.java
new file mode 100644
index 00000000..fc687773
--- /dev/null
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIPedigreeListResponse.java
@@ -0,0 +1,134 @@
+/*
+ * BrAPI-Germplasm
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ *
+ * OpenAPI spec version: 2.1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package org.brapi.v2.model.germ.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+import org.brapi.v2.model.BrAPIContext;
+import org.brapi.v2.model.BrAPIMetadata;
+
+/**
+ * PedigreeListResponse
+ */
+
+public class BrAPIPedigreeListResponse {
+    @JsonProperty("@context")
+    private BrAPIContext _atContext = null;
+
+    @JsonProperty("metadata")
+    private BrAPIMetadata metadata = null;
+
+    @JsonProperty("result")
+    private BrAPIPedigreeListResponseResult result = null;
+
+    public BrAPIPedigreeListResponse _atContext(BrAPIContext _atContext) {
+        this._atContext = _atContext;
+        return this;
+    }
+
+    /**
+     * Get _atContext
+     *
+     * @return _atContext
+     **/
+    public BrAPIContext getAtContext() {
+        return _atContext;
+    }
+
+    public void setAtContext(BrAPIContext _atContext) {
+        this._atContext = _atContext;
+    }
+
+    public BrAPIPedigreeListResponse metadata(BrAPIMetadata metadata) {
+        this.metadata = metadata;
+        return this;
+    }
+
+    /**
+     * Get metadata
+     *
+     * @return metadata
+     **/
+    public BrAPIMetadata getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(BrAPIMetadata metadata) {
+        this.metadata = metadata;
+    }
+
+    public BrAPIPedigreeListResponse result(BrAPIPedigreeListResponseResult result) {
+        this.result = result;
+        return this;
+    }
+
+    /**
+     * Get result
+     *
+     * @return result
+     **/
+    public BrAPIPedigreeListResponseResult getResult() {
+        return result;
+    }
+
+    public void setResult(BrAPIPedigreeListResponseResult result) {
+        this.result = result;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        BrAPIPedigreeListResponse pedigreeListResponse = (BrAPIPedigreeListResponse) o;
+        return Objects.equals(this._atContext, pedigreeListResponse._atContext) &&
+                Objects.equals(this.metadata, pedigreeListResponse.metadata) &&
+                Objects.equals(this.result, pedigreeListResponse.result);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(_atContext, metadata, result);
+    }
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class PedigreeListResponse {\n");
+
+        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
+        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
+        sb.append("    result: ").append(toIndentedString(result)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+
+}
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIPedigreeListResponseResult.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIPedigreeListResponseResult.java
new file mode 100644
index 00000000..45eca752
--- /dev/null
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIPedigreeListResponseResult.java
@@ -0,0 +1,94 @@
+/*
+ * BrAPI-Germplasm
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ *
+ * OpenAPI spec version: 2.1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package org.brapi.v2.model.germ.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import org.brapi.v2.model.germ.BrAPIPedigreeNode;
+
+/**
+ * PedigreeListResponseResult
+ */
+
+public class BrAPIPedigreeListResponseResult {
+	@JsonProperty("data")
+    private List<BrAPIPedigreeNode> data = new ArrayList<BrAPIPedigreeNode>();
+
+    public BrAPIPedigreeListResponseResult data(List<BrAPIPedigreeNode> data) {
+        this.data = data;
+        return this;
+    }
+
+    public BrAPIPedigreeListResponseResult addDataItem(BrAPIPedigreeNode dataItem) {
+        this.data.add(dataItem);
+        return this;
+    }
+
+    /**
+     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
+     *
+     * @return data
+     **/
+    public List<BrAPIPedigreeNode> getData() {
+        return data;
+    }
+
+    public void setData(List<BrAPIPedigreeNode> data) {
+        this.data = data;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        BrAPIPedigreeListResponseResult pedigreeListResponseResult = (BrAPIPedigreeListResponseResult) o;
+        return Objects.equals(this.data, pedigreeListResponseResult.data);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(data);
+    }
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class PedigreeListResponseResult {\n");
+
+        sb.append("    data: ").append(toIndentedString(data)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+
+}

From 5036a326d491a2796320a85f318d37a74137c4b1 Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Wed, 16 Aug 2023 14:51:47 -0400
Subject: [PATCH 04/28] fixed small test bug

---
 .../org/brapi/client/v2/BrAPIClientTest.java  |  4 +-
 .../modules/germplasm/PedigreeAPITests.java   | 48 +++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/BrAPIClientTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/BrAPIClientTest.java
index 0aaff245..70d152d8 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/BrAPIClientTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/BrAPIClientTest.java
@@ -56,8 +56,8 @@ public BrAPIClientTest() {
                 .withEnv("POSTGRES_PASSWORD", dbPassword)
                 .waitingFor(Wait.forLogMessage(".*LOG:  database system is ready to accept connections.*", 1).withStartupTimeout(Duration.of(2, ChronoUnit.MINUTES)));
 
-        brapiContainer = new GenericContainer<>("breedinginsight/brapi-java-server:develop")
-//          brapiContainer = new GenericContainer<>("brapicoordinatorselby/brapi-java-server:v2")
+//        brapiContainer = new GenericContainer<>("breedinginsight/brapi-java-server:develop")
+        brapiContainer = new GenericContainer<>("brapicoordinatorselby/brapi-java-server:v2")
                 .withNetwork(network)
                 .withImagePullPolicy(PullPolicy.alwaysPull())
                 .withExposedPorts(8080)
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/PedigreeAPITests.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/PedigreeAPITests.java
index 94f97352..28696d1c 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/PedigreeAPITests.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/PedigreeAPITests.java
@@ -17,12 +17,15 @@
 
 package org.brapi.client.v2.modules.germplasm;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.brapi.client.v2.ApiResponse;
 import org.brapi.client.v2.BrAPIClientTest;
 import org.brapi.client.v2.model.exceptions.ApiException;
 import org.brapi.client.v2.model.queryParams.germplasm.PedigreeQueryParams;
+import org.brapi.v2.model.BrAPIAcceptedSearchResponse;
 import org.brapi.v2.model.BrAPIExternalReference;
 import org.brapi.v2.model.germ.BrAPIPedigreeNode;
+import org.brapi.v2.model.germ.request.BrAPIPedigreeSearchRequest;
 import org.brapi.v2.model.germ.response.BrAPIPedigreeListResponse;
 import org.junit.jupiter.api.*;
 
@@ -58,6 +61,51 @@ public void getsPedigreePageFilter() throws Exception {
         assertEquals(true, pedigree.getBody().getResult().getData().size() == 1, "More than one pedigree was returned");
     }
 
+    @Test
+    public void searchPedigreePostResponse() throws Exception {
+        BrAPIPedigreeSearchRequest baseRequest = new BrAPIPedigreeSearchRequest()
+        		.addGermplasmDbIdsItem("germplasm1")
+        		.addGermplasmDbIdsItem("germplasm2")
+        		.addGermplasmDbIdsItem("germplasm3");
+
+        ApiResponse<Pair<Optional<BrAPIPedigreeListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = this.pedigreeAPI.searchPedigreePost(baseRequest);
+        Optional<BrAPIPedigreeListResponse> listResponse = response.getBody().getLeft();
+        Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+        // only results are returned
+        assertTrue(listResponse.isPresent());
+        assertFalse(searchIdResponse.isPresent());
+        
+        assertEquals(3, listResponse.get().getResult().getData().size(), "unexpected number of pedigree nodes returned");
+    }
+
+    @Test
+    public void searchPedigreeGetResponse() throws Exception {
+        BrAPIPedigreeSearchRequest baseRequest = new BrAPIPedigreeSearchRequest()
+        		.addGermplasmDbIdsItem("germplasm1")
+        		.addGermplasmDbIdsItem("germplasm2")
+        		.addGermplasmDbIdsItem("germplasm3")
+        		.addGermplasmDbIdsItem("germplasm1")
+        		.addGermplasmDbIdsItem("germplasm2")
+        		.addGermplasmDbIdsItem("germplasm3");
+
+        ApiResponse<Pair<Optional<BrAPIPedigreeListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = this.pedigreeAPI.searchPedigreePost(baseRequest);
+        Optional<BrAPIPedigreeListResponse> listResponse = response.getBody().getLeft();
+        Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+        // only search ID is returned
+        assertFalse(listResponse.isPresent());
+        assertTrue(searchIdResponse.isPresent());
+        
+        // Get results from search ID
+    	ApiResponse<Pair<Optional<BrAPIPedigreeListResponse>, Optional<BrAPIAcceptedSearchResponse>>> searchResponse = this.pedigreeAPI.searchPedigreeSearchResultsDbIdGet(searchIdResponse.get().getResult().getSearchResultsDbId(), 0, 10);
+        Optional<BrAPIPedigreeListResponse> listResponse2 = searchResponse.getBody().getLeft();
+        Optional<BrAPIAcceptedSearchResponse> searchIdResponse2 = searchResponse.getBody().getRight();
+        // only results are returned
+        assertTrue(listResponse2.isPresent());
+        assertFalse(searchIdResponse2.isPresent());
+        
+        assertEquals(3, listResponse2.get().getResult().getData().size(), "unexpected number of pedigree nodes returned");
+    }
+
     @Test
     public void createPedigreeSuccess() throws Exception {
 

From 2547f1485c1d5f3e430026c1d4a21062b6957c12 Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Wed, 16 Aug 2023 17:07:41 -0400
Subject: [PATCH 05/28] fixes issues #71, #72, #73, #74, #137, #138, #104,
 #105, #106, #107, #180, #181, #182, #183, #188, #189, #190, #191, #161, #162,
 #133, #134, #135, #136

---
 .../queryParams/core/ListQueryParams.java     |   27 +-
 .../queryParams/core/LocationQueryParams.java |   27 +-
 .../queryParams/core/PeopleQueryParams.java   |   27 +-
 .../queryParams/core/ProgramQueryParams.java  |   27 +-
 .../queryParams/core/StudyQueryParams.java    |   27 +-
 .../queryParams/core/TrialQueryParams.java    |   27 +-
 .../germplasm/CrossQueryParams.java           |   27 +-
 .../germplasm/CrossingProjectQueryParams.java |   27 +-
 .../GermplasmAttributeQueryParams.java        |   41 +-
 .../GermplasmAttributeValueQueryParams.java   |   27 +-
 .../germplasm/GermplasmQueryParams.java       |   27 +-
 .../germplasm/PlannedCrossQueryParams.java    |   27 +-
 .../germplasm/SeedLotQueryParams.java         |   27 +-
 .../SeedLotTransactionQueryParams.java        |   27 +-
 .../phenotype/ImageQueryParams.java           |   27 +-
 .../phenotype/MethodQueryParams.java          |   42 +-
 .../phenotype/ObservationQueryParams.java     |   27 +-
 .../phenotype/ObservationUnitQueryParams.java |   27 +-
 .../phenotype/ScaleQueryParams.java           |   40 +-
 .../phenotype/TraitQueryParams.java           |   42 +-
 .../phenotype/VariableQueryParams.java        |   54 +-
 .../client/v2/modules/core/ListsApi.java      |    6 +-
 .../client/v2/modules/core/LocationsApi.java  |    6 +-
 .../client/v2/modules/core/PeopleApi.java     |    6 +-
 .../client/v2/modules/core/ProgramsApi.java   |    6 +-
 .../client/v2/modules/core/StudiesApi.java    |    6 +-
 .../client/v2/modules/core/TrialsApi.java     |    6 +-
 .../client/v2/modules/genotype/PlatesApi.java |    6 +-
 .../v2/modules/genotype/SamplesApi.java       |    6 +-
 .../v2/modules/germplasm/CrossesApi.java      |   12 +-
 .../germplasm/CrossingProjectsApi.java        |    6 +-
 .../v2/modules/germplasm/GermplasmApi.java    |    6 +-
 .../GermplasmAttributeValuesApi.java          |    6 +-
 .../germplasm/GermplasmAttributesApi.java     |    7 +-
 .../v2/modules/germplasm/SeedLotsApi.java     |   12 +-
 .../v2/modules/phenotype/ImagesApi.java       |    6 +-
 .../v2/modules/phenotype/MethodsApi.java      |    6 +-
 .../phenotype/ObservationUnitsApi.java        |    6 +-
 .../phenotype/ObservationVariablesApi.java    |    6 +-
 .../v2/modules/phenotype/ObservationsApi.java |    6 +-
 .../v2/modules/phenotype/ScalesApi.java       |    6 +-
 .../v2/modules/phenotype/TraitsApi.java       |    6 +-
 .../v2/model/BrAPIExternalReference.java      |  200 ++-
 .../model/germ/BrAPIGermplasmAttribute.java   | 1143 +++++++------
 .../BrAPIGermplasmAttributeSearchRequest.java | 1514 ++++++++++++-----
 .../org/brapi/v2/model/pheno/BrAPIMethod.java |  586 +++----
 .../model/pheno/BrAPIObservationVariable.java |   27 +-
 .../org/brapi/v2/model/pheno/BrAPIScale.java  |  170 +-
 .../v2/model/pheno/BrAPIScaleValidValues.java |  291 ++--
 .../org/brapi/v2/model/pheno/BrAPITrait.java  |  136 +-
 .../v2/model/pheno/BrAPITraitDataType.java    |  103 +-
 ...BrAPIObservationVariableSearchRequest.java |  797 ++++++++-
 52 files changed, 3954 insertions(+), 1803 deletions(-)

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ListQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ListQueryParams.java
index dea7d8b5..84fa90ba 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ListQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ListQueryParams.java
@@ -38,6 +38,31 @@ public class ListQueryParams extends BrAPIQueryParams {
     private String listName;
     private String listDbId;
     private String listSource;
-    private String externalReferenceID;
     private String externalReferenceSource;
+    private String externalReferenceId;
+    @Deprecated
+    private String externalReferenceID;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/LocationQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/LocationQueryParams.java
index 60b67c49..6985e934 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/LocationQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/LocationQueryParams.java
@@ -34,7 +34,32 @@ public class LocationQueryParams extends BrAPIQueryParams {
 
     private String locationType;
     private String locationDbId;
-    private String externalReferenceID;
     private String externalReferenceSource;
+    private String externalReferenceId;
+    @Deprecated
+    private String externalReferenceID;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/PeopleQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/PeopleQueryParams.java
index edea802a..769996a1 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/PeopleQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/PeopleQueryParams.java
@@ -36,7 +36,32 @@ public class PeopleQueryParams extends BrAPIQueryParams {
     private String lastName;
     private String personDbId;
     private String userID;
-    private String externalReferenceID;
     private String externalReferenceSource;
+    private String externalReferenceId;
+    @Deprecated
+    private String externalReferenceID;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ProgramQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ProgramQueryParams.java
index bdcba65d..004915ef 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ProgramQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ProgramQueryParams.java
@@ -36,6 +36,31 @@ public class ProgramQueryParams extends BrAPIQueryParams {
     private String programDbId;
     private String programName;
     private String abbreviation;
-    private String externalReferenceID;
     private String externalReferenceSource;
+    private String externalReferenceId;
+    @Deprecated
+    private String externalReferenceID;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/StudyQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/StudyQueryParams.java
index 2fd8d2e7..be654f4a 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/StudyQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/StudyQueryParams.java
@@ -47,6 +47,31 @@ public class StudyQueryParams extends BrAPIQueryParams {
     private String active;
     private String sortBy;
     private String sortOrder;
-    private String externalReferenceID;
     private String externalReferenceSource;
+    private String externalReferenceId;
+    @Deprecated
+    private String externalReferenceID;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/TrialQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/TrialQueryParams.java
index 10a98743..745d9896 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/TrialQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/TrialQueryParams.java
@@ -45,6 +45,31 @@ public class TrialQueryParams extends BrAPIQueryParams {
     private String trialPUI;
     private String sortBy;
     private String sortOrder;
-    private String externalReferenceID;
     private String externalReferenceSource;
+    private String externalReferenceId;
+    @Deprecated
+    private String externalReferenceID;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossQueryParams.java
index 1c71c816..b87ab8e3 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossQueryParams.java
@@ -36,6 +36,31 @@ public class CrossQueryParams extends BrAPIQueryParams {
 
     private String crossingProjectDbId;
     private String crossDbId;
-    private String externalReferenceID;
     private String externalReferenceSource;
+    private String externalReferenceId;
+    @Deprecated
+    private String externalReferenceID;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossingProjectQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossingProjectQueryParams.java
index 0598000f..85f8e761 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossingProjectQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossingProjectQueryParams.java
@@ -35,6 +35,31 @@
 public class CrossingProjectQueryParams extends BrAPIQueryParams {
 
     private String crossingProjectDbId;
-    private String externalReferenceID;
     private String externalReferenceSource;
+    private String externalReferenceId;
+    @Deprecated
+    private String externalReferenceID;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeQueryParams.java
index ba7e02f1..b9985891 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeQueryParams.java
@@ -38,8 +38,47 @@ public class GermplasmAttributeQueryParams extends BrAPIQueryParams {
     private String attributeCategory;
     private String attributeDbId;
     private String attributeName;
+    private String attributePUI;
+    private String commonCropName;
+    private String externalReferenceSource;
     private String germplasmDbId;
+    private String methodDbId;
+	private String methodName;
+    private String methodPUI; 
+    private String programDbId;
+    private String scaleDbId;
+    private String scaleName;
+    private String scalePUI;
+    private String traitDbId;
+    private String traitName;
+    private String traitPUI;
+
+
+    private String externalReferenceId;
+    @Deprecated
     private String externalReferenceID;
-    private String externalReferenceSource;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java
index bdb17d96..e28d0b7c 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java
@@ -39,7 +39,32 @@ public class GermplasmAttributeValueQueryParams extends BrAPIQueryParams {
     private String attributeDbId;
     private String attributeName;
     private String germplasmDbId;
-    private String externalReferenceID;
     private String externalReferenceSource;
+    private String externalReferenceId;
+    @Deprecated
+    private String externalReferenceID;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmQueryParams.java
index e9750376..cbef452f 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmQueryParams.java
@@ -47,7 +47,32 @@ public class GermplasmQueryParams extends BrAPIQueryParams {
     private String synonym;
     private String parentDbId;
     private String progenyDbId;
-    private String externalReferenceID;
     private String externalReferenceSource;
+    private String externalReferenceId;
+    @Deprecated
+    private String externalReferenceID;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/PlannedCrossQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/PlannedCrossQueryParams.java
index e5844a24..dafc9351 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/PlannedCrossQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/PlannedCrossQueryParams.java
@@ -36,6 +36,31 @@ public class PlannedCrossQueryParams extends BrAPIQueryParams {
 
     private String crossingProjectDbId;
     private String plannedCrossDbId;
-    private String externalReferenceID;
     private String externalReferenceSource;
+    private String externalReferenceId;
+    @Deprecated
+    private String externalReferenceID;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotQueryParams.java
index d5036e75..4a238613 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotQueryParams.java
@@ -37,7 +37,32 @@ public class SeedLotQueryParams extends BrAPIQueryParams {
 
     private String seedLotDbId;
     private String germplasmDbId;
-    private String externalReferenceID;
     private String externalReferenceSource;
+    private String externalReferenceId;
+    @Deprecated
+    private String externalReferenceID;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotTransactionQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotTransactionQueryParams.java
index 0476c67c..5f95e830 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotTransactionQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotTransactionQueryParams.java
@@ -38,7 +38,32 @@ public class SeedLotTransactionQueryParams extends BrAPIQueryParams {
     private String transactionDbId;
     private String seedLotDbId;
     private String germplasmDbId;
-    private String externalReferenceID;
     private String externalReferenceSource;
+    private String externalReferenceId;
+    @Deprecated
+    private String externalReferenceID;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ImageQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ImageQueryParams.java
index c7e9f608..7d23a559 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ImageQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ImageQueryParams.java
@@ -39,7 +39,32 @@ public class ImageQueryParams extends BrAPIQueryParams {
     protected String observationUnitDbId;
     protected String observationDbId;
     protected String descriptiveOntologyTerm;
-    protected String externalReferenceID;
     protected String externalReferenceSource;
+    private String externalReferenceId;
+    @Deprecated
+    private String externalReferenceID;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/MethodQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/MethodQueryParams.java
index ee96296d..fc2f50b8 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/MethodQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/MethodQueryParams.java
@@ -31,12 +31,44 @@
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(fluent=true)
+@Accessors(fluent = true)
 public class MethodQueryParams extends BrAPIQueryParams {
 
-    private String methodDbId;
-    private String observationVariableDbId;
-    private String externalReferenceID;
-    private String externalReferenceSource;
+	private String commonCropName;
+	private String externalReferenceId;
+	@Deprecated
+	private String externalReferenceID;
+	private String externalReferenceSource;
+	private String methodDbId;
+	private String observationVariableDbId;
+	private String ontologyDbId;
+	private String programDbId;
+
+	public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+
+	public String externalReferenceId() {
+		return externalReferenceId;
+	}
+
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationQueryParams.java
index 887e181a..bfae4d60 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationQueryParams.java
@@ -48,7 +48,32 @@ public class ObservationQueryParams extends BrAPIQueryParams {
     protected String observationUnitLevelCode;
     protected String observationTimeStampRangeStart;
     protected String observationTimeStampRangeEnd;
-    protected String externalReferenceID;
     protected String externalReferenceSource;
+    private String externalReferenceId;
+    @Deprecated
+    private String externalReferenceID;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationUnitQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationUnitQueryParams.java
index ec55323c..9cb3fc82 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationUnitQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationUnitQueryParams.java
@@ -45,7 +45,32 @@ public class ObservationUnitQueryParams extends BrAPIQueryParams {
     protected String observationUnitLevelOrder;
     protected String observationUnitLevelCode;
     protected Boolean includeObservations;
-    protected String externalReferenceID;
     protected String externalReferenceSource;
+    private String externalReferenceId;
+    @Deprecated
+    private String externalReferenceID;
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ScaleQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ScaleQueryParams.java
index 871d5d84..d3bc2eb8 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ScaleQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ScaleQueryParams.java
@@ -31,12 +31,44 @@
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(fluent=true)
+@Accessors(fluent = true)
 public class ScaleQueryParams extends BrAPIQueryParams {
 
+	private String commonCropName;
+	private String externalReferenceId;
+	@Deprecated
+	private String externalReferenceID;
+	private String externalReferenceSource;
+	private String observationVariableDbId;
+	private String ontologyDbId;
+	private String programDbId;
 	private String scaleDbId;
-    private String observationVariableDbId;
-    private String externalReferenceID;
-    private String externalReferenceSource;
+
+	public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+
+	public String externalReferenceId() {
+		return externalReferenceId;
+	}
+
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/TraitQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/TraitQueryParams.java
index 547ca177..7488546b 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/TraitQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/TraitQueryParams.java
@@ -31,12 +31,44 @@
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(fluent=true)
+@Accessors(fluent = true)
 public class TraitQueryParams extends BrAPIQueryParams {
 
-    private String traitDbId;
-    private String observationVariableDbId;
-    private String externalReferenceID;
-    private String externalReferenceSource;
+	private String commonCropName;
+	private String externalReferenceId;
+	@Deprecated
+	private String externalReferenceID;
+	private String externalReferenceSource;
+	private String observationVariableDbId;
+	private String ontologyDbId;
+	private String programDbId;
+	private String traitDbId;
+
+	public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+
+	public String externalReferenceId() {
+		return externalReferenceId;
+	}
+
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/VariableQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/VariableQueryParams.java
index 283f8cf2..f85cf0d5 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/VariableQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/VariableQueryParams.java
@@ -31,13 +31,57 @@
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(fluent=true)
+@Accessors(fluent = true)
 public class VariableQueryParams extends BrAPIQueryParams {
 
+	private String commonCropName;
+	private String externalReferenceId;
+	@Deprecated
+	private String externalReferenceID;
+	private String externalReferenceSource;
+	private String methodDbId;
+	private String methodName;
+	private String methodPUI;
+	private String observationVariableDbId;
+	private String observationVariableName;
+	private String observationVariablePUI;
+	private String ontologyDbId;
+	private String programDbId;
+	private String scaleDbId;
+	private String scaleName;
+	private String scalePUI;
+	private String studyDbId;
 	private String traitClass;
-    private String studyDbId;
-    private String observationVariableDbId;
-    private String externalReferenceID;
-    private String externalReferenceSource;
+	private String traitDbId;
+	private String traitName;
+	private String traitPUI;
+	private String trialDbId;
+
+	public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+
+	public String externalReferenceId() {
+		return externalReferenceId;
+	}
+
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/ListsApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/ListsApi.java
index 933548ff..d44434b6 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/ListsApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/ListsApi.java
@@ -80,10 +80,10 @@ private Call listsGetCall(ListQueryParams queryParams) throws ApiException {
             apiClient.prepQueryParameter(localVarQueryParams, "listDbId", queryParams.listDbId());
         if (queryParams.listSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "listSource", queryParams.listSource());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/LocationsApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/LocationsApi.java
index b486036d..a8ca6587 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/LocationsApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/LocationsApi.java
@@ -75,10 +75,10 @@ private Call locationsGetCall(LocationQueryParams queryParams) throws ApiExcepti
             apiClient.prepQueryParameter(localVarQueryParams, "locationType", queryParams.locationType());
         if (queryParams.locationDbId() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "locationDbId", queryParams.locationDbId());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/PeopleApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/PeopleApi.java
index d2204aba..9c24decd 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/PeopleApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/PeopleApi.java
@@ -79,10 +79,10 @@ private Call peopleGetCall(PeopleQueryParams queryParams) throws ApiException {
             apiClient.prepQueryParameter(localVarQueryParams, "personDbId", queryParams.personDbId());
         if (queryParams.userID() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "userID", queryParams.userID());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/ProgramsApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/ProgramsApi.java
index 68397e8e..ef003ac3 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/ProgramsApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/ProgramsApi.java
@@ -79,10 +79,10 @@ private Call programsGetCall(ProgramQueryParams queryParams) throws ApiException
             apiClient.prepQueryParameter(localVarQueryParams, "programName", queryParams.programName());
         if (queryParams.abbreviation() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "abbreviation", queryParams.abbreviation());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/StudiesApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/StudiesApi.java
index 9a3dcaac..e18801a0 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/StudiesApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/StudiesApi.java
@@ -257,10 +257,10 @@ private Call studiesGetCall(StudyQueryParams queryParams) throws ApiException {
             apiClient.prepQueryParameter(localVarQueryParams, "sortBy", queryParams.sortBy());
         if (queryParams.sortOrder() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "sortOrder", queryParams.sortOrder());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/TrialsApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/TrialsApi.java
index 2c9f6b5c..b1ce75ae 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/TrialsApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/TrialsApi.java
@@ -252,10 +252,10 @@ private Call trialsGetCall(TrialQueryParams queryParams) throws ApiException {
             apiClient.prepQueryParameter(localVarQueryParams, "sortBy", queryParams.sortBy());
         if (queryParams.sortOrder() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "sortOrder", queryParams.sortOrder());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/genotype/PlatesApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/genotype/PlatesApi.java
index 17382bb4..addb9dda 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/genotype/PlatesApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/genotype/PlatesApi.java
@@ -93,10 +93,10 @@ private Call platesGetCall(PlatesQueryParams queryParams) throws ApiException {
             apiClient.prepQueryParameter(localVarQueryParams, "studyDbId", queryParams.studyDbId());
         if (queryParams.germplasmDbId() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "germplasmDbId", queryParams.germplasmDbId());
-        if (queryParams.externalReferenceId() != null) {
+        if (queryParams.externalReferenceID() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceId() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceId());
-        }
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.expandHomozygotes() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/genotype/SamplesApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/genotype/SamplesApi.java
index dbb8e9a4..89784609 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/genotype/SamplesApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/genotype/SamplesApi.java
@@ -78,10 +78,10 @@ private Call samplesGetCall(SampleQueryParams queryParams) throws ApiException {
             apiClient.prepQueryParameter(localVarQueryParams, "germplasmDbId", queryParams.germplasmDbId());
         if (queryParams.studyDbId() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "studyDbId", queryParams.studyDbId());
-        if (queryParams.externalReferenceId() != null) {
+        if (queryParams.externalReferenceID() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceId() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceId());
-        }
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/CrossesApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/CrossesApi.java
index 3d331e56..38c2c682 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/CrossesApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/CrossesApi.java
@@ -72,10 +72,10 @@ private Call crossesGetCall(CrossQueryParams queryParams) throws ApiException {
             apiClient.prepQueryParameter(localVarQueryParams, "crossingProjectDbId", queryParams.crossingProjectDbId());
         if (queryParams.crossDbId() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "crossDbId", queryParams.crossDbId());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
@@ -297,10 +297,10 @@ private Call plannedcrossesGetCall(PlannedCrossQueryParams queryParams) throws A
             apiClient.prepQueryParameter(localVarQueryParams, "crossingProjectDbId", queryParams.crossingProjectDbId());
         if (queryParams.plannedCrossDbId() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "plannedCrossDbId", queryParams.plannedCrossDbId());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/CrossingProjectsApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/CrossingProjectsApi.java
index b9e0a169..56aa3ad5 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/CrossingProjectsApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/CrossingProjectsApi.java
@@ -221,10 +221,10 @@ private Call crossingprojectsGetCall(CrossingProjectQueryParams queryParams) thr
         Map<String, String> localVarCollectionQueryParams = new HashMap<>();
         if (queryParams.crossingProjectDbId() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "crossingProjectDbId", queryParams.crossingProjectDbId());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/GermplasmApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/GermplasmApi.java
index 581fbabe..569c7b3e 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/GermplasmApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/GermplasmApi.java
@@ -631,10 +631,10 @@ private Call germplasmGetCall(GermplasmQueryParams queryParams) throws ApiExcept
             apiClient.prepQueryParameter(localVarQueryParams, "parentDbId", queryParams.parentDbId());
         if (queryParams.progenyDbId() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "progenyDbId", queryParams.progenyDbId());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/GermplasmAttributeValuesApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/GermplasmAttributeValuesApi.java
index e2c159d4..8df21b39 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/GermplasmAttributeValuesApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/GermplasmAttributeValuesApi.java
@@ -232,10 +232,10 @@ private Call attributevaluesGetCall(GermplasmAttributeValueQueryParams queryPara
             apiClient.prepQueryParameter(localVarQueryParams, "attributeName", queryParams.attributeName());
         if (queryParams.germplasmDbId() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "germplasmDbId", queryParams.germplasmDbId());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/GermplasmAttributesApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/GermplasmAttributesApi.java
index 5d9cd19f..6572bc61 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/GermplasmAttributesApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/GermplasmAttributesApi.java
@@ -35,7 +35,6 @@
 import com.google.gson.reflect.TypeToken;
 
 import okhttp3.Call;
-import org.brapi.v2.model.pheno.response.BrAPIObservationUnitListResponse;
 
 public class GermplasmAttributesApi {
     private BrAPIClient apiClient;
@@ -309,10 +308,10 @@ private Call attributesGetCall(GermplasmAttributeQueryParams queryParams) throws
             apiClient.prepQueryParameter(localVarQueryParams, "attributeName", queryParams.attributeName());
         if (queryParams.germplasmDbId() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "germplasmDbId", queryParams.germplasmDbId());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/SeedLotsApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/SeedLotsApi.java
index d75efb14..4088f8b3 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/SeedLotsApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/germplasm/SeedLotsApi.java
@@ -74,10 +74,10 @@ private Call seedlotsGetCall(SeedLotQueryParams queryParams) throws ApiException
             apiClient.prepQueryParameter(localVarQueryParams, "seedLotDbId", queryParams.seedLotDbId());
         if (queryParams.germplasmDbId() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "germplasmDbId", queryParams.germplasmDbId());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
@@ -474,10 +474,10 @@ private Call seedlotsTransactionsGetCall(SeedLotTransactionQueryParams queryPara
             apiClient.prepQueryParameter(localVarQueryParams, "seedLotDbId", queryParams.seedLotDbId());
         if (queryParams.germplasmDbId() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "germplasmDbId", queryParams.germplasmDbId());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ImagesApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ImagesApi.java
index db0b8826..33682324 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ImagesApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ImagesApi.java
@@ -82,10 +82,10 @@ private Call imagesGetCall(ImageQueryParams queryParams) throws ApiException {
             apiClient.prepQueryParameter(localVarQueryParams, "observationDbId", queryParams.observationDbId());
         if (queryParams.descriptiveOntologyTerm() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "descriptiveOntologyTerm", queryParams.descriptiveOntologyTerm());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/MethodsApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/MethodsApi.java
index d26b620d..8c10ff42 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/MethodsApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/MethodsApi.java
@@ -70,10 +70,10 @@ private Call methodsGetCall(MethodQueryParams queryParams) throws ApiException {
             apiClient.prepQueryParameter(localVarQueryParams, "methodDbId", queryParams.methodDbId());
         if (queryParams.observationVariableDbId() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "observationVariableDbId", queryParams.observationVariableDbId());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationUnitsApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationUnitsApi.java
index 4b971cbd..e50573b9 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationUnitsApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationUnitsApi.java
@@ -188,10 +188,10 @@ private Call observationunitsGetCall(ObservationUnitQueryParams queryParams) thr
             apiClient.prepQueryParameter(localVarQueryParams, "observationUnitLevelCode", queryParams.observationUnitLevelCode());
         if (queryParams.includeObservations() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "includeObservations", queryParams.includeObservations());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationVariablesApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationVariablesApi.java
index be5c5a1d..10a035e9 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationVariablesApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationVariablesApi.java
@@ -234,10 +234,10 @@ private Call variablesGetCall(VariableQueryParams queryParams) throws ApiExcepti
             apiClient.prepQueryParameter(localVarQueryParams, "traitClass", queryParams.traitClass());
         if (queryParams.studyDbId() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "studyDbId", queryParams.studyDbId());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationsApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationsApi.java
index e0331f0c..5f770dc9 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationsApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationsApi.java
@@ -102,10 +102,10 @@ private Call observationsGetCall(ObservationQueryParams queryParams) throws ApiE
             apiClient.prepQueryParameter(localVarQueryParams, "observationTimeStampRangeStart", queryParams.observationTimeStampRangeStart());
         if (queryParams.observationTimeStampRangeEnd() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "observationTimeStampRangeEnd", queryParams.observationTimeStampRangeEnd());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ScalesApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ScalesApi.java
index 480cc941..377b2e01 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ScalesApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ScalesApi.java
@@ -71,10 +71,10 @@ private Call scalesGetCall(ScaleQueryParams queryParams) throws ApiException {
             apiClient.prepQueryParameter(localVarQueryParams, "scaleDbId", queryParams.scaleDbId());
         if (queryParams.observationVariableDbId() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "observationVariableDbId", queryParams.observationVariableDbId());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/TraitsApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/TraitsApi.java
index b30d3838..de4ca1a5 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/TraitsApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/TraitsApi.java
@@ -71,10 +71,10 @@ private Call traitsGetCall(TraitQueryParams queryParams) throws ApiException {
             apiClient.prepQueryParameter(localVarQueryParams, "traitDbId", queryParams.traitDbId());
         if (queryParams.observationVariableDbId() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "observationVariableDbId", queryParams.observationVariableDbId());
-        if (queryParams.externalReferenceID() != null) {
-            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceID());
+        if (queryParams.externalReferenceID() != null) 
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceID", queryParams.externalReferenceID());
-        }
+        if (queryParams.externalReferenceId() != null) 
+            apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceId", queryParams.externalReferenceId());
         if (queryParams.externalReferenceSource() != null)
             apiClient.prepQueryParameter(localVarQueryParams, "externalReferenceSource", queryParams.externalReferenceSource());
         if (queryParams.page() != null)
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/BrAPIExternalReference.java b/brapi-java-model/src/main/java/org/brapi/v2/model/BrAPIExternalReference.java
index 147d5080..d9fcd056 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/BrAPIExternalReference.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/BrAPIExternalReference.java
@@ -3,98 +3,118 @@
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
-
-
-
 /**
  * ExternalReferencesInner
  */
 
-
-public class BrAPIExternalReference   {
-  @JsonProperty("referenceID")
-  private String referenceID = null;
-
-  @JsonProperty("referenceSource")
-  private String referenceSource = null;
-
-  public BrAPIExternalReference referenceID(String referenceID) {
-    this.referenceID = referenceID;
-    return this;
-  }
-
-  /**
-   * The external reference ID. Could be a simple string or a URI.
-   * @return referenceID
-  **/
-  
-  
-    public String getReferenceID() {
-    return referenceID;
-  }
-
-  public void setReferenceID(String referenceID) {
-    this.referenceID = referenceID;
-  }
-
-  public BrAPIExternalReference referenceSource(String referenceSource) {
-    this.referenceSource = referenceSource;
-    return this;
-  }
-
-  /**
-   * An identifier for the source system or database of this reference
-   * @return referenceSource
-  **/
-  
-  
-    public String getReferenceSource() {
-    return referenceSource;
-  }
-
-  public void setReferenceSource(String referenceSource) {
-    this.referenceSource = referenceSource;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIExternalReference externalReferencesInner = (BrAPIExternalReference) o;
-    return Objects.equals(this.referenceID, externalReferencesInner.referenceID) &&
-        Objects.equals(this.referenceSource, externalReferencesInner.referenceSource);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(referenceID, referenceSource);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ExternalReferencesInner {\n");
-    
-    sb.append("    referenceID: ").append(toIndentedString(referenceID)).append("\n");
-    sb.append("    referenceSource: ").append(toIndentedString(referenceSource)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+public class BrAPIExternalReference {
+	@JsonProperty("referenceId")
+	private String referenceId = null;
+
+	@JsonProperty("referenceID")
+	@Deprecated
+	private String referenceID = null;
+
+	@JsonProperty("referenceSource")
+	private String referenceSource = null;
+
+	public BrAPIExternalReference referenceId(String referenceId) {
+		this.referenceId = referenceId;
+		return this;
+	}
+
+	/**
+	 * The external reference ID. Could be a simple string or a URI.
+	 * 
+	 * @return referenceID
+	 **/
+
+	public String getReferenceId() {
+		return referenceId;
+	}
+
+	public void setReferenceId(String referenceId) {
+		this.referenceId = referenceId;
+	}
+	
+	@Deprecated
+	public BrAPIExternalReference referenceID(String referenceID) {
+		this.referenceID = referenceID;
+		return this;
+	}
+
+	/**
+	 * The external reference ID. Could be a simple string or a URI.
+	 * 
+	 * @return referenceID
+	 **/
+
+	@Deprecated
+	public String getReferenceID() {
+		return referenceID;
+	}
+
+	@Deprecated
+	public void setReferenceID(String referenceID) {
+		this.referenceID = referenceID;
+	}
+
+	public BrAPIExternalReference referenceSource(String referenceSource) {
+		this.referenceSource = referenceSource;
+		return this;
+	}
+
+	/**
+	 * An identifier for the source system or database of this reference
+	 * 
+	 * @return referenceSource
+	 **/
+
+	public String getReferenceSource() {
+		return referenceSource;
+	}
+
+	public void setReferenceSource(String referenceSource) {
+		this.referenceSource = referenceSource;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIExternalReference externalReferencesInner = (BrAPIExternalReference) o;
+		return Objects.equals(this.referenceID, externalReferencesInner.referenceID)
+				&& Objects.equals(this.referenceSource, externalReferencesInner.referenceSource);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(referenceID, referenceSource);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class ExternalReferencesInner {\n");
+
+		sb.append("    referenceID: ").append(toIndentedString(referenceID)).append("\n");
+		sb.append("    referenceSource: ").append(toIndentedString(referenceSource)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIGermplasmAttribute.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIGermplasmAttribute.java
index 658ec5be..dce7680d 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIGermplasmAttribute.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIGermplasmAttribute.java
@@ -3,592 +3,611 @@
 import java.time.OffsetDateTime;
 import java.util.*;
 
+import org.brapi.v2.model.BrAPIExternalReference;
+import org.brapi.v2.model.BrAPIOntologyReference;
+import org.brapi.v2.model.NullableJsonElementTypeAdapterFactory;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.JsonAdapter;
-import org.brapi.v2.model.BrAPIExternalReference;
-import org.brapi.v2.model.BrAPIOntologyReference;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.brapi.v2.model.NullableJsonElementTypeAdapterFactory;
 import org.brapi.v2.model.pheno.BrAPIMethod;
 import org.brapi.v2.model.pheno.BrAPIScale;
 import org.brapi.v2.model.pheno.BrAPITrait;
 
-import javax.validation.Valid;
-
-
 /**
  * GermplasmAttribute
  */
 
+public class BrAPIGermplasmAttribute {
+	@JsonProperty("additionalInfo")
+	@JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
+	private JsonObject additionalInfo = null;
 
-public class BrAPIGermplasmAttribute  {
-  @JsonProperty("attributeDbId")
-  private String attributeDbId = null;
-
-  @JsonProperty("attributeCategory")
-  private String attributeCategory = null;
-
-  @JsonProperty("attributeDescription")
-  private String attributeDescription = null;
-
-  @JsonProperty("attributeName")
-  private String attributeName = null;
-
-  @JsonProperty("additionalInfo")
-  @Valid
-  @JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
-  private JsonObject additionalInfo = null;
-
-  @JsonProperty("commonCropName")
-  private String commonCropName = null;
-
-  @JsonProperty("contextOfUse")
-  @Valid
-  private List<String> contextOfUse = null;
-
-  @JsonProperty("defaultValue")
-  private String defaultValue = null;
-
-  @JsonProperty("documentationURL")
-  private String documentationURL = null;
-
-  @JsonProperty("externalReferences")
-  private List<BrAPIExternalReference> externalReferences = null;
-
-  @JsonProperty("growthStage")
-  private String growthStage = null;
-
-  @JsonProperty("institution")
-  private String institution = null;
-
-  @JsonProperty("language")
-  private String language = null;
-
-  @JsonProperty("method")
-  private BrAPIMethod method = null;
-
-  @JsonProperty("ontologyReference")
-  private BrAPIOntologyReference ontologyReference = null;
-
-  @JsonProperty("scale")
-  private BrAPIScale scale = null;
-
-  @JsonProperty("scientist")
-  private String scientist = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("submissionTimestamp")
-  private OffsetDateTime submissionTimestamp = null;
-
-  @JsonProperty("synonyms")
-  @Valid
-  private List<String> synonyms = null;
-
-  @JsonProperty("trait")
-  private BrAPITrait trait = null;
-
-  private final transient Gson gson = new Gson();
-
-  public BrAPIGermplasmAttribute attributeCategory(String attributeCategory) {
-    this.attributeCategory = attributeCategory;
-    return this;
-  }
-
-  /**
-   * General category for the attribute. very similar to Trait class.
-   * @return attributeCategory
-   **/
-
-
-  public String getAttributeCategory() {
-    return attributeCategory;
-  }
-
-  public void setAttributeCategory(String attributeCategory) {
-    this.attributeCategory = attributeCategory;
-  }
-
-  public BrAPIGermplasmAttribute attributeDescription(String attributeDescription) {
-    this.attributeDescription = attributeDescription;
-    return this;
-  }
-
-  /**
-   * A human readable description of this attribute
-   * @return attributeDescription
-   **/
-
-
-  public String getAttributeDescription() {
-    return attributeDescription;
-  }
-
-  public void setAttributeDescription(String attributeDescription) {
-    this.attributeDescription = attributeDescription;
-  }
-
-  public BrAPIGermplasmAttribute attributeName(String attributeName) {
-    this.attributeName = attributeName;
-    return this;
-  }
-
-  /**
-   * A human readable name for this attribute
-   * @return attributeName
-   **/
-  public String getAttributeName() {
-    return attributeName;
-  }
-
-  public void setAttributeName(String attributeName) {
-    this.attributeName = attributeName;
-  }
-
-  public BrAPIGermplasmAttribute attributeDbId(String attributeDbId) {
-    this.attributeDbId = attributeDbId;
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies this attribute within the given database server
-   * @return attributeDbId
-  **/
-  
-      
-
-  public String getAttributeDbId() {
-    return attributeDbId;
-  }
-
-  public void setAttributeDbId(String attributeDbId) {
-    this.attributeDbId = attributeDbId;
-  }
-
-  public BrAPIGermplasmAttribute additionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-    return this;
-  }
-
-  public BrAPIGermplasmAttribute putAdditionalInfoItem(String key, Object additionalInfoItem) {
-    if (this.additionalInfo == null) {
-      this.additionalInfo = new JsonObject();
-    }
-    JsonElement newElement = gson.toJsonTree(additionalInfoItem);
-    this.additionalInfo.add(key, newElement);
-    return this;
-  }
-
-  /**
-   * Additional arbitrary info
-   * @return additionalInfo
-   **/
-
-
-  public JsonObject getAdditionalInfo() {
-    return additionalInfo;
-  }
-
-  public void setAdditionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-  }
-
-  public BrAPIGermplasmAttribute commonCropName(String commonCropName) {
-    this.commonCropName = commonCropName;
-    return this;
-  }
-
-  /**
-   * Crop name (examples: \"Maize\", \"Wheat\")
-   * @return commonCropName
-   **/
-
-
-  public String getCommonCropName() {
-    return commonCropName;
-  }
-
-  public void setCommonCropName(String commonCropName) {
-    this.commonCropName = commonCropName;
-  }
-
-  public BrAPIGermplasmAttribute contextOfUse(List<String> contextOfUse) {
-    this.contextOfUse = contextOfUse;
-    return this;
-  }
-
-  public BrAPIGermplasmAttribute addContextOfUseItem(String contextOfUseItem) {
-    if (this.contextOfUse == null) {
-      this.contextOfUse = new ArrayList<String>();
-    }
-    this.contextOfUse.add(contextOfUseItem);
-    return this;
-  }
-
-  /**
-   * Indication of how trait is routinely used. (examples: [\"Trial evaluation\", \"Nursery evaluation\"])
-   * @return contextOfUse
-   **/
-
-
-  public List<String> getContextOfUse() {
-    return contextOfUse;
-  }
-
-  public void setContextOfUse(List<String> contextOfUse) {
-    this.contextOfUse = contextOfUse;
-  }
-
-  public BrAPIGermplasmAttribute defaultValue(String defaultValue) {
-    this.defaultValue = defaultValue;
-    return this;
-  }
-
-  /**
-   * Variable default value. (examples: \"red\", \"2.3\", etc.)
-   * @return defaultValue
-   **/
+	@JsonProperty("attributeCategory")
+	private String attributeCategory = null;
 
+	@JsonProperty("attributeDbId")
+	private String attributeDbId = null;
 
-  public String getDefaultValue() {
-    return defaultValue;
-  }
+	@JsonProperty("attributeDescription")
+	private String attributeDescription = null;
 
-  public void setDefaultValue(String defaultValue) {
-    this.defaultValue = defaultValue;
-  }
-
-  public BrAPIGermplasmAttribute documentationURL(String documentationURL) {
-    this.documentationURL = documentationURL;
-    return this;
-  }
-
-  /**
-   * A URL to the human readable documentation of this object
-   * @return documentationURL
-   **/
-
-
-  public String getDocumentationURL() {
-    return documentationURL;
-  }
-
-  public void setDocumentationURL(String documentationURL) {
-    this.documentationURL = documentationURL;
-  }
+	@JsonProperty("attributeName")
+	private String attributeName = null;
 
-  public BrAPIGermplasmAttribute externalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-    return this;
-  }
+	@JsonProperty("attributePUI")
+	private String attributePUI = null;
 
-  /**
-   * Get externalReferences
-   * @return externalReferences
-   **/
+	@JsonProperty("commonCropName")
+	private String commonCropName = null;
 
+	@JsonProperty("contextOfUse")
+	private List<String> contextOfUse = null;
 
-  @Valid
-  public List<BrAPIExternalReference> getExternalReferences() {
-    return externalReferences;
-  }
+	@JsonProperty("defaultValue")
+	private String defaultValue = null;
 
-  public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-  }
-
-  public BrAPIGermplasmAttribute growthStage(String growthStage) {
-    this.growthStage = growthStage;
-    return this;
-  }
-
-  /**
-   * Growth stage at which measurement is made (examples: \"flowering\")
-   * @return growthStage
-   **/
-
-
-  public String getGrowthStage() {
-    return growthStage;
-  }
-
-  public void setGrowthStage(String growthStage) {
-    this.growthStage = growthStage;
-  }
-
-  public BrAPIGermplasmAttribute institution(String institution) {
-    this.institution = institution;
-    return this;
-  }
-
-  /**
-   * Name of institution submitting the variable
-   * @return institution
-   **/
+	@JsonProperty("documentationURL")
+	private String documentationURL = null;
 
+	@JsonProperty("externalReferences")
+	private List<BrAPIExternalReference> externalReferences = null;
+
+	@JsonProperty("growthStage")
+	private String growthStage = null;
 
-  public String getInstitution() {
-    return institution;
-  }
-
-  public void setInstitution(String institution) {
-    this.institution = institution;
-  }
-
-  public BrAPIGermplasmAttribute language(String language) {
-    this.language = language;
-    return this;
-  }
-
-  /**
-   * 2 letter ISO 639-1 code for the language of submission of the variable.
-   * @return language
-   **/
-
+	@JsonProperty("institution")
+	private String institution = null;
 
-  public String getLanguage() {
-    return language;
-  }
-
-  public void setLanguage(String language) {
-    this.language = language;
-  }
-
-  public BrAPIGermplasmAttribute method(BrAPIMethod method) {
-    this.method = method;
-    return this;
-  }
-
-  /**
-   * Get method
-   * @return method
-   **/
-  public BrAPIMethod getMethod() {
-    return method;
-  }
+	@JsonProperty("language")
+	private String language = null;
+
+	@JsonProperty("method")
+	private BrAPIMethod method = null;
+
+	@JsonProperty("ontologyReference")
+	private BrAPIOntologyReference ontologyReference = null;
+
+	@JsonProperty("scale")
+	private BrAPIScale scale = null;
+
+	@JsonProperty("scientist")
+	private String scientist = null;
+
+	@JsonProperty("status")
+	private String status = null;
+
+	@JsonProperty("submissionTimestamp")
+	private OffsetDateTime submissionTimestamp = null;
+
+	@JsonProperty("synonyms")
+	private List<String> synonyms = null;
+
+	@JsonProperty("trait")
+	private BrAPITrait trait = null;
+
+	private final transient Gson gson = new Gson();
+
+	public BrAPIGermplasmAttribute additionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+		return this;
+	}
+
+	public BrAPIGermplasmAttribute putAdditionalInfoItem(String key, Object additionalInfoItem) {
+        if (this.additionalInfo == null) {
+          this.additionalInfo = new JsonObject();
+        }
+        JsonElement newElement = gson.toJsonTree(additionalInfoItem);
+        this.additionalInfo.add(key, newElement);
+        return this;
+  	}
+
+	/**
+	 * A free space containing any additional information related to a particular
+	 * object. A data source may provide any JSON object, unrestriced by the BrAPI
+	 * specification.
+	 *
+	 * @return additionalInfo
+	 **/
+	public JsonObject getAdditionalInfo() {
+		return additionalInfo;
+	}
+
+	public void setAdditionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+	}
+
+	public BrAPIGermplasmAttribute attributeCategory(String attributeCategory) {
+		this.attributeCategory = attributeCategory;
+		return this;
+	}
+
+	/**
+	 * General category for the attribute. very similar to Trait class.
+	 *
+	 * @return attributeCategory
+	 **/
+	public String getAttributeCategory() {
+		return attributeCategory;
+	}
+
+	public void setAttributeCategory(String attributeCategory) {
+		this.attributeCategory = attributeCategory;
+	}
+
+	public BrAPIGermplasmAttribute attributeDbId(String attributeDbId) {
+		this.attributeDbId = attributeDbId;
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies this attribute within the given database
+	 * server
+	 *
+	 * @return attributeDbId
+	 **/
+	public String getAttributeDbId() {
+		return attributeDbId;
+	}
+
+	public void setAttributeDbId(String attributeDbId) {
+		this.attributeDbId = attributeDbId;
+	}
+
+	public BrAPIGermplasmAttribute attributeDescription(String attributeDescription) {
+		this.attributeDescription = attributeDescription;
+		return this;
+	}
+
+	/**
+	 * A human readable description of this attribute
+	 *
+	 * @return attributeDescription
+	 **/
+	public String getAttributeDescription() {
+		return attributeDescription;
+	}
+
+	public void setAttributeDescription(String attributeDescription) {
+		this.attributeDescription = attributeDescription;
+	}
+
+	public BrAPIGermplasmAttribute attributeName(String attributeName) {
+		this.attributeName = attributeName;
+		return this;
+	}
+
+	/**
+	 * A human readable name for this attribute
+	 *
+	 * @return attributeName
+	 **/
+	public String getAttributeName() {
+		return attributeName;
+	}
+
+	public void setAttributeName(String attributeName) {
+		this.attributeName = attributeName;
+	}
+
+	public BrAPIGermplasmAttribute attributePUI(String attributePUI) {
+		this.attributePUI = attributePUI;
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of an Attribute, usually in the form of a URI
+	 *
+	 * @return attributePUI
+	 **/
+	public String getAttributePUI() {
+		return attributePUI;
+	}
+
+	public void setAttributePUI(String attributePUI) {
+		this.attributePUI = attributePUI;
+	}
+
+	public BrAPIGermplasmAttribute commonCropName(String commonCropName) {
+		this.commonCropName = commonCropName;
+		return this;
+	}
+
+	/**
+	 * Crop name (examples: \&quot;Maize\&quot;, \&quot;Wheat\&quot;)
+	 *
+	 * @return commonCropName
+	 **/
+	public String getCommonCropName() {
+		return commonCropName;
+	}
+
+	public void setCommonCropName(String commonCropName) {
+		this.commonCropName = commonCropName;
+	}
+
+	public BrAPIGermplasmAttribute contextOfUse(List<String> contextOfUse) {
+		this.contextOfUse = contextOfUse;
+		return this;
+	}
+
+	public BrAPIGermplasmAttribute addContextOfUseItem(String contextOfUseItem) {
+		if (this.contextOfUse == null) {
+			this.contextOfUse = new ArrayList<String>();
+		}
+		this.contextOfUse.add(contextOfUseItem);
+		return this;
+	}
+
+	/**
+	 * Indication of how trait is routinely used. (examples: [\&quot;Trial
+	 * evaluation\&quot;, \&quot;Nursery evaluation\&quot;])
+	 *
+	 * @return contextOfUse
+	 **/
+	public List<String> getContextOfUse() {
+		return contextOfUse;
+	}
+
+	public void setContextOfUse(List<String> contextOfUse) {
+		this.contextOfUse = contextOfUse;
+	}
+
+	public BrAPIGermplasmAttribute defaultValue(String defaultValue) {
+		this.defaultValue = defaultValue;
+		return this;
+	}
+
+	/**
+	 * Variable default value. (examples: \&quot;red\&quot;, \&quot;2.3\&quot;,
+	 * etc.)
+	 *
+	 * @return defaultValue
+	 **/
+	public String getDefaultValue() {
+		return defaultValue;
+	}
+
+	public void setDefaultValue(String defaultValue) {
+		this.defaultValue = defaultValue;
+	}
+
+	public BrAPIGermplasmAttribute documentationURL(String documentationURL) {
+		this.documentationURL = documentationURL;
+		return this;
+	}
+
+	/**
+	 * A URL to the human readable documentation of an object
+	 *
+	 * @return documentationURL
+	 **/
+	public String getDocumentationURL() {
+		return documentationURL;
+	}
+
+	public void setDocumentationURL(String documentationURL) {
+		this.documentationURL = documentationURL;
+	}
+
+	public BrAPIGermplasmAttribute externalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+		return this;
+	}
+
+	public BrAPIGermplasmAttribute addExternalReferencesItem(BrAPIExternalReference externalReferencesItem) {
+		if (this.externalReferences == null) {
+			this.externalReferences = new ArrayList<BrAPIExternalReference>();
+		}
+		this.externalReferences.add(externalReferencesItem);
+		return this;
+	}
+
+	/**
+	 * An array of external reference ids. These are references to this piece of
+	 * data in an external system. Could be a simple string or a URI.
+	 *
+	 * @return externalReferences
+	 **/
+	public List<BrAPIExternalReference> getExternalReferences() {
+		return externalReferences;
+	}
+
+	public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+	}
+
+	public BrAPIGermplasmAttribute growthStage(String growthStage) {
+		this.growthStage = growthStage;
+		return this;
+	}
+
+	/**
+	 * Growth stage at which measurement is made (examples: \&quot;flowering\&quot;)
+	 *
+	 * @return growthStage
+	 **/
+	public String getGrowthStage() {
+		return growthStage;
+	}
+
+	public void setGrowthStage(String growthStage) {
+		this.growthStage = growthStage;
+	}
+
+	public BrAPIGermplasmAttribute institution(String institution) {
+		this.institution = institution;
+		return this;
+	}
+
+	/**
+	 * Name of institution submitting the variable
+	 *
+	 * @return institution
+	 **/
+	public String getInstitution() {
+		return institution;
+	}
+
+	public void setInstitution(String institution) {
+		this.institution = institution;
+	}
+
+	public BrAPIGermplasmAttribute language(String language) {
+		this.language = language;
+		return this;
+	}
+
+	/**
+	 * 2 letter ISO 639-1 code for the language of submission of the variable.
+	 *
+	 * @return language
+	 **/
+	public String getLanguage() {
+		return language;
+	}
+
+	public void setLanguage(String language) {
+		this.language = language;
+	}
+
+	public BrAPIGermplasmAttribute method(BrAPIMethod method) {
+		this.method = method;
+		return this;
+	}
+
+	/**
+	 * Get method
+	 *
+	 * @return method
+	 **/
+	public BrAPIMethod getMethod() {
+		return method;
+	}
+
+	public void setMethod(BrAPIMethod method) {
+		this.method = method;
+	}
+
+	public BrAPIGermplasmAttribute ontologyReference(BrAPIOntologyReference ontologyReference) {
+		this.ontologyReference = ontologyReference;
+		return this;
+	}
+
+	/**
+	 * Get ontologyReference
+	 *
+	 * @return ontologyReference
+	 **/
+	public BrAPIOntologyReference getOntologyReference() {
+		return ontologyReference;
+	}
+
+	public void setOntologyReference(BrAPIOntologyReference ontologyReference) {
+		this.ontologyReference = ontologyReference;
+	}
+
+	public BrAPIGermplasmAttribute scale(BrAPIScale scale) {
+		this.scale = scale;
+		return this;
+	}
+
+	/**
+	 * Get scale
+	 *
+	 * @return scale
+	 **/
+	public BrAPIScale getScale() {
+		return scale;
+	}
+
+	public void setScale(BrAPIScale scale) {
+		this.scale = scale;
+	}
+
+	public BrAPIGermplasmAttribute scientist(String scientist) {
+		this.scientist = scientist;
+		return this;
+	}
+
+	/**
+	 * Name of scientist submitting the variable.
+	 *
+	 * @return scientist
+	 **/
+	public String getScientist() {
+		return scientist;
+	}
+
+	public void setScientist(String scientist) {
+		this.scientist = scientist;
+	}
+
+	public BrAPIGermplasmAttribute status(String status) {
+		this.status = status;
+		return this;
+	}
+
+	/**
+	 * Variable status. (examples: \&quot;recommended\&quot;,
+	 * \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
+	 *
+	 * @return status
+	 **/
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public BrAPIGermplasmAttribute submissionTimestamp(OffsetDateTime submissionTimestamp) {
+		this.submissionTimestamp = submissionTimestamp;
+		return this;
+	}
+
+	/**
+	 * Timestamp when the Variable was added (ISO 8601)
+	 *
+	 * @return submissionTimestamp
+	 **/
+	public OffsetDateTime getSubmissionTimestamp() {
+		return submissionTimestamp;
+	}
+
+	public void setSubmissionTimestamp(OffsetDateTime submissionTimestamp) {
+		this.submissionTimestamp = submissionTimestamp;
+	}
+
+	public BrAPIGermplasmAttribute synonyms(List<String> synonyms) {
+		this.synonyms = synonyms;
+		return this;
+	}
+
+	public BrAPIGermplasmAttribute addSynonymsItem(String synonymsItem) {
+		if (this.synonyms == null) {
+			this.synonyms = new ArrayList<String>();
+		}
+		this.synonyms.add(synonymsItem);
+		return this;
+	}
+
+	/**
+	 * Other variable names
+	 *
+	 * @return synonyms
+	 **/
+	public List<String> getSynonyms() {
+		return synonyms;
+	}
+
+	public void setSynonyms(List<String> synonyms) {
+		this.synonyms = synonyms;
+	}
+
+	public BrAPIGermplasmAttribute trait(BrAPITrait trait) {
+		this.trait = trait;
+		return this;
+	}
+
+	/**
+	 * Get trait
+	 *
+	 * @return trait
+	 **/
+	public BrAPITrait getTrait() {
+		return trait;
+	}
+
+	public void setTrait(BrAPITrait trait) {
+		this.trait = trait;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIGermplasmAttribute germplasmAttribute = (BrAPIGermplasmAttribute) o;
+		return Objects.equals(this.additionalInfo, germplasmAttribute.additionalInfo)
+				&& Objects.equals(this.attributeCategory, germplasmAttribute.attributeCategory)
+				&& Objects.equals(this.attributeDbId, germplasmAttribute.attributeDbId)
+				&& Objects.equals(this.attributeDescription, germplasmAttribute.attributeDescription)
+				&& Objects.equals(this.attributeName, germplasmAttribute.attributeName)
+				&& Objects.equals(this.attributePUI, germplasmAttribute.attributePUI)
+				&& Objects.equals(this.commonCropName, germplasmAttribute.commonCropName)
+				&& Objects.equals(this.contextOfUse, germplasmAttribute.contextOfUse)
+				&& Objects.equals(this.defaultValue, germplasmAttribute.defaultValue)
+				&& Objects.equals(this.documentationURL, germplasmAttribute.documentationURL)
+				&& Objects.equals(this.externalReferences, germplasmAttribute.externalReferences)
+				&& Objects.equals(this.growthStage, germplasmAttribute.growthStage)
+				&& Objects.equals(this.institution, germplasmAttribute.institution)
+				&& Objects.equals(this.language, germplasmAttribute.language)
+				&& Objects.equals(this.method, germplasmAttribute.method)
+				&& Objects.equals(this.ontologyReference, germplasmAttribute.ontologyReference)
+				&& Objects.equals(this.scale, germplasmAttribute.scale)
+				&& Objects.equals(this.scientist, germplasmAttribute.scientist)
+				&& Objects.equals(this.status, germplasmAttribute.status)
+				&& Objects.equals(this.submissionTimestamp, germplasmAttribute.submissionTimestamp)
+				&& Objects.equals(this.synonyms, germplasmAttribute.synonyms)
+				&& Objects.equals(this.trait, germplasmAttribute.trait);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(additionalInfo, attributeCategory, attributeDbId, attributeDescription, attributeName,
+				attributePUI, commonCropName, contextOfUse, defaultValue, documentationURL, externalReferences,
+				growthStage, institution, language, method, ontologyReference, scale, scientist, status,
+				submissionTimestamp, synonyms, trait);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class GermplasmAttribute {\n");
+
+		sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
+		sb.append("    attributeCategory: ").append(toIndentedString(attributeCategory)).append("\n");
+		sb.append("    attributeDbId: ").append(toIndentedString(attributeDbId)).append("\n");
+		sb.append("    attributeDescription: ").append(toIndentedString(attributeDescription)).append("\n");
+		sb.append("    attributeName: ").append(toIndentedString(attributeName)).append("\n");
+		sb.append("    attributePUI: ").append(toIndentedString(attributePUI)).append("\n");
+		sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
+		sb.append("    contextOfUse: ").append(toIndentedString(contextOfUse)).append("\n");
+		sb.append("    defaultValue: ").append(toIndentedString(defaultValue)).append("\n");
+		sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
+		sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
+		sb.append("    growthStage: ").append(toIndentedString(growthStage)).append("\n");
+		sb.append("    institution: ").append(toIndentedString(institution)).append("\n");
+		sb.append("    language: ").append(toIndentedString(language)).append("\n");
+		sb.append("    method: ").append(toIndentedString(method)).append("\n");
+		sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
+		sb.append("    scale: ").append(toIndentedString(scale)).append("\n");
+		sb.append("    scientist: ").append(toIndentedString(scientist)).append("\n");
+		sb.append("    status: ").append(toIndentedString(status)).append("\n");
+		sb.append("    submissionTimestamp: ").append(toIndentedString(submissionTimestamp)).append("\n");
+		sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
+		sb.append("    trait: ").append(toIndentedString(trait)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 
-  public void setMethod(BrAPIMethod method) {
-    this.method = method;
-  }
-
-  public BrAPIGermplasmAttribute ontologyReference(BrAPIOntologyReference ontologyReference) {
-    this.ontologyReference = ontologyReference;
-    return this;
-  }
-
-  /**
-   * Get ontologyReference
-   * @return ontologyReference
-   **/
-
-
-  @Valid
-  public BrAPIOntologyReference getOntologyReference() {
-    return ontologyReference;
-  }
-
-  public void setOntologyReference(BrAPIOntologyReference ontologyReference) {
-    this.ontologyReference = ontologyReference;
-  }
-
-  public BrAPIGermplasmAttribute scale(BrAPIScale scale) {
-    this.scale = scale;
-    return this;
-  }
-
-  /**
-   * Get scale
-   * @return scale
-   **/
-  public BrAPIScale getScale() {
-    return scale;
-  }
-
-  public void setScale(BrAPIScale scale) {
-    this.scale = scale;
-  }
-
-  public BrAPIGermplasmAttribute scientist(String scientist) {
-    this.scientist = scientist;
-    return this;
-  }
-
-  /**
-   * Name of scientist submitting the variable.
-   * @return scientist
-   **/
-
-
-  public String getScientist() {
-    return scientist;
-  }
-
-  public void setScientist(String scientist) {
-    this.scientist = scientist;
-  }
-
-  public BrAPIGermplasmAttribute status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Variable status. (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)
-   * @return status
-   **/
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public BrAPIGermplasmAttribute submissionTimestamp(OffsetDateTime submissionTimestamp) {
-    this.submissionTimestamp = submissionTimestamp;
-    return this;
-  }
-
-  /**
-   * Timestamp when the Variable was added (ISO 8601)
-   * @return submissionTimestamp
-   **/
-
-
-  @Valid
-  public OffsetDateTime getSubmissionTimestamp() {
-    return submissionTimestamp;
-  }
-
-  public void setSubmissionTimestamp(OffsetDateTime submissionTimestamp) {
-    this.submissionTimestamp = submissionTimestamp;
-  }
-
-  public BrAPIGermplasmAttribute synonyms(List<String> synonyms) {
-    this.synonyms = synonyms;
-    return this;
-  }
-
-  public BrAPIGermplasmAttribute addSynonymsItem(String synonymsItem) {
-    if (this.synonyms == null) {
-      this.synonyms = new ArrayList<String>();
-    }
-    this.synonyms.add(synonymsItem);
-    return this;
-  }
-
-  /**
-   * Other variable names
-   * @return synonyms
-   **/
-
-
-  public List<String> getSynonyms() {
-    return synonyms;
-  }
-
-  public void setSynonyms(List<String> synonyms) {
-    this.synonyms = synonyms;
-  }
-
-  public BrAPIGermplasmAttribute trait(BrAPITrait trait) {
-    this.trait = trait;
-    return this;
-  }
-
-  /**
-   * Get trait
-   * @return trait
-   **/
-  public BrAPITrait getTrait() {
-    return trait;
-  }
-
-  public void setTrait(BrAPITrait trait) {
-    this.trait = trait;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIGermplasmAttribute germplasmAttribute = (BrAPIGermplasmAttribute) o;
-    return Objects.equals(this.attributeDbId, germplasmAttribute.attributeDbId) &&
-            Objects.equals(this.attributeCategory, germplasmAttribute.attributeCategory) &&
-            Objects.equals(this.attributeDescription, germplasmAttribute.attributeDescription) &&
-            Objects.equals(this.attributeName, germplasmAttribute.attributeName) &&
-            Objects.equals(this.additionalInfo, germplasmAttribute.additionalInfo) &&
-            Objects.equals(this.commonCropName, germplasmAttribute.commonCropName) &&
-            Objects.equals(this.contextOfUse, germplasmAttribute.contextOfUse) &&
-            Objects.equals(this.defaultValue, germplasmAttribute.defaultValue) &&
-            Objects.equals(this.documentationURL, germplasmAttribute.documentationURL) &&
-            Objects.equals(this.externalReferences, germplasmAttribute.externalReferences) &&
-            Objects.equals(this.growthStage, germplasmAttribute.growthStage) &&
-            Objects.equals(this.institution, germplasmAttribute.institution) &&
-            Objects.equals(this.language, germplasmAttribute.language) &&
-            Objects.equals(this.method, germplasmAttribute.method) &&
-            Objects.equals(this.ontologyReference, germplasmAttribute.ontologyReference) &&
-            Objects.equals(this.scale, germplasmAttribute.scale) &&
-            Objects.equals(this.scientist, germplasmAttribute.scientist) &&
-            Objects.equals(this.status, germplasmAttribute.status) &&
-            Objects.equals(this.submissionTimestamp, germplasmAttribute.submissionTimestamp) &&
-            Objects.equals(this.synonyms, germplasmAttribute.synonyms) &&
-            Objects.equals(this.trait, germplasmAttribute.trait);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(attributeDbId, attributeCategory, attributeDescription, attributeName, additionalInfo, commonCropName, contextOfUse, defaultValue, documentationURL, externalReferences, growthStage, institution, language, method, ontologyReference, scale, scientist, status, submissionTimestamp, synonyms, trait);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class GermplasmAttribute {\n");
-    sb.append("    attributeDbId: ").append(toIndentedString(attributeDbId)).append("\n");
-    sb.append("    attributeCategory: ").append(toIndentedString(attributeCategory)).append("\n");
-    sb.append("    attributeDescription: ").append(toIndentedString(attributeDescription)).append("\n");
-    sb.append("    attributeName: ").append(toIndentedString(attributeName)).append("\n");
-    sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-    sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-    sb.append("    contextOfUse: ").append(toIndentedString(contextOfUse)).append("\n");
-    sb.append("    defaultValue: ").append(toIndentedString(defaultValue)).append("\n");
-    sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-    sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-    sb.append("    growthStage: ").append(toIndentedString(growthStage)).append("\n");
-    sb.append("    institution: ").append(toIndentedString(institution)).append("\n");
-    sb.append("    language: ").append(toIndentedString(language)).append("\n");
-    sb.append("    method: ").append(toIndentedString(method)).append("\n");
-    sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-    sb.append("    scale: ").append(toIndentedString(scale)).append("\n");
-    sb.append("    scientist: ").append(toIndentedString(scientist)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    submissionTimestamp: ").append(toIndentedString(submissionTimestamp)).append("\n");
-    sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-    sb.append("    trait: ").append(toIndentedString(trait)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIGermplasmAttributeSearchRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIGermplasmAttributeSearchRequest.java
index 0b152621..68714022 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIGermplasmAttributeSearchRequest.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIGermplasmAttributeSearchRequest.java
@@ -6,415 +6,1121 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-
 import org.brapi.v2.model.BrAPISearchRequestParametersPaging;
 import org.brapi.v2.model.pheno.BrAPITraitDataType;
 
 /**
- * GermplasmAttributeSearchRequest
+ * BrAPIGermplasmAttributeSearchRequest
  */
 
+public class BrAPIGermplasmAttributeSearchRequest extends BrAPISearchRequestParametersPaging {
+	@JsonProperty("attributeCategories")
+	private List<String> attributeCategories = null;
+
+	@JsonProperty("attributeDbIds")
+	private List<String> attributeDbIds = null;
+
+	@JsonProperty("attributeNames")
+	private List<String> attributeNames = null;
+
+	@JsonProperty("attributePUIs")
+	private List<String> attributePUIs = null;
+
+	@JsonProperty("commonCropNames")
+	private List<String> commonCropNames = null;
+
+	@JsonProperty("dataTypes")
+	private List<BrAPITraitDataType> dataTypes = null;
+
+	@JsonProperty("externalReferenceIDs")
+	@Deprecated
+	private List<String> externalReferenceIDs = null;
+
+	@JsonProperty("externalReferenceIds")
+	private List<String> externalReferenceIds = null;
+
+	@JsonProperty("externalReferenceSources")
+	private List<String> externalReferenceSources = null;
+
+	@JsonProperty("germplasmDbIds")
+	private List<String> germplasmDbIds = null;
+
+	@JsonProperty("germplasmNames")
+	private List<String> germplasmNames = null;
+
+	@JsonProperty("methodDbIds")
+	private List<String> methodDbIds = null;
+
+	@JsonProperty("methodNames")
+	private List<String> methodNames = null;
+
+	@JsonProperty("methodPUIs")
+	private List<String> methodPUIs = null;
+
+	@JsonProperty("ontologyDbIds")
+	private List<String> ontologyDbIds = null;
+
+	@JsonProperty("programDbIds")
+	private List<String> programDbIds = null;
+
+	@JsonProperty("programNames")
+	private List<String> programNames = null;
+
+	@JsonProperty("scaleDbIds")
+	private List<String> scaleDbIds = null;
+
+	@JsonProperty("scaleNames")
+	private List<String> scaleNames = null;
+
+	@JsonProperty("scalePUIs")
+	private List<String> scalePUIs = null;
+
+	@JsonProperty("studyDbId")
+	@Deprecated
+	private List<String> studyDbId = null;
+
+	@JsonProperty("studyDbIds")
+	private List<String> studyDbIds = null;
+
+	@JsonProperty("studyNames")
+	private List<String> studyNames = null;
+
+	@JsonProperty("traitAttributePUIs")
+	private List<String> traitAttributePUIs = null;
+
+	@JsonProperty("traitAttributes")
+	private List<String> traitAttributes = null;
+
+	@JsonProperty("traitClasses")
+	private List<String> traitClasses = null;
+
+	@JsonProperty("traitDbIds")
+	private List<String> traitDbIds = null;
+
+	@JsonProperty("traitEntities")
+	private List<String> traitEntities = null;
+
+	@JsonProperty("traitEntityPUIs")
+	private List<String> traitEntityPUIs = null;
+
+	@JsonProperty("traitNames")
+	private List<String> traitNames = null;
+
+	@JsonProperty("traitPUIs")
+	private List<String> traitPUIs = null;
+
+	@JsonProperty("trialDbIds")
+	private List<String> trialDbIds = null;
+
+	@JsonProperty("trialNames")
+	private List<String> trialNames = null;
+
+	public BrAPIGermplasmAttributeSearchRequest attributeCategories(List<String> attributeCategories) {
+		this.attributeCategories = attributeCategories;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addAttributeCategoriesItem(String attributeCategoriesItem) {
+		if (this.attributeCategories == null) {
+			this.attributeCategories = new ArrayList<String>();
+		}
+		this.attributeCategories.add(attributeCategoriesItem);
+		return this;
+	}
+
+	/**
+	 * General category for the attribute. very similar to Trait class.
+	 *
+	 * @return attributeCategories
+	 **/
+	public List<String> getAttributeCategories() {
+		return attributeCategories;
+	}
+
+	public void setAttributeCategories(List<String> attributeCategories) {
+		this.attributeCategories = attributeCategories;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest attributeDbIds(List<String> attributeDbIds) {
+		this.attributeDbIds = attributeDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addAttributeDbIdsItem(String attributeDbIdsItem) {
+		if (this.attributeDbIds == null) {
+			this.attributeDbIds = new ArrayList<String>();
+		}
+		this.attributeDbIds.add(attributeDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of Germplasm Attribute IDs to search for
+	 *
+	 * @return attributeDbIds
+	 **/
+	public List<String> getAttributeDbIds() {
+		return attributeDbIds;
+	}
+
+	public void setAttributeDbIds(List<String> attributeDbIds) {
+		this.attributeDbIds = attributeDbIds;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest attributeNames(List<String> attributeNames) {
+		this.attributeNames = attributeNames;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addAttributeNamesItem(String attributeNamesItem) {
+		if (this.attributeNames == null) {
+			this.attributeNames = new ArrayList<String>();
+		}
+		this.attributeNames.add(attributeNamesItem);
+		return this;
+	}
+
+	/**
+	 * List of human readable Germplasm Attribute names to search for
+	 *
+	 * @return attributeNames
+	 **/
+	public List<String> getAttributeNames() {
+		return attributeNames;
+	}
+
+	public void setAttributeNames(List<String> attributeNames) {
+		this.attributeNames = attributeNames;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest attributePUIs(List<String> attributePUIs) {
+		this.attributePUIs = attributePUIs;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addAttributePUIsItem(String attributePUIsItem) {
+		if (this.attributePUIs == null) {
+			this.attributePUIs = new ArrayList<String>();
+		}
+		this.attributePUIs.add(attributePUIsItem);
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of an Attribute, usually in the form of a URI
+	 *
+	 * @return attributePUIs
+	 **/
+	public List<String> getAttributePUIs() {
+		return attributePUIs;
+	}
+
+	public void setAttributePUIs(List<String> attributePUIs) {
+		this.attributePUIs = attributePUIs;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest commonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
+		if (this.commonCropNames == null) {
+			this.commonCropNames = new ArrayList<String>();
+		}
+		this.commonCropNames.add(commonCropNamesItem);
+		return this;
+	}
+
+	/**
+	 * The BrAPI Common Crop Name is the simple, generalized, widely accepted name
+	 * of the organism being researched. It is most often used in multi-crop systems
+	 * where digital resources need to be divided at a high level. Things like
+	 * &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of
+	 * common crop names. Use this parameter to only return results associated with
+	 * the given crops. Use &#x60;GET /commoncropnames&#x60; to find the list of
+	 * available crops on a server.
+	 *
+	 * @return commonCropNames
+	 **/
+	public List<String> getCommonCropNames() {
+		return commonCropNames;
+	}
+
+	public void setCommonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest dataTypes(List<BrAPITraitDataType> dataTypes) {
+		this.dataTypes = dataTypes;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addDataTypesItem(BrAPITraitDataType dataTypesItem) {
+		if (this.dataTypes == null) {
+			this.dataTypes = new ArrayList<BrAPITraitDataType>();
+		}
+		this.dataTypes.add(dataTypesItem);
+		return this;
+	}
+
+	/**
+	 * List of scale data types to filter search results
+	 *
+	 * @return dataTypes
+	 **/
+	public List<BrAPITraitDataType> getDataTypes() {
+		return dataTypes;
+	}
+
+	public void setDataTypes(List<BrAPITraitDataType> dataTypes) {
+		this.dataTypes = dataTypes;
+	}
+
+	@Deprecated
+	public BrAPIGermplasmAttributeSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+		return this;
+	}
+
+	@Deprecated
+	public BrAPIGermplasmAttributeSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
+		if (this.externalReferenceIDs == null) {
+			this.externalReferenceIDs = new ArrayList<String>();
+		}
+		this.externalReferenceIDs.add(externalReferenceIDsItem);
+		return this;
+	}
+
+	/**
+	 * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github
+	 * issue number #460 &lt;br&gt;List of external reference IDs. Could be a simple
+	 * strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
+	 *
+	 * @return externalReferenceIDs
+	 **/
+	@Deprecated
+	public List<String> getExternalReferenceIDs() {
+		return externalReferenceIDs;
+	}
+
+	@Deprecated
+	public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
+		if (this.externalReferenceIds == null) {
+			this.externalReferenceIds = new ArrayList<String>();
+		}
+		this.externalReferenceIds.add(externalReferenceIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of external reference IDs. Could be a simple strings or a URIs. (use
+	 * with &#x60;externalReferenceSources&#x60; parameter)
+	 *
+	 * @return externalReferenceIds
+	 **/
+	public List<String> getExternalReferenceIds() {
+		return externalReferenceIds;
+	}
+
+	public void setExternalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
+		if (this.externalReferenceSources == null) {
+			this.externalReferenceSources = new ArrayList<String>();
+		}
+		this.externalReferenceSources.add(externalReferenceSourcesItem);
+		return this;
+	}
+
+	/**
+	 * List of identifiers for the source system or database of an external
+	 * reference (use with &#x60;externalReferenceIDs&#x60; parameter)
+	 *
+	 * @return externalReferenceSources
+	 **/
+	public List<String> getExternalReferenceSources() {
+		return externalReferenceSources;
+	}
+
+	public void setExternalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
+		this.germplasmDbIds = germplasmDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
+		if (this.germplasmDbIds == null) {
+			this.germplasmDbIds = new ArrayList<String>();
+		}
+		this.germplasmDbIds.add(germplasmDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of IDs which uniquely identify germplasm to search for
+	 *
+	 * @return germplasmDbIds
+	 **/
+	public List<String> getGermplasmDbIds() {
+		return germplasmDbIds;
+	}
+
+	public void setGermplasmDbIds(List<String> germplasmDbIds) {
+		this.germplasmDbIds = germplasmDbIds;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest germplasmNames(List<String> germplasmNames) {
+		this.germplasmNames = germplasmNames;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
+		if (this.germplasmNames == null) {
+			this.germplasmNames = new ArrayList<String>();
+		}
+		this.germplasmNames.add(germplasmNamesItem);
+		return this;
+	}
+
+	/**
+	 * List of human readable names to identify germplasm to search for
+	 *
+	 * @return germplasmNames
+	 **/
+	public List<String> getGermplasmNames() {
+		return germplasmNames;
+	}
+
+	public void setGermplasmNames(List<String> germplasmNames) {
+		this.germplasmNames = germplasmNames;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest methodDbIds(List<String> methodDbIds) {
+		this.methodDbIds = methodDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addMethodDbIdsItem(String methodDbIdsItem) {
+		if (this.methodDbIds == null) {
+			this.methodDbIds = new ArrayList<String>();
+		}
+		this.methodDbIds.add(methodDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of methods to filter search results
+	 *
+	 * @return methodDbIds
+	 **/
+	public List<String> getMethodDbIds() {
+		return methodDbIds;
+	}
+
+	public void setMethodDbIds(List<String> methodDbIds) {
+		this.methodDbIds = methodDbIds;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest methodNames(List<String> methodNames) {
+		this.methodNames = methodNames;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addMethodNamesItem(String methodNamesItem) {
+		if (this.methodNames == null) {
+			this.methodNames = new ArrayList<String>();
+		}
+		this.methodNames.add(methodNamesItem);
+		return this;
+	}
+
+	/**
+	 * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method Name
+	 * of the method of observation
+	 *
+	 * @return methodNames
+	 **/
+	public List<String> getMethodNames() {
+		return methodNames;
+	}
+
+	public void setMethodNames(List<String> methodNames) {
+		this.methodNames = methodNames;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest methodPUIs(List<String> methodPUIs) {
+		this.methodPUIs = methodPUIs;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addMethodPUIsItem(String methodPUIsItem) {
+		if (this.methodPUIs == null) {
+			this.methodPUIs = new ArrayList<String>();
+		}
+		this.methodPUIs.add(methodPUIsItem);
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of a Method, usually in the form of a URI
+	 *
+	 * @return methodPUIs
+	 **/
+	public List<String> getMethodPUIs() {
+		return methodPUIs;
+	}
+
+	public void setMethodPUIs(List<String> methodPUIs) {
+		this.methodPUIs = methodPUIs;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest ontologyDbIds(List<String> ontologyDbIds) {
+		this.ontologyDbIds = ontologyDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addOntologyDbIdsItem(String ontologyDbIdsItem) {
+		if (this.ontologyDbIds == null) {
+			this.ontologyDbIds = new ArrayList<String>();
+		}
+		this.ontologyDbIds.add(ontologyDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of ontology IDs to search for
+	 *
+	 * @return ontologyDbIds
+	 **/
+	public List<String> getOntologyDbIds() {
+		return ontologyDbIds;
+	}
+
+	public void setOntologyDbIds(List<String> ontologyDbIds) {
+		this.ontologyDbIds = ontologyDbIds;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest programDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
+		if (this.programDbIds == null) {
+			this.programDbIds = new ArrayList<String>();
+		}
+		this.programDbIds.add(programDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * A BrAPI Program represents the high level organization or group who is
+	 * responsible for conducting trials and studies. Things like Breeding Programs
+	 * and Funded Projects are considered BrAPI Programs. Use this parameter to only
+	 * return results associated with the given programs. Use &#x60;GET
+	 * /programs&#x60; to find the list of available programs on a server.
+	 *
+	 * @return programDbIds
+	 **/
+	public List<String> getProgramDbIds() {
+		return programDbIds;
+	}
+
+	public void setProgramDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest programNames(List<String> programNames) {
+		this.programNames = programNames;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addProgramNamesItem(String programNamesItem) {
+		if (this.programNames == null) {
+			this.programNames = new ArrayList<String>();
+		}
+		this.programNames.add(programNamesItem);
+		return this;
+	}
+
+	/**
+	 * Use this parameter to only return results associated with the given program
+	 * names. Program names are not required to be unique. Use &#x60;GET
+	 * /programs&#x60; to find the list of available programs on a server.
+	 *
+	 * @return programNames
+	 **/
+	public List<String> getProgramNames() {
+		return programNames;
+	}
+
+	public void setProgramNames(List<String> programNames) {
+		this.programNames = programNames;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest scaleDbIds(List<String> scaleDbIds) {
+		this.scaleDbIds = scaleDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addScaleDbIdsItem(String scaleDbIdsItem) {
+		if (this.scaleDbIds == null) {
+			this.scaleDbIds = new ArrayList<String>();
+		}
+		this.scaleDbIds.add(scaleDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The unique identifier for a Scale
+	 *
+	 * @return scaleDbIds
+	 **/
+	public List<String> getScaleDbIds() {
+		return scaleDbIds;
+	}
+
+	public void setScaleDbIds(List<String> scaleDbIds) {
+		this.scaleDbIds = scaleDbIds;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest scaleNames(List<String> scaleNames) {
+		this.scaleNames = scaleNames;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addScaleNamesItem(String scaleNamesItem) {
+		if (this.scaleNames == null) {
+			this.scaleNames = new ArrayList<String>();
+		}
+		this.scaleNames.add(scaleNamesItem);
+		return this;
+	}
+
+	/**
+	 * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale
+	 * associated with the variable
+	 *
+	 * @return scaleNames
+	 **/
+	public List<String> getScaleNames() {
+		return scaleNames;
+	}
+
+	public void setScaleNames(List<String> scaleNames) {
+		this.scaleNames = scaleNames;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest scalePUIs(List<String> scalePUIs) {
+		this.scalePUIs = scalePUIs;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addScalePUIsItem(String scalePUIsItem) {
+		if (this.scalePUIs == null) {
+			this.scalePUIs = new ArrayList<String>();
+		}
+		this.scalePUIs.add(scalePUIsItem);
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of a Scale, usually in the form of a URI
+	 *
+	 * @return scalePUIs
+	 **/
+	public List<String> getScalePUIs() {
+		return scalePUIs;
+	}
+
+	public void setScalePUIs(List<String> scalePUIs) {
+		this.scalePUIs = scalePUIs;
+	}
+
+	@Deprecated
+	public BrAPIGermplasmAttributeSearchRequest studyDbId(List<String> studyDbId) {
+		this.studyDbId = studyDbId;
+		return this;
+	}
+
+	@Deprecated
+	public BrAPIGermplasmAttributeSearchRequest addStudyDbIdItem(String studyDbIdItem) {
+		if (this.studyDbId == null) {
+			this.studyDbId = new ArrayList<String>();
+		}
+		this.studyDbId.add(studyDbIdItem);
+		return this;
+	}
+
+	/**
+	 * **Deprecated in v2.1** Please use &#x60;studyDbIds&#x60;. Github issue number
+	 * #483 &lt;br&gt;The unique ID of a studies to filter on
+	 *
+	 * @return studyDbId
+	 **/
+	@Deprecated
+	public List<String> getStudyDbId() {
+		return studyDbId;
+	}
+
+	@Deprecated
+	public void setStudyDbId(List<String> studyDbId) {
+		this.studyDbId = studyDbId;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest studyDbIds(List<String> studyDbIds) {
+		this.studyDbIds = studyDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
+		if (this.studyDbIds == null) {
+			this.studyDbIds = new ArrayList<String>();
+		}
+		this.studyDbIds.add(studyDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of study identifiers to search for
+	 *
+	 * @return studyDbIds
+	 **/
+	public List<String> getStudyDbIds() {
+		return studyDbIds;
+	}
+
+	public void setStudyDbIds(List<String> studyDbIds) {
+		this.studyDbIds = studyDbIds;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest studyNames(List<String> studyNames) {
+		this.studyNames = studyNames;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addStudyNamesItem(String studyNamesItem) {
+		if (this.studyNames == null) {
+			this.studyNames = new ArrayList<String>();
+		}
+		this.studyNames.add(studyNamesItem);
+		return this;
+	}
+
+	/**
+	 * List of study names to filter search results
+	 *
+	 * @return studyNames
+	 **/
+	public List<String> getStudyNames() {
+		return studyNames;
+	}
+
+	public void setStudyNames(List<String> studyNames) {
+		this.studyNames = studyNames;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest traitAttributePUIs(List<String> traitAttributePUIs) {
+		this.traitAttributePUIs = traitAttributePUIs;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addTraitAttributePUIsItem(String traitAttributePUIsItem) {
+		if (this.traitAttributePUIs == null) {
+			this.traitAttributePUIs = new ArrayList<String>();
+		}
+		this.traitAttributePUIs.add(traitAttributePUIsItem);
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of a Trait Attribute, usually in the form of
+	 * a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D;
+	 * \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed
+	 * feature (or characteristic) of the entity e.g., for \&quot;grain
+	 * colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
+	 *
+	 * @return traitAttributePUIs
+	 **/
+	public List<String> getTraitAttributePUIs() {
+		return traitAttributePUIs;
+	}
+
+	public void setTraitAttributePUIs(List<String> traitAttributePUIs) {
+		this.traitAttributePUIs = traitAttributePUIs;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest traitAttributes(List<String> traitAttributes) {
+		this.traitAttributes = traitAttributes;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addTraitAttributesItem(String traitAttributesItem) {
+		if (this.traitAttributes == null) {
+			this.traitAttributes = new ArrayList<String>();
+		}
+		this.traitAttributes.add(traitAttributesItem);
+		return this;
+	}
+
+	/**
+	 * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot;
+	 * + \&quot;Attribute\&quot;, the attribute is the observed feature (or
+	 * characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute
+	 * &#x3D; \&quot;colour\&quot;
+	 *
+	 * @return traitAttributes
+	 **/
+	public List<String> getTraitAttributes() {
+		return traitAttributes;
+	}
+
+	public void setTraitAttributes(List<String> traitAttributes) {
+		this.traitAttributes = traitAttributes;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest traitClasses(List<String> traitClasses) {
+		this.traitClasses = traitClasses;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addTraitClassesItem(String traitClassesItem) {
+		if (this.traitClasses == null) {
+			this.traitClasses = new ArrayList<String>();
+		}
+		this.traitClasses.add(traitClassesItem);
+		return this;
+	}
+
+	/**
+	 * List of trait classes to filter search results
+	 *
+	 * @return traitClasses
+	 **/
+	public List<String> getTraitClasses() {
+		return traitClasses;
+	}
+
+	public void setTraitClasses(List<String> traitClasses) {
+		this.traitClasses = traitClasses;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest traitDbIds(List<String> traitDbIds) {
+		this.traitDbIds = traitDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addTraitDbIdsItem(String traitDbIdsItem) {
+		if (this.traitDbIds == null) {
+			this.traitDbIds = new ArrayList<String>();
+		}
+		this.traitDbIds.add(traitDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The unique identifier for a Trait
+	 *
+	 * @return traitDbIds
+	 **/
+	public List<String> getTraitDbIds() {
+		return traitDbIds;
+	}
+
+	public void setTraitDbIds(List<String> traitDbIds) {
+		this.traitDbIds = traitDbIds;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest traitEntities(List<String> traitEntities) {
+		this.traitEntities = traitEntities;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addTraitEntitiesItem(String traitEntitiesItem) {
+		if (this.traitEntities == null) {
+			this.traitEntities = new ArrayList<String>();
+		}
+		this.traitEntities.add(traitEntitiesItem);
+		return this;
+	}
+
+	/**
+	 * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot;
+	 * + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait
+	 * refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D;
+	 * \&quot;grain\&quot;
+	 *
+	 * @return traitEntities
+	 **/
+	public List<String> getTraitEntities() {
+		return traitEntities;
+	}
+
+	public void setTraitEntities(List<String> traitEntities) {
+		this.traitEntities = traitEntities;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest traitEntityPUIs(List<String> traitEntityPUIs) {
+		this.traitEntityPUIs = traitEntityPUIs;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addTraitEntityPUIsItem(String traitEntityPUIsItem) {
+		if (this.traitEntityPUIs == null) {
+			this.traitEntityPUIs = new ArrayList<String>();
+		}
+		this.traitEntityPUIs.add(traitEntityPUIsItem);
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of a Trait Entity, usually in the form of a
+	 * URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D;
+	 * \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the
+	 * plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity
+	 * &#x3D; \&quot;grain\&quot;
+	 *
+	 * @return traitEntityPUIs
+	 **/
+	public List<String> getTraitEntityPUIs() {
+		return traitEntityPUIs;
+	}
+
+	public void setTraitEntityPUIs(List<String> traitEntityPUIs) {
+		this.traitEntityPUIs = traitEntityPUIs;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest traitNames(List<String> traitNames) {
+		this.traitNames = traitNames;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addTraitNamesItem(String traitNamesItem) {
+		if (this.traitNames == null) {
+			this.traitNames = new ArrayList<String>();
+		}
+		this.traitNames.add(traitNamesItem);
+		return this;
+	}
+
+	/**
+	 * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait -
+	 * Name of the (plant or environmental) trait under observation
+	 *
+	 * @return traitNames
+	 **/
+	public List<String> getTraitNames() {
+		return traitNames;
+	}
+
+	public void setTraitNames(List<String> traitNames) {
+		this.traitNames = traitNames;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest traitPUIs(List<String> traitPUIs) {
+		this.traitPUIs = traitPUIs;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addTraitPUIsItem(String traitPUIsItem) {
+		if (this.traitPUIs == null) {
+			this.traitPUIs = new ArrayList<String>();
+		}
+		this.traitPUIs.add(traitPUIsItem);
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of a Trait, usually in the form of a URI
+	 *
+	 * @return traitPUIs
+	 **/
+	public List<String> getTraitPUIs() {
+		return traitPUIs;
+	}
+
+	public void setTraitPUIs(List<String> traitPUIs) {
+		this.traitPUIs = traitPUIs;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest trialDbIds(List<String> trialDbIds) {
+		this.trialDbIds = trialDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
+		if (this.trialDbIds == null) {
+			this.trialDbIds = new ArrayList<String>();
+		}
+		this.trialDbIds.add(trialDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a trial to search for
+	 *
+	 * @return trialDbIds
+	 **/
+	public List<String> getTrialDbIds() {
+		return trialDbIds;
+	}
+
+	public void setTrialDbIds(List<String> trialDbIds) {
+		this.trialDbIds = trialDbIds;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest trialNames(List<String> trialNames) {
+		this.trialNames = trialNames;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeSearchRequest addTrialNamesItem(String trialNamesItem) {
+		if (this.trialNames == null) {
+			this.trialNames = new ArrayList<String>();
+		}
+		this.trialNames.add(trialNamesItem);
+		return this;
+	}
+
+	/**
+	 * The human readable name of a trial to search for
+	 *
+	 * @return trialNames
+	 **/
+	public List<String> getTrialNames() {
+		return trialNames;
+	}
+
+	public void setTrialNames(List<String> trialNames) {
+		this.trialNames = trialNames;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIGermplasmAttributeSearchRequest germplasmAttributeSearchRequest = (BrAPIGermplasmAttributeSearchRequest) o;
+		return Objects.equals(this.attributeCategories, germplasmAttributeSearchRequest.attributeCategories)
+				&& Objects.equals(this.attributeDbIds, germplasmAttributeSearchRequest.attributeDbIds)
+				&& Objects.equals(this.attributeNames, germplasmAttributeSearchRequest.attributeNames)
+				&& Objects.equals(this.attributePUIs, germplasmAttributeSearchRequest.attributePUIs)
+				&& Objects.equals(this.commonCropNames, germplasmAttributeSearchRequest.commonCropNames)
+				&& Objects.equals(this.dataTypes, germplasmAttributeSearchRequest.dataTypes)
+				&& Objects.equals(this.externalReferenceIDs, germplasmAttributeSearchRequest.externalReferenceIDs)
+				&& Objects.equals(this.externalReferenceIds, germplasmAttributeSearchRequest.externalReferenceIds)
+				&& Objects.equals(this.externalReferenceSources,
+						germplasmAttributeSearchRequest.externalReferenceSources)
+				&& Objects.equals(this.germplasmDbIds, germplasmAttributeSearchRequest.germplasmDbIds)
+				&& Objects.equals(this.germplasmNames, germplasmAttributeSearchRequest.germplasmNames)
+				&& Objects.equals(this.methodDbIds, germplasmAttributeSearchRequest.methodDbIds)
+				&& Objects.equals(this.methodNames, germplasmAttributeSearchRequest.methodNames)
+				&& Objects.equals(this.methodPUIs, germplasmAttributeSearchRequest.methodPUIs)
+				&& Objects.equals(this.ontologyDbIds, germplasmAttributeSearchRequest.ontologyDbIds)
+				&& Objects.equals(this.programDbIds, germplasmAttributeSearchRequest.programDbIds)
+				&& Objects.equals(this.programNames, germplasmAttributeSearchRequest.programNames)
+				&& Objects.equals(this.scaleDbIds, germplasmAttributeSearchRequest.scaleDbIds)
+				&& Objects.equals(this.scaleNames, germplasmAttributeSearchRequest.scaleNames)
+				&& Objects.equals(this.scalePUIs, germplasmAttributeSearchRequest.scalePUIs)
+				&& Objects.equals(this.studyDbId, germplasmAttributeSearchRequest.studyDbId)
+				&& Objects.equals(this.studyDbIds, germplasmAttributeSearchRequest.studyDbIds)
+				&& Objects.equals(this.studyNames, germplasmAttributeSearchRequest.studyNames)
+				&& Objects.equals(this.traitAttributePUIs, germplasmAttributeSearchRequest.traitAttributePUIs)
+				&& Objects.equals(this.traitAttributes, germplasmAttributeSearchRequest.traitAttributes)
+				&& Objects.equals(this.traitClasses, germplasmAttributeSearchRequest.traitClasses)
+				&& Objects.equals(this.traitDbIds, germplasmAttributeSearchRequest.traitDbIds)
+				&& Objects.equals(this.traitEntities, germplasmAttributeSearchRequest.traitEntities)
+				&& Objects.equals(this.traitEntityPUIs, germplasmAttributeSearchRequest.traitEntityPUIs)
+				&& Objects.equals(this.traitNames, germplasmAttributeSearchRequest.traitNames)
+				&& Objects.equals(this.traitPUIs, germplasmAttributeSearchRequest.traitPUIs)
+				&& Objects.equals(this.trialDbIds, germplasmAttributeSearchRequest.trialDbIds)
+				&& Objects.equals(this.trialNames, germplasmAttributeSearchRequest.trialNames);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(attributeCategories, attributeDbIds, attributeNames, attributePUIs, commonCropNames,
+				dataTypes, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds,
+				germplasmNames, methodDbIds, methodNames, methodPUIs, ontologyDbIds, programDbIds, programNames,
+				scaleDbIds, scaleNames, scalePUIs, studyDbId, studyDbIds, studyNames, traitAttributePUIs,
+				traitAttributes, traitClasses, traitDbIds, traitEntities, traitEntityPUIs, traitNames, traitPUIs,
+				trialDbIds, trialNames);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class BrAPIGermplasmAttributeSearchRequest {\n");
+
+		sb.append("    attributeCategories: ").append(toIndentedString(attributeCategories)).append("\n");
+		sb.append("    attributeDbIds: ").append(toIndentedString(attributeDbIds)).append("\n");
+		sb.append("    attributeNames: ").append(toIndentedString(attributeNames)).append("\n");
+		sb.append("    attributePUIs: ").append(toIndentedString(attributePUIs)).append("\n");
+		sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
+		sb.append("    dataTypes: ").append(toIndentedString(dataTypes)).append("\n");
+		sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
+		sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
+		sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
+		sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
+		sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
+		sb.append("    methodDbIds: ").append(toIndentedString(methodDbIds)).append("\n");
+		sb.append("    methodNames: ").append(toIndentedString(methodNames)).append("\n");
+		sb.append("    methodPUIs: ").append(toIndentedString(methodPUIs)).append("\n");
+		sb.append("    ontologyDbIds: ").append(toIndentedString(ontologyDbIds)).append("\n");
+		sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
+		sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
+		sb.append("    scaleDbIds: ").append(toIndentedString(scaleDbIds)).append("\n");
+		sb.append("    scaleNames: ").append(toIndentedString(scaleNames)).append("\n");
+		sb.append("    scalePUIs: ").append(toIndentedString(scalePUIs)).append("\n");
+		sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
+		sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
+		sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
+		sb.append("    traitAttributePUIs: ").append(toIndentedString(traitAttributePUIs)).append("\n");
+		sb.append("    traitAttributes: ").append(toIndentedString(traitAttributes)).append("\n");
+		sb.append("    traitClasses: ").append(toIndentedString(traitClasses)).append("\n");
+		sb.append("    traitDbIds: ").append(toIndentedString(traitDbIds)).append("\n");
+		sb.append("    traitEntities: ").append(toIndentedString(traitEntities)).append("\n");
+		sb.append("    traitEntityPUIs: ").append(toIndentedString(traitEntityPUIs)).append("\n");
+		sb.append("    traitNames: ").append(toIndentedString(traitNames)).append("\n");
+		sb.append("    traitPUIs: ").append(toIndentedString(traitPUIs)).append("\n");
+		sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
+		sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 
-public class BrAPIGermplasmAttributeSearchRequest extends BrAPISearchRequestParametersPaging  {
-  @JsonProperty("externalReferenceIDs")
-  @Valid
-  private List<String> externalReferenceIDs = null;
-
-  @JsonProperty("externalReferenceSources")
-  @Valid
-  private List<String> externalReferenceSources = null;
-
-  @JsonProperty("attributeDbIds")
-  @Valid
-  private List<String> attributeDbIds = null;
-
-  @JsonProperty("attributeNames")
-  @Valid
-  private List<String> attributeNames = null;
-
-  @JsonProperty("dataTypes")
-  @Valid
-  private List<BrAPITraitDataType> dataTypes = null;
-
-  @JsonProperty("methodDbIds")
-  @Valid
-  private List<String> methodDbIds = null;
-
-  @JsonProperty("ontologyDbIds")
-  @Valid
-  private List<String> ontologyDbIds = null;
-
-  @JsonProperty("scaleDbIds")
-  @Valid
-  private List<String> scaleDbIds = null;
-
-  @JsonProperty("studyDbId")
-  @Valid
-  private List<String> studyDbId = null;
-
-  @JsonProperty("traitClasses")
-  @Valid
-  private List<String> traitClasses = null;
-
-  @JsonProperty("traitDbIds")
-  @Valid
-  private List<String> traitDbIds = null;
-
-  public BrAPIGermplasmAttributeSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-    if (this.externalReferenceIDs == null) {
-      this.externalReferenceIDs = new ArrayList<String>();
-    }
-    this.externalReferenceIDs.add(externalReferenceIDsItem);
-    return this;
-  }
-
-  /**
-   * List of external references for the trait to search for
-   * @return externalReferenceIDs
-  **/
-  
-  
-    public List<String> getExternalReferenceIDs() {
-    return externalReferenceIDs;
-  }
-
-  public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-    if (this.externalReferenceSources == null) {
-      this.externalReferenceSources = new ArrayList<String>();
-    }
-    this.externalReferenceSources.add(externalReferenceSourcesItem);
-    return this;
-  }
-
-  /**
-   * List of external references sources for the trait to search for
-   * @return externalReferenceSources
-  **/
-  
-  
-    public List<String> getExternalReferenceSources() {
-    return externalReferenceSources;
-  }
-
-  public void setExternalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest attributeDbIds(List<String> attributeDbIds) {
-    this.attributeDbIds = attributeDbIds;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest addAttributeDbIdsItem(String attributeDbIdsItem) {
-    if (this.attributeDbIds == null) {
-      this.attributeDbIds = new ArrayList<String>();
-    }
-    this.attributeDbIds.add(attributeDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of Germplasm Attribute IDs to search for
-   * @return attributeDbIds
-  **/
-  
-  
-    public List<String> getAttributeDbIds() {
-    return attributeDbIds;
-  }
-
-  public void setAttributeDbIds(List<String> attributeDbIds) {
-    this.attributeDbIds = attributeDbIds;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest attributeNames(List<String> attributeNames) {
-    this.attributeNames = attributeNames;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest addAttributeNamesItem(String attributeNamesItem) {
-    if (this.attributeNames == null) {
-      this.attributeNames = new ArrayList<String>();
-    }
-    this.attributeNames.add(attributeNamesItem);
-    return this;
-  }
-
-  /**
-   * List of human readable Germplasm Attribute names to search for
-   * @return attributeNames
-  **/
-  
-  
-    public List<String> getAttributeNames() {
-    return attributeNames;
-  }
-
-  public void setAttributeNames(List<String> attributeNames) {
-    this.attributeNames = attributeNames;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest dataTypes(List<BrAPITraitDataType> dataTypes) {
-    this.dataTypes = dataTypes;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest addDataTypesItem(BrAPITraitDataType dataTypesItem) {
-    if (this.dataTypes == null) {
-      this.dataTypes = new ArrayList<BrAPITraitDataType>();
-    }
-    this.dataTypes.add(dataTypesItem);
-    return this;
-  }
-
-  /**
-   * List of scale data types to filter search results
-   * @return dataTypes
-  **/
-  
-      @Valid
-    public List<BrAPITraitDataType> getDataTypes() {
-    return dataTypes;
-  }
-
-  public void setDataTypes(List<BrAPITraitDataType> dataTypes) {
-    this.dataTypes = dataTypes;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest methodDbIds(List<String> methodDbIds) {
-    this.methodDbIds = methodDbIds;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest addMethodDbIdsItem(String methodDbIdsItem) {
-    if (this.methodDbIds == null) {
-      this.methodDbIds = new ArrayList<String>();
-    }
-    this.methodDbIds.add(methodDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of methods to filter search results
-   * @return methodDbIds
-  **/
-  
-  
-    public List<String> getMethodDbIds() {
-    return methodDbIds;
-  }
-
-  public void setMethodDbIds(List<String> methodDbIds) {
-    this.methodDbIds = methodDbIds;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest ontologyDbIds(List<String> ontologyDbIds) {
-    this.ontologyDbIds = ontologyDbIds;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest addOntologyDbIdsItem(String ontologyDbIdsItem) {
-    if (this.ontologyDbIds == null) {
-      this.ontologyDbIds = new ArrayList<String>();
-    }
-    this.ontologyDbIds.add(ontologyDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of ontology IDs to search for
-   * @return ontologyDbIds
-  **/
-  
-  
-    public List<String> getOntologyDbIds() {
-    return ontologyDbIds;
-  }
-
-  public void setOntologyDbIds(List<String> ontologyDbIds) {
-    this.ontologyDbIds = ontologyDbIds;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest scaleDbIds(List<String> scaleDbIds) {
-    this.scaleDbIds = scaleDbIds;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest addScaleDbIdsItem(String scaleDbIdsItem) {
-    if (this.scaleDbIds == null) {
-      this.scaleDbIds = new ArrayList<String>();
-    }
-    this.scaleDbIds.add(scaleDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of scales to filter search results
-   * @return scaleDbIds
-  **/
-  
-  
-    public List<String> getScaleDbIds() {
-    return scaleDbIds;
-  }
-
-  public void setScaleDbIds(List<String> scaleDbIds) {
-    this.scaleDbIds = scaleDbIds;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest studyDbId(List<String> studyDbId) {
-    this.studyDbId = studyDbId;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest addStudyDbIdItem(String studyDbIdItem) {
-    if (this.studyDbId == null) {
-      this.studyDbId = new ArrayList<String>();
-    }
-    this.studyDbId.add(studyDbIdItem);
-    return this;
-  }
-
-  /**
-   * The unique ID of a studies to filter on
-   * @return studyDbId
-  **/
-  
-  
-    public List<String> getStudyDbId() {
-    return studyDbId;
-  }
-
-  public void setStudyDbId(List<String> studyDbId) {
-    this.studyDbId = studyDbId;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest traitClasses(List<String> traitClasses) {
-    this.traitClasses = traitClasses;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest addTraitClassesItem(String traitClassesItem) {
-    if (this.traitClasses == null) {
-      this.traitClasses = new ArrayList<String>();
-    }
-    this.traitClasses.add(traitClassesItem);
-    return this;
-  }
-
-  /**
-   * List of trait classes to filter search results
-   * @return traitClasses
-  **/
-  
-  
-    public List<String> getTraitClasses() {
-    return traitClasses;
-  }
-
-  public void setTraitClasses(List<String> traitClasses) {
-    this.traitClasses = traitClasses;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest traitDbIds(List<String> traitDbIds) {
-    this.traitDbIds = traitDbIds;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeSearchRequest addTraitDbIdsItem(String traitDbIdsItem) {
-    if (this.traitDbIds == null) {
-      this.traitDbIds = new ArrayList<String>();
-    }
-    this.traitDbIds.add(traitDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of trait unique ID to filter search results
-   * @return traitDbIds
-  **/
-  
-  
-    public List<String> getTraitDbIds() {
-    return traitDbIds;
-  }
-
-  public void setTraitDbIds(List<String> traitDbIds) {
-    this.traitDbIds = traitDbIds;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIGermplasmAttributeSearchRequest germplasmAttributeSearchRequest = (BrAPIGermplasmAttributeSearchRequest) o;
-    return Objects.equals(this.externalReferenceIDs, germplasmAttributeSearchRequest.externalReferenceIDs) &&
-        Objects.equals(this.externalReferenceSources, germplasmAttributeSearchRequest.externalReferenceSources) &&
-        Objects.equals(this.attributeDbIds, germplasmAttributeSearchRequest.attributeDbIds) &&
-        Objects.equals(this.attributeNames, germplasmAttributeSearchRequest.attributeNames) &&
-        Objects.equals(this.dataTypes, germplasmAttributeSearchRequest.dataTypes) &&
-        Objects.equals(this.methodDbIds, germplasmAttributeSearchRequest.methodDbIds) &&
-        Objects.equals(this.ontologyDbIds, germplasmAttributeSearchRequest.ontologyDbIds) &&
-        Objects.equals(this.scaleDbIds, germplasmAttributeSearchRequest.scaleDbIds) &&
-        Objects.equals(this.studyDbId, germplasmAttributeSearchRequest.studyDbId) &&
-        Objects.equals(this.traitClasses, germplasmAttributeSearchRequest.traitClasses) &&
-        Objects.equals(this.traitDbIds, germplasmAttributeSearchRequest.traitDbIds) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(externalReferenceIDs, externalReferenceSources, attributeDbIds, attributeNames, dataTypes, methodDbIds, ontologyDbIds, scaleDbIds, studyDbId, traitClasses, traitDbIds, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class GermplasmAttributeSearchRequest {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-    sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-    sb.append("    attributeDbIds: ").append(toIndentedString(attributeDbIds)).append("\n");
-    sb.append("    attributeNames: ").append(toIndentedString(attributeNames)).append("\n");
-    sb.append("    dataTypes: ").append(toIndentedString(dataTypes)).append("\n");
-    sb.append("    methodDbIds: ").append(toIndentedString(methodDbIds)).append("\n");
-    sb.append("    ontologyDbIds: ").append(toIndentedString(ontologyDbIds)).append("\n");
-    sb.append("    scaleDbIds: ").append(toIndentedString(scaleDbIds)).append("\n");
-    sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-    sb.append("    traitClasses: ").append(toIndentedString(traitClasses)).append("\n");
-    sb.append("    traitDbIds: ").append(toIndentedString(traitDbIds)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIMethod.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIMethod.java
index 3409e2c8..1f37a000 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIMethod.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIMethod.java
@@ -1,8 +1,6 @@
 package org.brapi.v2.model.pheno;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -10,302 +8,308 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.JsonAdapter;
-import lombok.*;
-import lombok.experimental.Accessors;
 import org.brapi.v2.model.BrAPIExternalReference;
 import org.brapi.v2.model.BrAPIOntologyReference;
 import org.brapi.v2.model.NullableJsonElementTypeAdapterFactory;
 
-import javax.validation.Valid;
-
-
 /**
  * Method
  */
 
-
 public class BrAPIMethod {
-  @JsonProperty("methodDbId")
-  private String methodDbId = null;
-
-  @JsonProperty("additionalInfo")
-  @Valid
-  @JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
-  private JsonObject additionalInfo = null;
-
-  @JsonProperty("bibliographicalReference")
-  private String bibliographicalReference = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("externalReferences")
-  private List<BrAPIExternalReference> externalReferences = null;
-
-  @JsonProperty("formula")
-  private String formula = null;
-
-  @JsonProperty("methodClass")
-  private String methodClass = null;
-
-  @JsonProperty("methodName")
-  private String methodName = null;
-
-  @JsonProperty("ontologyReference")
-  private BrAPIOntologyReference ontologyReference = null;
-
-  private final transient Gson gson = new Gson();
-
-  public BrAPIMethod methodDbId(String methodDbId) {
-    this.methodDbId = methodDbId;
-    return this;
-  }
-
-  /**
-   * Method unique identifier
-   * @return methodDbId
-   **/
-
-
-  public String getMethodDbId() {
-    return methodDbId;
-  }
-
-  public void setMethodDbId(String methodDbId) {
-    this.methodDbId = methodDbId;
-  }
-
-  public BrAPIMethod additionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-    return this;
-  }
-
-  public BrAPIMethod putAdditionalInfoItem(String key, Object additionalInfoItem) {
-    if (this.additionalInfo == null) {
-      this.additionalInfo = new JsonObject();
-    }
-    JsonElement newElement = gson.toJsonTree(additionalInfoItem);
-    this.additionalInfo.add(key, newElement);
-    return this;
-  }
-
-  /**
-   * Additional arbitrary info
-   *
-   * @return additionalInfo
-   **/
-
-
-  public JsonObject getAdditionalInfo() {
-    return additionalInfo;
-  }
-
-  public void setAdditionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-  }
-
-  public BrAPIMethod bibliographicalReference(String bibliographicalReference) {
-    this.bibliographicalReference = bibliographicalReference;
-    return this;
-  }
-
-  /**
-   * Bibliographical reference describing the method. MIAPPE V1.1 (DM-91)
-   * Reference associated to the method - URI/DOI of reference describing the
-   * method.
-   *
-   * @return bibliographicalReference
-   **/
-
-
-  public String getBibliographicalReference() {
-    return bibliographicalReference;
-  }
-
-  public void setBibliographicalReference(String bibliographicalReference) {
-    this.bibliographicalReference = bibliographicalReference;
-  }
-
-  public BrAPIMethod description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Method description MIAPPE V1.1 (DM-90) Method description - Textual
-   * description of the method, which may extend a method defined in an external
-   * reference with specific parameters, e.g. growth stage, inoculation precise
-   * organ (leaf number)
-   *
-   * @return description
-   **/
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BrAPIMethod externalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-    return this;
-  }
-
-  /**
-   * Get externalReferences
-   *
-   * @return externalReferences
-   **/
-
-
-  @Valid
-  public List<BrAPIExternalReference> getExternalReferences() {
-    return externalReferences;
-  }
-
-  public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-  }
-
-  public BrAPIMethod formula(String formula) {
-    this.formula = formula;
-    return this;
-  }
-
-  /**
-   * For computational methods i.e., when the method consists in assessing the
-   * trait by computing measurements, write the generic formula used for the
-   * calculation
-   *
-   * @return formula
-   **/
-
-
-  public String getFormula() {
-    return formula;
-  }
-
-  public void setFormula(String formula) {
-    this.formula = formula;
-  }
-
-  public BrAPIMethod methodClass(String methodClass) {
-    this.methodClass = methodClass;
-    return this;
-  }
-
-  /**
-   * Method class (examples: \"Measurement\", \"Counting\", \"Estimation\",
-   * \"Computation\", etc.)
-   *
-   * @return methodClass
-   **/
-
-
-  public String getMethodClass() {
-    return methodClass;
-  }
-
-  public void setMethodClass(String methodClass) {
-    this.methodClass = methodClass;
-  }
-
-  public BrAPIMethod methodName(String methodName) {
-    this.methodName = methodName;
-    return this;
-  }
-
-  /**
-   * Human readable name for the method MIAPPE V1.1 (DM-88) Method Name of the
-   * method of observation
-   *
-   * @return methodName
-   **/
-
-
-  public String getMethodName() {
-    return methodName;
-  }
-
-  public void setMethodName(String methodName) {
-    this.methodName = methodName;
-  }
-
-  public BrAPIMethod ontologyReference(BrAPIOntologyReference ontologyReference) {
-    this.ontologyReference = ontologyReference;
-    return this;
-  }
-
-  /**
-   * Get ontologyReference
-   *
-   * @return ontologyReference
-   **/
-
-
-  @Valid
-  public BrAPIOntologyReference getOntologyReference() {
-    return ontologyReference;
-  }
-
-  public void setOntologyReference(BrAPIOntologyReference ontologyReference) {
-    this.ontologyReference = ontologyReference;
-  }
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIMethod method = (BrAPIMethod) o;
-    return Objects.equals(this.methodDbId, method.methodDbId)
-            && Objects.equals(this.additionalInfo, method.additionalInfo)
-            && Objects.equals(this.bibliographicalReference, method.bibliographicalReference)
-            && Objects.equals(this.description, method.description)
-            && Objects.equals(this.externalReferences, method.externalReferences)
-            && Objects.equals(this.formula, method.formula)
-            && Objects.equals(this.methodClass, method.methodClass)
-            && Objects.equals(this.methodName, method.methodName)
-            && Objects.equals(this.ontologyReference, method.ontologyReference);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(methodDbId, additionalInfo, bibliographicalReference, description, externalReferences, formula,
-                        methodClass, methodName, ontologyReference);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Method {\n");
-    sb.append("    methodDbId: ").append(toIndentedString(methodDbId)).append("\n");
-    sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-    sb.append("    bibliographicalReference: ").append(toIndentedString(bibliographicalReference)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-    sb.append("    formula: ").append(toIndentedString(formula)).append("\n");
-    sb.append("    methodClass: ").append(toIndentedString(methodClass)).append("\n");
-    sb.append("    methodName: ").append(toIndentedString(methodName)).append("\n");
-    sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+	@JsonProperty("methodDbId")
+	private String methodDbId = null;
+
+	@JsonProperty("additionalInfo")
+	@JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
+	private JsonObject additionalInfo = null;
+
+	@JsonProperty("bibliographicalReference")
+	private String bibliographicalReference = null;
+
+	@JsonProperty("description")
+	private String description = null;
+
+	@JsonProperty("externalReferences")
+	private List<BrAPIExternalReference> externalReferences = null;
+
+	@JsonProperty("formula")
+	private String formula = null;
+
+	@JsonProperty("methodClass")
+	private String methodClass = null;
+
+	@JsonProperty("methodName")
+	private String methodName = null;
+
+	@JsonProperty("methodPUI")
+	private String methodPUI = null;
+
+	@JsonProperty("ontologyReference")
+	private BrAPIOntologyReference ontologyReference = null;
+
+	private final transient Gson gson = new Gson();
+
+	public BrAPIMethod methodDbId(String methodDbId) {
+		this.methodDbId = methodDbId;
+		return this;
+	}
+
+	/**
+	 * Method unique identifier
+	 * 
+	 * @return methodDbId
+	 **/
+
+	public String getMethodDbId() {
+		return methodDbId;
+	}
+
+	public void setMethodDbId(String methodDbId) {
+		this.methodDbId = methodDbId;
+	}
+
+	public BrAPIMethod additionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+		return this;
+	}
+
+	public BrAPIMethod putAdditionalInfoItem(String key, Object additionalInfoItem) {
+		if (this.additionalInfo == null) {
+			this.additionalInfo = new JsonObject();
+		}
+		JsonElement newElement = gson.toJsonTree(additionalInfoItem);
+		this.additionalInfo.add(key, newElement);
+		return this;
+	}
+
+	/**
+	 * Additional arbitrary info
+	 *
+	 * @return additionalInfo
+	 **/
+
+	public JsonObject getAdditionalInfo() {
+		return additionalInfo;
+	}
+
+	public void setAdditionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+	}
+
+	public BrAPIMethod bibliographicalReference(String bibliographicalReference) {
+		this.bibliographicalReference = bibliographicalReference;
+		return this;
+	}
+
+	/**
+	 * Bibliographical reference describing the method. MIAPPE V1.1 (DM-91)
+	 * Reference associated to the method - URI/DOI of reference describing the
+	 * method.
+	 *
+	 * @return bibliographicalReference
+	 **/
+
+	public String getBibliographicalReference() {
+		return bibliographicalReference;
+	}
+
+	public void setBibliographicalReference(String bibliographicalReference) {
+		this.bibliographicalReference = bibliographicalReference;
+	}
+
+	public BrAPIMethod description(String description) {
+		this.description = description;
+		return this;
+	}
+
+	/**
+	 * Method description MIAPPE V1.1 (DM-90) Method description - Textual
+	 * description of the method, which may extend a method defined in an external
+	 * reference with specific parameters, e.g. growth stage, inoculation precise
+	 * organ (leaf number)
+	 *
+	 * @return description
+	 **/
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public BrAPIMethod externalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+		return this;
+	}
+
+	/**
+	 * Get externalReferences
+	 *
+	 * @return externalReferences
+	 **/
+
+	public List<BrAPIExternalReference> getExternalReferences() {
+		return externalReferences;
+	}
+
+	public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+	}
+
+	public BrAPIMethod formula(String formula) {
+		this.formula = formula;
+		return this;
+	}
+
+	/**
+	 * For computational methods i.e., when the method consists in assessing the
+	 * trait by computing measurements, write the generic formula used for the
+	 * calculation
+	 *
+	 * @return formula
+	 **/
+
+	public String getFormula() {
+		return formula;
+	}
+
+	public void setFormula(String formula) {
+		this.formula = formula;
+	}
+
+	public BrAPIMethod methodClass(String methodClass) {
+		this.methodClass = methodClass;
+		return this;
+	}
+
+	/**
+	 * Method class (examples: \"Measurement\", \"Counting\", \"Estimation\",
+	 * \"Computation\", etc.)
+	 *
+	 * @return methodClass
+	 **/
+
+	public String getMethodClass() {
+		return methodClass;
+	}
+
+	public void setMethodClass(String methodClass) {
+		this.methodClass = methodClass;
+	}
+
+	public BrAPIMethod methodName(String methodName) {
+		this.methodName = methodName;
+		return this;
+	}
+
+	/**
+	 * Human readable name for the method MIAPPE V1.1 (DM-88) Method Name of the
+	 * method of observation
+	 *
+	 * @return methodName
+	 **/
+
+	public String getMethodName() {
+		return methodName;
+	}
+
+	public void setMethodName(String methodName) {
+		this.methodName = methodName;
+	}
+
+	public BrAPIMethod ontologyReference(BrAPIOntologyReference ontologyReference) {
+		this.ontologyReference = ontologyReference;
+		return this;
+	}
+
+	public BrAPIMethod methodPUI(String methodPUI) {
+		this.methodPUI = methodPUI;
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of a Method, usually in the form of a URI
+	 *
+	 * @return methodPUI
+	 **/
+	public String getMethodPUI() {
+		return methodPUI;
+	}
+
+	public void setMethodPUI(String methodPUI) {
+		this.methodPUI = methodPUI;
+	}
+
+	/**
+	 * Get ontologyReference
+	 *
+	 * @return ontologyReference
+	 **/
+
+	public BrAPIOntologyReference getOntologyReference() {
+		return ontologyReference;
+	}
+
+	public void setOntologyReference(BrAPIOntologyReference ontologyReference) {
+		this.ontologyReference = ontologyReference;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIMethod method = (BrAPIMethod) o;
+		return Objects.equals(this.additionalInfo, method.additionalInfo)
+				&& Objects.equals(this.bibliographicalReference, method.bibliographicalReference)
+				&& Objects.equals(this.description, method.description)
+				&& Objects.equals(this.externalReferences, method.externalReferences)
+				&& Objects.equals(this.formula, method.formula) && Objects.equals(this.methodClass, method.methodClass)
+				&& Objects.equals(this.methodDbId, method.methodDbId)
+				&& Objects.equals(this.methodName, method.methodName)
+				&& Objects.equals(this.methodPUI, method.methodPUI)
+				&& Objects.equals(this.ontologyReference, method.ontologyReference);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(additionalInfo, bibliographicalReference, description, externalReferences, formula,
+				methodClass, methodDbId, methodName, methodPUI, ontologyReference);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class Method {\n");
+
+		sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
+		sb.append("    bibliographicalReference: ").append(toIndentedString(bibliographicalReference)).append("\n");
+		sb.append("    description: ").append(toIndentedString(description)).append("\n");
+		sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
+		sb.append("    formula: ").append(toIndentedString(formula)).append("\n");
+		sb.append("    methodClass: ").append(toIndentedString(methodClass)).append("\n");
+		sb.append("    methodDbId: ").append(toIndentedString(methodDbId)).append("\n");
+		sb.append("    methodName: ").append(toIndentedString(methodName)).append("\n");
+		sb.append("    methodPUI: ").append(toIndentedString(methodPUI)).append("\n");
+		sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservationVariable.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservationVariable.java
index f63229a6..d73c025a 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservationVariable.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservationVariable.java
@@ -27,6 +27,9 @@ public class BrAPIObservationVariable {
   @JsonProperty("observationVariableName")
   private String observationVariableName = null;
 
+  @JsonProperty("observationVariablePUI")
+  private String observationVariablePUI = null;
+
   @JsonProperty("additionalInfo")
   @Valid
   @JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
@@ -117,6 +120,26 @@ public void setObservationVariableDbId(String observationVariableDbId) {
     this.observationVariableDbId = observationVariableDbId;
   }
 
+  public BrAPIObservationVariable observationVariablePUI(String observationVariablePUI) {
+    this.observationVariablePUI = observationVariablePUI;
+    return this;
+  }
+
+  /**
+   * Variable unique identifier  MIAPPE V1.1 (DM-83) Variable ID - Code used to identify the variable in the data file. We recommend using a variable definition from the Crop Ontology where possible. Otherwise, the Crop Ontology naming convention is recommended: <trait abbreviation>_<method abbreviation>_<scale abbreviation>). A variable ID must be unique within a given investigation.
+   * @return observationVariablePUI
+  **/
+  
+      
+
+    public String getObservationVariablePUI() {
+    return observationVariablePUI;
+  }
+
+  public void setObservationVariablePUI(String observationVariablePUI) {
+    this.observationVariablePUI = observationVariablePUI;
+  }
+
   public BrAPIObservationVariable additionalInfo(JsonObject additionalInfo) {
     this.additionalInfo = additionalInfo;
     return this;
@@ -473,6 +496,7 @@ public boolean equals(java.lang.Object o) {
     }
     BrAPIObservationVariable observationVariable = (BrAPIObservationVariable) o;
     return Objects.equals(this.observationVariableDbId, observationVariable.observationVariableDbId) &&
+    		Objects.equals(this.observationVariablePUI, observationVariable.observationVariablePUI) &&
             Objects.equals(this.observationVariableName, observationVariable.observationVariableName) &&
             Objects.equals(this.additionalInfo, observationVariable.additionalInfo) &&
             Objects.equals(this.commonCropName, observationVariable.commonCropName) &&
@@ -495,7 +519,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(observationVariableDbId, observationVariableName, additionalInfo, commonCropName, contextOfUse, defaultValue, documentationURL, externalReferences, growthStage, institution, language, method, ontologyReference, scale, scientist, status, submissionTimestamp, synonyms, trait);
+    return Objects.hash(observationVariableDbId, observationVariablePUI, observationVariableName, additionalInfo, commonCropName, contextOfUse, defaultValue, documentationURL, externalReferences, growthStage, institution, language, method, ontologyReference, scale, scientist, status, submissionTimestamp, synonyms, trait);
   }
 
   @Override
@@ -503,6 +527,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObservationVariable {\n");
     sb.append("    observationVariableDbId: ").append(toIndentedString(observationVariableDbId)).append("\n");
+    sb.append("    observationVariablePUI: ").append(toIndentedString(observationVariablePUI)).append("\n");
     sb.append("    observationVariableName: ").append(toIndentedString(observationVariableName)).append("\n");
     sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
     sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIScale.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIScale.java
index 4fa41b61..f704c0ac 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIScale.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIScale.java
@@ -1,23 +1,14 @@
 package org.brapi.v2.model.pheno;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import javax.validation.Valid;
-
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.JsonAdapter;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
 import org.brapi.v2.model.BrAPIExternalReference;
 import org.brapi.v2.model.BrAPIOntologyReference;
 import org.brapi.v2.model.NullableJsonElementTypeAdapterFactory;
@@ -28,9 +19,9 @@
 
 public class BrAPIScale {
 	@JsonProperty("additionalInfo")
-    @Valid
-    @JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
+	@JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
 	private JsonObject additionalInfo = null;
+
 	@JsonProperty("dataType")
 	private BrAPITraitDataType dataType = null;
 
@@ -46,6 +37,12 @@ public class BrAPIScale {
 	@JsonProperty("scaleName")
 	private String scaleName = null;
 
+	@JsonProperty("scalePUI")
+	private String scalePUI = null;
+
+	@JsonProperty("units")
+	private String units = null;
+
 	@JsonProperty("validValues")
 	private BrAPIScaleValidValues validValues = null;
 
@@ -60,13 +57,13 @@ public BrAPIScale additionalInfo(JsonObject additionalInfo) {
 	}
 
 	public BrAPIScale putAdditionalInfoItem(String key, Object additionalInfoItem) {
-        if (this.additionalInfo == null) {
-          this.additionalInfo = new JsonObject();
-        }
-        JsonElement newElement = gson.toJsonTree(additionalInfoItem);
-        this.additionalInfo.add(key, newElement);
-        return this;
-  	}
+		if (this.additionalInfo == null) {
+			this.additionalInfo = new JsonObject();
+		}
+		JsonElement newElement = gson.toJsonTree(additionalInfoItem);
+		this.additionalInfo.add(key, newElement);
+		return this;
+	}
 
 	/**
 	 * Additional arbitrary info
@@ -74,7 +71,6 @@ public BrAPIScale putAdditionalInfoItem(String key, Object additionalInfoItem) {
 	 * @return additionalInfo
 	 **/
 
-
 	public JsonObject getAdditionalInfo() {
 		return additionalInfo;
 	}
@@ -94,8 +90,6 @@ public BrAPIScale dataType(BrAPITraitDataType dataType) {
 	 * @return dataType
 	 **/
 
-
-	@Valid
 	public BrAPITraitDataType getDataType() {
 		return dataType;
 	}
@@ -115,7 +109,6 @@ public BrAPIScale decimalPlaces(Integer decimalPlaces) {
 	 * @return decimalPlaces
 	 **/
 
-
 	public Integer getDecimalPlaces() {
 		return decimalPlaces;
 	}
@@ -135,8 +128,6 @@ public BrAPIScale externalReferences(List<BrAPIExternalReference> externalRefere
 	 * @return externalReferences
 	 **/
 
-
-	@Valid
 	public List<BrAPIExternalReference> getExternalReferences() {
 		return externalReferences;
 	}
@@ -156,8 +147,6 @@ public BrAPIScale ontologyReference(BrAPIOntologyReference ontologyReference) {
 	 * @return ontologyReference
 	 **/
 
-
-	@Valid
 	public BrAPIOntologyReference getOntologyReference() {
 		return ontologyReference;
 	}
@@ -179,6 +168,45 @@ public void setScaleName(String scaleName) {
 		this.scaleName = scaleName;
 	}
 
+	public BrAPIScale scalePUI(String scalePUI) {
+		this.scalePUI = scalePUI;
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of a Scale, usually in the form of a URI
+	 *
+	 * @return scalePUI
+	 **/
+	public String getScalePUI() {
+		return scalePUI;
+	}
+
+	public void setScalePUI(String scalePUI) {
+		this.scalePUI = scalePUI;
+	}
+
+	public BrAPIScale units(String units) {
+		this.units = units;
+		return this;
+	}
+
+	/**
+	 * This field can be used to describe the units used for this scale. This should
+	 * be the abbreviated form of the units, intended to be displayed with every
+	 * value using this scale. Usually this only applies when &#x60;dataType&#x60;
+	 * is Numeric, but could also be included for other dataTypes when applicable.
+	 *
+	 * @return units
+	 **/
+	public String getUnits() {
+		return units;
+	}
+
+	public void setUnits(String units) {
+		this.units = units;
+	}
+
 	public BrAPIScale validValues(BrAPIScaleValidValues validValues) {
 		this.validValues = validValues;
 		return this;
@@ -190,8 +218,6 @@ public BrAPIScale validValues(BrAPIScaleValidValues validValues) {
 	 * @return validValues
 	 **/
 
-
-	@Valid
 	public BrAPIScaleValidValues getValidValues() {
 		return validValues;
 	}
@@ -206,12 +232,12 @@ public BrAPIScale scaleDbId(String scaleDbId) {
 	}
 
 	/**
-	 * Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.
+	 * Unique identifier of the scale. If left blank, the upload system will
+	 * automatically generate a scale ID.
+	 * 
 	 * @return scaleDbId
 	 **/
 
-
-
 	public String getScaleDbId() {
 		return scaleDbId;
 	}
@@ -220,43 +246,51 @@ public void setScaleDbId(String scaleDbId) {
 		this.scaleDbId = scaleDbId;
 	}
 
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		BrAPIScale scale = (BrAPIScale) o;
-		return Objects.equals(this.scaleDbId, scale.scaleDbId)
-				&& Objects.equals(this.dataType, scale.dataType)
-				&& Objects.equals(this.decimalPlaces, scale.decimalPlaces)
-				&& Objects.equals(this.externalReferences, scale.externalReferences)
-				&& Objects.equals(this.ontologyReference, scale.ontologyReference)
-				&& Objects.equals(this.scaleName, scale.scaleName)
-				&& Objects.equals(this.validValues, scale.validValues);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(scaleDbId, dataType, decimalPlaces, externalReferences, ontologyReference, scaleName, validValues);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ScaleBaseClass {\n");
-		sb.append("    scaleDbId: ").append(toIndentedString(scaleDbId)).append("\n");
-		sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
-		sb.append("    decimalPlaces: ").append(toIndentedString(decimalPlaces)).append("\n");
-		sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-		sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-		sb.append("    scaleName: ").append(toIndentedString(scaleName)).append("\n");
-		sb.append("    validValues: ").append(toIndentedString(validValues)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        BrAPIScale scale = (BrAPIScale) o;
+        return Objects.equals(this.additionalInfo, scale.additionalInfo) &&
+                Objects.equals(this.dataType, scale.dataType) &&
+                Objects.equals(this.decimalPlaces, scale.decimalPlaces) &&
+                Objects.equals(this.externalReferences, scale.externalReferences) &&
+                Objects.equals(this.ontologyReference, scale.ontologyReference) &&
+                Objects.equals(this.scaleDbId, scale.scaleDbId) &&
+                Objects.equals(this.scaleName, scale.scaleName) &&
+                Objects.equals(this.scalePUI, scale.scalePUI) &&
+                Objects.equals(this.units, scale.units) &&
+                Objects.equals(this.validValues, scale.validValues);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(additionalInfo, dataType, decimalPlaces, externalReferences, ontologyReference, scaleDbId, scaleName, scalePUI, units, validValues);
+    }
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class Scale {\n");
+
+        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
+        sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
+        sb.append("    decimalPlaces: ").append(toIndentedString(decimalPlaces)).append("\n");
+        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
+        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
+        sb.append("    scaleDbId: ").append(toIndentedString(scaleDbId)).append("\n");
+        sb.append("    scaleName: ").append(toIndentedString(scaleName)).append("\n");
+        sb.append("    scalePUI: ").append(toIndentedString(scalePUI)).append("\n");
+        sb.append("    units: ").append(toIndentedString(units)).append("\n");
+        sb.append("    validValues: ").append(toIndentedString(validValues)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
 
 	/**
 	 * Convert the given object to string with each line indented by 4 spaces
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIScaleValidValues.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIScaleValidValues.java
index 5cc10796..53aec6b8 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIScaleValidValues.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIScaleValidValues.java
@@ -12,123 +12,178 @@
  * ScaleBaseClassValidValues
  */
 
-
 public class BrAPIScaleValidValues {
-  @JsonProperty("categories")
-  @Valid
-  private List<BrAPIScaleValidValuesCategories> categories = null;
-
-  @JsonProperty("max")
-  private Integer max = null;
-
-  @JsonProperty("min")
-  private Integer min = null;
-
-  public BrAPIScaleValidValues categories(List<BrAPIScaleValidValuesCategories> categories) {
-    this.categories = categories;
-    return this;
-  }
-
-  public BrAPIScaleValidValues addCategoriesItem(BrAPIScaleValidValuesCategories categoriesItem) {
-    if (this.categories == null) {
-      this.categories = new ArrayList<BrAPIScaleValidValuesCategories>();
-    }
-    this.categories.add(categoriesItem);
-    return this;
-  }
-
-  /**
-   * List of possible values with optional labels
-   * @return categories
-  **/
-  
-      @Valid
-    public List<BrAPIScaleValidValuesCategories> getCategories() {
-    return categories;
-  }
-
-  public void setCategories(List<BrAPIScaleValidValuesCategories> categories) {
-    this.categories = categories;
-  }
-
-  public BrAPIScaleValidValues max(Integer max) {
-    this.max = max;
-    return this;
-  }
-
-  /**
-   * Maximum value (used for field data capture control).
-   * @return max
-  **/
-  
-  
-    public Integer getMax() {
-    return max;
-  }
-
-  public void setMax(Integer max) {
-    this.max = max;
-  }
-
-  public BrAPIScaleValidValues min(Integer min) {
-    this.min = min;
-    return this;
-  }
-
-  /**
-   * Minimum value (used for data capture control) for numerical and date scales
-   * @return min
-  **/
-  
-  
-    public Integer getMin() {
-    return min;
-  }
-
-  public void setMin(Integer min) {
-    this.min = min;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIScaleValidValues scaleBaseClassValidValues = (BrAPIScaleValidValues) o;
-    return Objects.equals(this.categories, scaleBaseClassValidValues.categories) &&
-        Objects.equals(this.max, scaleBaseClassValidValues.max) &&
-        Objects.equals(this.min, scaleBaseClassValidValues.min);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(categories, max, min);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ScaleBaseClassValidValues {\n");
-    
-    sb.append("    categories: ").append(toIndentedString(categories)).append("\n");
-    sb.append("    max: ").append(toIndentedString(max)).append("\n");
-    sb.append("    min: ").append(toIndentedString(min)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+	@JsonProperty("categories")
+	@Valid
+	private List<BrAPIScaleValidValuesCategories> categories = null;
+
+	@JsonProperty("max")
+	@Deprecated
+	private Integer max = null;
+
+	@JsonProperty("maximumValue")
+	private String maximumValue = null;
+
+	@JsonProperty("min")
+	@Deprecated
+	private Integer min = null;
+
+	@JsonProperty("minimumValue")
+	private String minimumValue = null;
+
+	public BrAPIScaleValidValues categories(List<BrAPIScaleValidValuesCategories> categories) {
+		this.categories = categories;
+		return this;
+	}
+
+	public BrAPIScaleValidValues addCategoriesItem(BrAPIScaleValidValuesCategories categoriesItem) {
+		if (this.categories == null) {
+			this.categories = new ArrayList<BrAPIScaleValidValuesCategories>();
+		}
+		this.categories.add(categoriesItem);
+		return this;
+	}
+
+	/**
+	 * List of possible values with optional labels
+	 * 
+	 * @return categories
+	 **/
+
+	@Valid
+	public List<BrAPIScaleValidValuesCategories> getCategories() {
+		return categories;
+	}
+
+	public void setCategories(List<BrAPIScaleValidValuesCategories> categories) {
+		this.categories = categories;
+	}
+
+	public BrAPIScaleValidValues maximumValue(String maximumValue) {
+		this.maximumValue = maximumValue;
+		return this;
+	}
+
+	/**
+	 * Maximum value for numerical, date, and time scales. Typically used for data
+	 * capture control and QC.
+	 *
+	 * @return maximumValue
+	 **/
+	public String getMaximumValue() {
+		return maximumValue;
+	}
+
+	public void setMaximumValue(String maximumValue) {
+		this.maximumValue = maximumValue;
+	}
+
+	public BrAPIScaleValidValues minimumValue(String minimumValue) {
+		this.minimumValue = minimumValue;
+		return this;
+	}
+
+	/**
+	 * Minimum value for numerical, date, and time scales. Typically used for data
+	 * capture control and QC.
+	 *
+	 * @return minimumValue
+	 **/
+	public String getMinimumValue() {
+		return minimumValue;
+	}
+
+	public void setMinimumValue(String minimumValue) {
+		this.minimumValue = minimumValue;
+	}
+
+	@Deprecated
+	public BrAPIScaleValidValues max(Integer max) {
+		this.max = max;
+		return this;
+	}
+
+	/**
+	 * Maximum value (used for field data capture control).
+	 * 
+	 * @return max
+	 **/
+
+	@Deprecated
+	public Integer getMax() {
+		return max;
+	}
+
+	@Deprecated
+	public void setMax(Integer max) {
+		this.max = max;
+	}
+
+	@Deprecated
+	public BrAPIScaleValidValues min(Integer min) {
+		this.min = min;
+		return this;
+	}
+
+	/**
+	 * Minimum value (used for data capture control) for numerical and date scales
+	 * 
+	 * @return min
+	 **/
+
+	@Deprecated
+	public Integer getMin() {
+		return min;
+	}
+
+	@Deprecated
+	public void setMin(Integer min) {
+		this.min = min;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIScaleValidValues scaleBaseClassValidValues = (BrAPIScaleValidValues) o;
+		return Objects.equals(this.categories, scaleBaseClassValidValues.categories)
+				&& Objects.equals(this.max, scaleBaseClassValidValues.max)
+				&& Objects.equals(this.maximumValue, scaleBaseClassValidValues.maximumValue)
+				&& Objects.equals(this.min, scaleBaseClassValidValues.min)
+				&& Objects.equals(this.minimumValue, scaleBaseClassValidValues.minimumValue);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(categories, max, min);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class ScaleBaseClassValidValues {\n");
+
+		sb.append("    categories: ").append(toIndentedString(categories)).append("\n");
+		sb.append("    max: ").append(toIndentedString(max)).append("\n");
+        sb.append("    maximumValue: ").append(toIndentedString(maximumValue)).append("\n");
+		sb.append("    min: ").append(toIndentedString(min)).append("\n");
+        sb.append("    minimumValue: ").append(toIndentedString(minimumValue)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPITrait.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPITrait.java
index 8dcedf5d..51686f8c 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPITrait.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPITrait.java
@@ -5,16 +5,10 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.JsonAdapter;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
 import org.brapi.v2.model.BrAPIExternalReference;
 import org.brapi.v2.model.BrAPIOntologyReference;
 import org.brapi.v2.model.NullableJsonElementTypeAdapterFactory;
 
-import javax.validation.Valid;
 import java.util.*;
 
 /**
@@ -23,19 +17,24 @@
 
 public class BrAPITrait {
 	@JsonProperty("additionalInfo")
-    @Valid
-    @JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
+	@JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
 	private JsonObject additionalInfo = null;
+
 	@JsonProperty("alternativeAbbreviations")
-	@Valid
 	private List<String> alternativeAbbreviations = null;
 
 	@JsonProperty("attribute")
 	private String attribute = null;
 
+	@JsonProperty("attributePUI")
+	private String attributePUI = null;
+
 	@JsonProperty("entity")
 	private String entity = null;
 
+	@JsonProperty("entityPUI")
+	private String entityPUI = null;
+
 	@JsonProperty("externalReferences")
 	private List<BrAPIExternalReference> externalReferences = null;
 
@@ -49,7 +48,6 @@ public class BrAPITrait {
 	private String status = null;
 
 	@JsonProperty("synonyms")
-	@Valid
 	private List<String> synonyms = null;
 
 	@JsonProperty("traitClass")
@@ -61,6 +59,9 @@ public class BrAPITrait {
 	@JsonProperty("traitName")
 	private String traitName = null;
 
+	@JsonProperty("traitPUI")
+	private String traitPUI = null;
+
 	@JsonProperty("traitDbId")
 	private String traitDbId = null;
 
@@ -73,10 +74,10 @@ public BrAPITrait traitDbId(String traitDbId) {
 
 	/**
 	 * The ID which uniquely identifies a trait
+	 * 
 	 * @return traitDbId
 	 **/
 
-
 	public String getTraitDbId() {
 		return traitDbId;
 	}
@@ -91,13 +92,13 @@ public BrAPITrait additionalInfo(JsonObject additionalInfo) {
 	}
 
 	public BrAPITrait putAdditionalInfoItem(String key, Object additionalInfoItem) {
-        if (this.additionalInfo == null) {
-          this.additionalInfo = new JsonObject();
-        }
-        JsonElement newElement = gson.toJsonTree(additionalInfoItem);
-        this.additionalInfo.add(key, newElement);
-        return this;
-  	}
+		if (this.additionalInfo == null) {
+			this.additionalInfo = new JsonObject();
+		}
+		JsonElement newElement = gson.toJsonTree(additionalInfoItem);
+		this.additionalInfo.add(key, newElement);
+		return this;
+	}
 
 	/**
 	 * Additional arbitrary info
@@ -105,7 +106,6 @@ public BrAPITrait putAdditionalInfoItem(String key, Object additionalInfoItem) {
 	 * @return additionalInfo
 	 **/
 
-
 	public JsonObject getAdditionalInfo() {
 		return additionalInfo;
 	}
@@ -113,6 +113,7 @@ public JsonObject getAdditionalInfo() {
 	public void setAdditionalInfo(JsonObject additionalInfo) {
 		this.additionalInfo = additionalInfo;
 	}
+
 	public BrAPITrait alternativeAbbreviations(List<String> alternativeAbbreviations) {
 		this.alternativeAbbreviations = alternativeAbbreviations;
 		return this;
@@ -133,7 +134,6 @@ public BrAPITrait addAlternativeAbbreviationsItem(String alternativeAbbreviation
 	 * @return alternativeAbbreviations
 	 **/
 
-
 	public List<String> getAlternativeAbbreviations() {
 		return alternativeAbbreviations;
 	}
@@ -155,7 +155,6 @@ public BrAPITrait attribute(String attribute) {
 	 * @return attribute
 	 **/
 
-
 	public String getAttribute() {
 		return attribute;
 	}
@@ -164,6 +163,28 @@ public void setAttribute(String attribute) {
 		this.attribute = attribute;
 	}
 
+	public BrAPITrait attributePUI(String attributePUI) {
+		this.attributePUI = attributePUI;
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of a Trait Attribute, usually in the form of
+	 * a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D;
+	 * \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed
+	 * feature (or characteristic) of the entity e.g., for \&quot;grain
+	 * colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
+	 *
+	 * @return attributePUI
+	 **/
+	public String getAttributePUI() {
+		return attributePUI;
+	}
+
+	public void setAttributePUI(String attributePUI) {
+		this.attributePUI = attributePUI;
+	}
+
 	public BrAPITrait entity(String entity) {
 		this.entity = entity;
 		return this;
@@ -177,7 +198,6 @@ public BrAPITrait entity(String entity) {
 	 * @return entity
 	 **/
 
-
 	public String getEntity() {
 		return entity;
 	}
@@ -186,6 +206,28 @@ public void setEntity(String entity) {
 		this.entity = entity;
 	}
 
+	public BrAPITrait entityPUI(String entityPUI) {
+		this.entityPUI = entityPUI;
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of a Trait Entity, usually in the form of a
+	 * URI &lt;br/&gt;A Trait can be decomposed as \&quot;Trait\&quot; &#x3D;
+	 * \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the Entity is the part of the
+	 * plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity
+	 * &#x3D; \&quot;grain\&quot;
+	 *
+	 * @return entityPUI
+	 **/
+	public String getEntityPUI() {
+		return entityPUI;
+	}
+
+	public void setEntityPUI(String entityPUI) {
+		this.entityPUI = entityPUI;
+	}
+
 	public BrAPITrait externalReferences(List<BrAPIExternalReference> externalReferences) {
 		this.externalReferences = externalReferences;
 		return this;
@@ -197,8 +239,6 @@ public BrAPITrait externalReferences(List<BrAPIExternalReference> externalRefere
 	 * @return externalReferences
 	 **/
 
-
-	@Valid
 	public List<BrAPIExternalReference> getExternalReferences() {
 		return externalReferences;
 	}
@@ -219,7 +259,6 @@ public BrAPITrait mainAbbreviation(String mainAbbreviation) {
 	 * @return mainAbbreviation
 	 **/
 
-
 	public String getMainAbbreviation() {
 		return mainAbbreviation;
 	}
@@ -239,8 +278,6 @@ public BrAPITrait ontologyReference(BrAPIOntologyReference ontologyReference) {
 	 * @return ontologyReference
 	 **/
 
-
-	@Valid
 	public BrAPIOntologyReference getOntologyReference() {
 		return ontologyReference;
 	}
@@ -260,7 +297,6 @@ public BrAPITrait status(String status) {
 	 * @return status
 	 **/
 
-
 	public String getStatus() {
 		return status;
 	}
@@ -288,7 +324,6 @@ public BrAPITrait addSynonymsItem(String synonymsItem) {
 	 * @return synonyms
 	 **/
 
-
 	public List<String> getSynonyms() {
 		return synonyms;
 	}
@@ -310,7 +345,6 @@ public BrAPITrait traitClass(String traitClass) {
 	 * @return traitClass
 	 **/
 
-
 	public String getTraitClass() {
 		return traitClass;
 	}
@@ -330,7 +364,6 @@ public BrAPITrait traitDescription(String traitDescription) {
 	 * @return traitDescription
 	 **/
 
-
 	public String getTraitDescription() {
 		return traitDescription;
 	}
@@ -351,7 +384,6 @@ public BrAPITrait traitName(String traitName) {
 	 * @return traitName
 	 **/
 
-
 	public String getTraitName() {
 		return traitName;
 	}
@@ -360,6 +392,24 @@ public void setTraitName(String traitName) {
 		this.traitName = traitName;
 	}
 
+	public BrAPITrait traitPUI(String traitPUI) {
+		this.traitPUI = traitPUI;
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of a Trait, usually in the form of a URI
+	 *
+	 * @return traitPUI
+	 **/
+	public String getTraitPUI() {
+		return traitPUI;
+	}
+
+	public void setTraitPUI(String traitPUI) {
+		this.traitPUI = traitPUI;
+	}
+
 	@Override
 	public boolean equals(java.lang.Object o) {
 		if (this == o) {
@@ -369,42 +419,46 @@ public boolean equals(java.lang.Object o) {
 			return false;
 		}
 		BrAPITrait trait = (BrAPITrait) o;
-		return Objects.equals(this.traitDbId, trait.traitDbId)
+		return Objects.equals(this.additionalInfo, trait.additionalInfo)
 				&& Objects.equals(this.alternativeAbbreviations, trait.alternativeAbbreviations)
 				&& Objects.equals(this.attribute, trait.attribute)
-				&& Objects.equals(this.entity, trait.entity)
+				&& Objects.equals(this.attributePUI, trait.attributePUI) && Objects.equals(this.entity, trait.entity)
+				&& Objects.equals(this.entityPUI, trait.entityPUI)
 				&& Objects.equals(this.externalReferences, trait.externalReferences)
 				&& Objects.equals(this.mainAbbreviation, trait.mainAbbreviation)
 				&& Objects.equals(this.ontologyReference, trait.ontologyReference)
-				&& Objects.equals(this.status, trait.status)
-				&& Objects.equals(this.synonyms, trait.synonyms)
-				&& Objects.equals(this.traitClass, trait.traitClass)
+				&& Objects.equals(this.status, trait.status) && Objects.equals(this.synonyms, trait.synonyms)
+				&& Objects.equals(this.traitClass, trait.traitClass) && Objects.equals(this.traitDbId, trait.traitDbId)
 				&& Objects.equals(this.traitDescription, trait.traitDescription)
-				&& Objects.equals(this.traitName, trait.traitName);
+				&& Objects.equals(this.traitName, trait.traitName) && Objects.equals(this.traitPUI, trait.traitPUI);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(traitDbId, alternativeAbbreviations, attribute, entity, externalReferences, mainAbbreviation,
-							ontologyReference, status, synonyms, traitClass, traitDescription, traitName);
+		return Objects.hash(traitDbId, alternativeAbbreviations, attribute, entity, externalReferences,
+				mainAbbreviation, ontologyReference, status, synonyms, traitClass, traitDescription, traitName);
 	}
 
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
 		sb.append("class Trait {\n");
-		sb.append("    traitDbId: ").append(toIndentedString(traitDbId)).append("\n");
+		sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
 		sb.append("    alternativeAbbreviations: ").append(toIndentedString(alternativeAbbreviations)).append("\n");
 		sb.append("    attribute: ").append(toIndentedString(attribute)).append("\n");
+		sb.append("    attributePUI: ").append(toIndentedString(attributePUI)).append("\n");
 		sb.append("    entity: ").append(toIndentedString(entity)).append("\n");
+		sb.append("    entityPUI: ").append(toIndentedString(entityPUI)).append("\n");
 		sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
 		sb.append("    mainAbbreviation: ").append(toIndentedString(mainAbbreviation)).append("\n");
 		sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
 		sb.append("    status: ").append(toIndentedString(status)).append("\n");
 		sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
 		sb.append("    traitClass: ").append(toIndentedString(traitClass)).append("\n");
+		sb.append("    traitDbId: ").append(toIndentedString(traitDbId)).append("\n");
 		sb.append("    traitDescription: ").append(toIndentedString(traitDescription)).append("\n");
 		sb.append("    traitName: ").append(toIndentedString(traitName)).append("\n");
+		sb.append("    traitPUI: ").append(toIndentedString(traitPUI)).append("\n");
 		sb.append("}");
 		return sb.toString();
 	}
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPITraitDataType.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPITraitDataType.java
index d9c4aa9f..f4eb17ed 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPITraitDataType.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPITraitDataType.java
@@ -6,41 +6,74 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 
 /**
- * <p>Class of the scale, entries can be</p> <p>\"Code\" -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \"75VD\" means \"75 %\" of the plant is infected and the plant is very delayed.</p> <p>\"Date\" - The date class is for events expressed in a time format, See ISO 8601</p> <p>\"Duration\" - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months</p> <p>\"Nominal\" - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories</p> <p>\"Numerical\" - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches</p> <p>\"Ordinal\" - Ordinal scales are scales composed of ordered categories</p> <p>\"Text\" - A free text is used to express the trait.</p>
+ * <p>
+ * Class of the scale, entries can be
+ * </p>
+ * <p>
+ * \"Code\" - This scale class is exceptionally used to express complex traits.
+ * Code is a nominal scale that combines the expressions of the different traits
+ * composing the complex trait. For example a severity trait might be expressed
+ * by a 2 digit and 2 character code. The first 2 digits are the percentage of
+ * the plant covered by a fungus and the 2 characters refer to the delay in
+ * development, e.g. \"75VD\" means \"75 %\" of the plant is infected and the
+ * plant is very delayed.
+ * </p>
+ * <p>
+ * \"Date\" - The date class is for events expressed in a time format, See ISO
+ * 8601
+ * </p>
+ * <p>
+ * \"Duration\" - The Duration class is for time elapsed between two events
+ * expressed in a time format, e.g. days, hours, months
+ * </p>
+ * <p>
+ * \"Nominal\" - Categorical scale that can take one of a limited and fixed
+ * number of categories. There is no intrinsic ordering to the categories
+ * </p>
+ * <p>
+ * \"Numerical\" - Numerical scales express the trait with real numbers. The
+ * numerical scale defines the unit e.g. centimeter, ton per hectare, branches
+ * </p>
+ * <p>
+ * \"Ordinal\" - Ordinal scales are scales composed of ordered categories
+ * </p>
+ * <p>
+ * \"Text\" - A free text is used to express the trait.
+ * </p>
  */
 public enum BrAPITraitDataType implements BrAPIEnum {
-  CODE("Code"),
-    DATE("Date"),
-    DURATION("Duration"),
-    NOMINAL("Nominal"),
-    NUMERICAL("Numerical"),
-    ORDINAL("Ordinal"),
-    TEXT("Text");
-
-  private String value;
-
-  BrAPITraitDataType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static BrAPITraitDataType fromValue(String text) {
-    for (BrAPITraitDataType b : BrAPITraitDataType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-
-@Override
-public String getBrapiValue() {
-	return value;
-}
+	CODE("Code"), 
+	DATE("Date"), 
+	DURATION("Duration"), 
+	NOMINAL("Nominal"), 
+	NUMERICAL("Numerical"), 
+	ORDINAL("Ordinal"),
+	TEXT("Text");
+
+	private String value;
+
+	BrAPITraitDataType(String value) {
+		this.value = value;
+	}
+
+	@Override
+	@JsonValue
+	public String toString() {
+		return String.valueOf(value);
+	}
+
+	@JsonCreator
+	public static BrAPITraitDataType fromValue(String text) {
+		for (BrAPITraitDataType b : BrAPITraitDataType.values()) {
+			if (String.valueOf(b.value).equals(text)) {
+				return b;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public String getBrapiValue() {
+		return value;
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/request/BrAPIObservationVariableSearchRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/request/BrAPIObservationVariableSearchRequest.java
index 50c7d4f9..c2b3cf32 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/request/BrAPIObservationVariableSearchRequest.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/request/BrAPIObservationVariableSearchRequest.java
@@ -6,76 +6,173 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-
 import org.brapi.v2.model.BrAPISearchRequestParametersPaging;
 import org.brapi.v2.model.pheno.BrAPITraitDataType;
 
 /**
- * ObservationVariableSearchRequest
+ * BrAPIObservationVariableSearchRequest
  */
 
-
 public class BrAPIObservationVariableSearchRequest extends BrAPISearchRequestParametersPaging {
+	@JsonProperty("commonCropNames")
+	private List<String> commonCropNames = null;
+
+	@JsonProperty("dataTypes")
+	private List<BrAPITraitDataType> dataTypes = null;
+
+	@Deprecated
 	@JsonProperty("externalReferenceIDs")
-	@Valid
 	private List<String> externalReferenceIDs = null;
 
+	@JsonProperty("externalReferenceIds")
+	private List<String> externalReferenceIds = null;
+
 	@JsonProperty("externalReferenceSources")
-	@Valid
 	private List<String> externalReferenceSources = null;
 
-	@JsonProperty("dataTypes")
-	@Valid
-	private List<BrAPITraitDataType> dataTypes = null;
-
 	@JsonProperty("methodDbIds")
-	@Valid
 	private List<String> methodDbIds = null;
 
+	@JsonProperty("methodNames")
+	private List<String> methodNames = null;
+
+	@JsonProperty("methodPUIs")
+	private List<String> methodPUIs = null;
+
 	@JsonProperty("observationVariableDbIds")
-	@Valid
 	private List<String> observationVariableDbIds = null;
 
 	@JsonProperty("observationVariableNames")
-	@Valid
 	private List<String> observationVariableNames = null;
 
+	@JsonProperty("observationVariablePUIs")
+	private List<String> observationVariablePUIs = null;
+
 	@JsonProperty("ontologyDbIds")
-	@Valid
 	private List<String> ontologyDbIds = null;
 
+	@JsonProperty("programDbIds")
+	private List<String> programDbIds = null;
+
+	@JsonProperty("programNames")
+	private List<String> programNames = null;
+
 	@JsonProperty("scaleDbIds")
-	@Valid
 	private List<String> scaleDbIds = null;
 
+	@JsonProperty("scaleNames")
+	private List<String> scaleNames = null;
+
+	@JsonProperty("scalePUIs")
+	private List<String> scalePUIs = null;
+
+	@Deprecated
 	@JsonProperty("studyDbId")
-	@Valid
 	private List<String> studyDbId = null;
 
+	@JsonProperty("studyDbIds")
+	private List<String> studyDbIds = null;
+
+	@JsonProperty("studyNames")
+	private List<String> studyNames = null;
+
+	@JsonProperty("traitAttributePUIs")
+	private List<String> traitAttributePUIs = null;
+
+	@JsonProperty("traitAttributes")
+	private List<String> traitAttributes = null;
+
 	@JsonProperty("traitClasses")
-	@Valid
 	private List<String> traitClasses = null;
 
 	@JsonProperty("traitDbIds")
-	@Valid
 	private List<String> traitDbIds = null;
 
-	private List<String> observationUnitDbIds = null;
+	@JsonProperty("traitEntities")
+	private List<String> traitEntities = null;
+
+	@JsonProperty("traitEntityPUIs")
+	private List<String> traitEntityPUIs = null;
+
+	@JsonProperty("traitNames")
+	private List<String> traitNames = null;
+
+	@JsonProperty("traitPUIs")
+	private List<String> traitPUIs = null;
+
+	@JsonProperty("trialDbIds")
+	private List<String> trialDbIds = null;
+
+	@JsonProperty("trialNames")
+	private List<String> trialNames = null;
+
+	public BrAPIObservationVariableSearchRequest commonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
+		if (this.commonCropNames == null) {
+			this.commonCropNames = new ArrayList<String>();
+		}
+		this.commonCropNames.add(commonCropNamesItem);
+		return this;
+	}
+
+	/**
+	 * The BrAPI Common Crop Name is the simple, generalized, widely accepted name
+	 * of the organism being researched. It is most often used in multi-crop systems
+	 * where digital resources need to be divided at a high level. Things like
+	 * &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of
+	 * common crop names. Use this parameter to only return results associated with
+	 * the given crops. Use &#x60;GET /commoncropnames&#x60; to find the list of
+	 * available crops on a server.
+	 *
+	 * @return commonCropNames
+	 **/
+
+	public List<String> getCommonCropNames() {
+		return commonCropNames;
+	}
+
+	public void setCommonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+	}
+
+	public BrAPIObservationVariableSearchRequest dataTypes(List<BrAPITraitDataType> dataTypes) {
+		this.dataTypes = dataTypes;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addDataTypesItem(BrAPITraitDataType dataTypesItem) {
+		if (this.dataTypes == null) {
+			this.dataTypes = new ArrayList<BrAPITraitDataType>();
+		}
+		this.dataTypes.add(dataTypesItem);
+		return this;
+	}
+
+	/**
+	 * List of scale data types to filter search results
+	 *
+	 * @return dataTypes
+	 **/
 
-	public List<String> getObservationUnitDbIds() {
-		return observationUnitDbIds;
+	public List<BrAPITraitDataType> getDataTypes() {
+		return dataTypes;
 	}
 
-	public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-		this.observationUnitDbIds = observationUnitDbIds;
+	public void setDataTypes(List<BrAPITraitDataType> dataTypes) {
+		this.dataTypes = dataTypes;
 	}
 
+	@Deprecated
 	public BrAPIObservationVariableSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
 		this.externalReferenceIDs = externalReferenceIDs;
 		return this;
 	}
 
+	@Deprecated
 	public BrAPIObservationVariableSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
 		if (this.externalReferenceIDs == null) {
 			this.externalReferenceIDs = new ArrayList<String>();
@@ -85,74 +182,77 @@ public BrAPIObservationVariableSearchRequest addExternalReferenceIDsItem(String
 	}
 
 	/**
-	 * List of external references for the trait to search for
-	 * 
+	 * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github
+	 * issue number #460 &lt;br&gt;List of external reference IDs. Could be a simple
+	 * strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
+	 *
 	 * @return externalReferenceIDs
 	 **/
-	
 
+	@Deprecated
 	public List<String> getExternalReferenceIDs() {
 		return externalReferenceIDs;
 	}
 
+	@Deprecated
 	public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
 		this.externalReferenceIDs = externalReferenceIDs;
 	}
 
-	public BrAPIObservationVariableSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-		this.externalReferenceSources = externalReferenceSources;
+	public BrAPIObservationVariableSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
 		return this;
 	}
 
-	public BrAPIObservationVariableSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-		if (this.externalReferenceSources == null) {
-			this.externalReferenceSources = new ArrayList<String>();
+	public BrAPIObservationVariableSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
+		if (this.externalReferenceIds == null) {
+			this.externalReferenceIds = new ArrayList<String>();
 		}
-		this.externalReferenceSources.add(externalReferenceSourcesItem);
+		this.externalReferenceIds.add(externalReferenceIdsItem);
 		return this;
 	}
 
 	/**
-	 * List of external references sources for the trait to search for
-	 * 
-	 * @return externalReferenceSources
+	 * List of external reference IDs. Could be a simple strings or a URIs. (use
+	 * with &#x60;externalReferenceSources&#x60; parameter)
+	 *
+	 * @return externalReferenceIds
 	 **/
-	
 
-	public List<String> getExternalReferenceSources() {
-		return externalReferenceSources;
+	public List<String> getExternalReferenceIds() {
+		return externalReferenceIds;
 	}
 
-	public void setExternalReferenceSources(List<String> externalReferenceSources) {
-		this.externalReferenceSources = externalReferenceSources;
+	public void setExternalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
 	}
 
-	public BrAPIObservationVariableSearchRequest dataTypes(List<BrAPITraitDataType> dataTypes) {
-		this.dataTypes = dataTypes;
+	public BrAPIObservationVariableSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
 		return this;
 	}
 
-	public BrAPIObservationVariableSearchRequest addDataTypesItem(BrAPITraitDataType dataTypesItem) {
-		if (this.dataTypes == null) {
-			this.dataTypes = new ArrayList<BrAPITraitDataType>();
+	public BrAPIObservationVariableSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
+		if (this.externalReferenceSources == null) {
+			this.externalReferenceSources = new ArrayList<String>();
 		}
-		this.dataTypes.add(dataTypesItem);
+		this.externalReferenceSources.add(externalReferenceSourcesItem);
 		return this;
 	}
 
 	/**
-	 * List of scale data types to filter search results
-	 * 
-	 * @return dataTypes
+	 * List of identifiers for the source system or database of an external
+	 * reference (use with &#x60;externalReferenceIDs&#x60; parameter)
+	 *
+	 * @return externalReferenceSources
 	 **/
-	
-	@Valid
-	public List<BrAPITraitDataType> getDataTypes() {
-		return dataTypes;
+
+	public List<String> getExternalReferenceSources() {
+		return externalReferenceSources;
 	}
 
-	public void setDataTypes(List<BrAPITraitDataType> dataTypes) {
-		this.dataTypes = dataTypes;
+	public void setExternalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
 	}
 
 	public BrAPIObservationVariableSearchRequest methodDbIds(List<String> methodDbIds) {
@@ -170,10 +270,9 @@ public BrAPIObservationVariableSearchRequest addMethodDbIdsItem(String methodDbI
 
 	/**
 	 * List of methods to filter search results
-	 * 
+	 *
 	 * @return methodDbIds
 	 **/
-	
 
 	public List<String> getMethodDbIds() {
 		return methodDbIds;
@@ -183,6 +282,61 @@ public void setMethodDbIds(List<String> methodDbIds) {
 		this.methodDbIds = methodDbIds;
 	}
 
+	public BrAPIObservationVariableSearchRequest methodNames(List<String> methodNames) {
+		this.methodNames = methodNames;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addMethodNamesItem(String methodNamesItem) {
+		if (this.methodNames == null) {
+			this.methodNames = new ArrayList<String>();
+		}
+		this.methodNames.add(methodNamesItem);
+		return this;
+	}
+
+	/**
+	 * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method Name
+	 * of the method of observation
+	 *
+	 * @return methodNames
+	 **/
+
+	public List<String> getMethodNames() {
+		return methodNames;
+	}
+
+	public void setMethodNames(List<String> methodNames) {
+		this.methodNames = methodNames;
+	}
+
+	public BrAPIObservationVariableSearchRequest methodPUIs(List<String> methodPUIs) {
+		this.methodPUIs = methodPUIs;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addMethodPUIsItem(String methodPUIsItem) {
+		if (this.methodPUIs == null) {
+			this.methodPUIs = new ArrayList<String>();
+		}
+		this.methodPUIs.add(methodPUIsItem);
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of a Method, usually in the form of a URI
+	 *
+	 * @return methodPUIs
+	 **/
+
+	public List<String> getMethodPUIs() {
+		return methodPUIs;
+	}
+
+	public void setMethodPUIs(List<String> methodPUIs) {
+		this.methodPUIs = methodPUIs;
+	}
+
 	public BrAPIObservationVariableSearchRequest observationVariableDbIds(List<String> observationVariableDbIds) {
 		this.observationVariableDbIds = observationVariableDbIds;
 		return this;
@@ -197,11 +351,10 @@ public BrAPIObservationVariableSearchRequest addObservationVariableDbIdsItem(Str
 	}
 
 	/**
-	 * List of observation variable IDs to search for
-	 * 
+	 * The DbIds of Variables to search for
+	 *
 	 * @return observationVariableDbIds
 	 **/
-	
 
 	public List<String> getObservationVariableDbIds() {
 		return observationVariableDbIds;
@@ -225,11 +378,10 @@ public BrAPIObservationVariableSearchRequest addObservationVariableNamesItem(Str
 	}
 
 	/**
-	 * List of human readable observation variable names to search for
-	 * 
+	 * The names of Variables to search for
+	 *
 	 * @return observationVariableNames
 	 **/
-	
 
 	public List<String> getObservationVariableNames() {
 		return observationVariableNames;
@@ -239,6 +391,34 @@ public void setObservationVariableNames(List<String> observationVariableNames) {
 		this.observationVariableNames = observationVariableNames;
 	}
 
+	public BrAPIObservationVariableSearchRequest observationVariablePUIs(List<String> observationVariablePUIs) {
+		this.observationVariablePUIs = observationVariablePUIs;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addObservationVariablePUIsItem(String observationVariablePUIsItem) {
+		if (this.observationVariablePUIs == null) {
+			this.observationVariablePUIs = new ArrayList<String>();
+		}
+		this.observationVariablePUIs.add(observationVariablePUIsItem);
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of an Observation Variable, usually in the
+	 * form of a URI
+	 *
+	 * @return observationVariablePUIs
+	 **/
+
+	public List<String> getObservationVariablePUIs() {
+		return observationVariablePUIs;
+	}
+
+	public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
+		this.observationVariablePUIs = observationVariablePUIs;
+	}
+
 	public BrAPIObservationVariableSearchRequest ontologyDbIds(List<String> ontologyDbIds) {
 		this.ontologyDbIds = ontologyDbIds;
 		return this;
@@ -254,10 +434,9 @@ public BrAPIObservationVariableSearchRequest addOntologyDbIdsItem(String ontolog
 
 	/**
 	 * List of ontology IDs to search for
-	 * 
+	 *
 	 * @return ontologyDbIds
 	 **/
-	
 
 	public List<String> getOntologyDbIds() {
 		return ontologyDbIds;
@@ -267,6 +446,66 @@ public void setOntologyDbIds(List<String> ontologyDbIds) {
 		this.ontologyDbIds = ontologyDbIds;
 	}
 
+	public BrAPIObservationVariableSearchRequest programDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
+		if (this.programDbIds == null) {
+			this.programDbIds = new ArrayList<String>();
+		}
+		this.programDbIds.add(programDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * A BrAPI Program represents the high level organization or group who is
+	 * responsible for conducting trials and studies. Things like Breeding Programs
+	 * and Funded Projects are considered BrAPI Programs. Use this parameter to only
+	 * return results associated with the given programs. Use &#x60;GET
+	 * /programs&#x60; to find the list of available programs on a server.
+	 *
+	 * @return programDbIds
+	 **/
+
+	public List<String> getProgramDbIds() {
+		return programDbIds;
+	}
+
+	public void setProgramDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+	}
+
+	public BrAPIObservationVariableSearchRequest programNames(List<String> programNames) {
+		this.programNames = programNames;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addProgramNamesItem(String programNamesItem) {
+		if (this.programNames == null) {
+			this.programNames = new ArrayList<String>();
+		}
+		this.programNames.add(programNamesItem);
+		return this;
+	}
+
+	/**
+	 * Use this parameter to only return results associated with the given program
+	 * names. Program names are not required to be unique. Use &#x60;GET
+	 * /programs&#x60; to find the list of available programs on a server.
+	 *
+	 * @return programNames
+	 **/
+
+	public List<String> getProgramNames() {
+		return programNames;
+	}
+
+	public void setProgramNames(List<String> programNames) {
+		this.programNames = programNames;
+	}
+
 	public BrAPIObservationVariableSearchRequest scaleDbIds(List<String> scaleDbIds) {
 		this.scaleDbIds = scaleDbIds;
 		return this;
@@ -281,11 +520,10 @@ public BrAPIObservationVariableSearchRequest addScaleDbIdsItem(String scaleDbIds
 	}
 
 	/**
-	 * List of scales to filter search results
-	 * 
+	 * The unique identifier for a Scale
+	 *
 	 * @return scaleDbIds
 	 **/
-	
 
 	public List<String> getScaleDbIds() {
 		return scaleDbIds;
@@ -295,11 +533,68 @@ public void setScaleDbIds(List<String> scaleDbIds) {
 		this.scaleDbIds = scaleDbIds;
 	}
 
+	public BrAPIObservationVariableSearchRequest scaleNames(List<String> scaleNames) {
+		this.scaleNames = scaleNames;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addScaleNamesItem(String scaleNamesItem) {
+		if (this.scaleNames == null) {
+			this.scaleNames = new ArrayList<String>();
+		}
+		this.scaleNames.add(scaleNamesItem);
+		return this;
+	}
+
+	/**
+	 * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale
+	 * associated with the variable
+	 *
+	 * @return scaleNames
+	 **/
+
+	public List<String> getScaleNames() {
+		return scaleNames;
+	}
+
+	public void setScaleNames(List<String> scaleNames) {
+		this.scaleNames = scaleNames;
+	}
+
+	public BrAPIObservationVariableSearchRequest scalePUIs(List<String> scalePUIs) {
+		this.scalePUIs = scalePUIs;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addScalePUIsItem(String scalePUIsItem) {
+		if (this.scalePUIs == null) {
+			this.scalePUIs = new ArrayList<String>();
+		}
+		this.scalePUIs.add(scalePUIsItem);
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of a Scale, usually in the form of a URI
+	 *
+	 * @return scalePUIs
+	 **/
+
+	public List<String> getScalePUIs() {
+		return scalePUIs;
+	}
+
+	public void setScalePUIs(List<String> scalePUIs) {
+		this.scalePUIs = scalePUIs;
+	}
+
+	@Deprecated
 	public BrAPIObservationVariableSearchRequest studyDbId(List<String> studyDbId) {
 		this.studyDbId = studyDbId;
 		return this;
 	}
 
+	@Deprecated
 	public BrAPIObservationVariableSearchRequest addStudyDbIdItem(String studyDbIdItem) {
 		if (this.studyDbId == null) {
 			this.studyDbId = new ArrayList<String>();
@@ -309,20 +604,137 @@ public BrAPIObservationVariableSearchRequest addStudyDbIdItem(String studyDbIdIt
 	}
 
 	/**
-	 * The unique ID of a studies to filter on
-	 * 
+	 * **Deprecated in v2.1** Please use &#x60;studyDbIds&#x60;. Github issue number
+	 * #483 &lt;br&gt;The unique ID of a studies to filter on
+	 *
 	 * @return studyDbId
 	 **/
-	
 
+	@Deprecated
 	public List<String> getStudyDbId() {
 		return studyDbId;
 	}
 
+	@Deprecated
 	public void setStudyDbId(List<String> studyDbId) {
 		this.studyDbId = studyDbId;
 	}
 
+	public BrAPIObservationVariableSearchRequest studyDbIds(List<String> studyDbIds) {
+		this.studyDbIds = studyDbIds;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
+		if (this.studyDbIds == null) {
+			this.studyDbIds = new ArrayList<String>();
+		}
+		this.studyDbIds.add(studyDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of study identifiers to search for
+	 *
+	 * @return studyDbIds
+	 **/
+
+	public List<String> getStudyDbIds() {
+		return studyDbIds;
+	}
+
+	public void setStudyDbIds(List<String> studyDbIds) {
+		this.studyDbIds = studyDbIds;
+	}
+
+	public BrAPIObservationVariableSearchRequest studyNames(List<String> studyNames) {
+		this.studyNames = studyNames;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addStudyNamesItem(String studyNamesItem) {
+		if (this.studyNames == null) {
+			this.studyNames = new ArrayList<String>();
+		}
+		this.studyNames.add(studyNamesItem);
+		return this;
+	}
+
+	/**
+	 * List of study names to filter search results
+	 *
+	 * @return studyNames
+	 **/
+
+	public List<String> getStudyNames() {
+		return studyNames;
+	}
+
+	public void setStudyNames(List<String> studyNames) {
+		this.studyNames = studyNames;
+	}
+
+	public BrAPIObservationVariableSearchRequest traitAttributePUIs(List<String> traitAttributePUIs) {
+		this.traitAttributePUIs = traitAttributePUIs;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addTraitAttributePUIsItem(String traitAttributePUIsItem) {
+		if (this.traitAttributePUIs == null) {
+			this.traitAttributePUIs = new ArrayList<String>();
+		}
+		this.traitAttributePUIs.add(traitAttributePUIsItem);
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of a Trait Attribute, usually in the form of
+	 * a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D;
+	 * \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed
+	 * feature (or characteristic) of the entity e.g., for \&quot;grain
+	 * colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
+	 *
+	 * @return traitAttributePUIs
+	 **/
+
+	public List<String> getTraitAttributePUIs() {
+		return traitAttributePUIs;
+	}
+
+	public void setTraitAttributePUIs(List<String> traitAttributePUIs) {
+		this.traitAttributePUIs = traitAttributePUIs;
+	}
+
+	public BrAPIObservationVariableSearchRequest traitAttributes(List<String> traitAttributes) {
+		this.traitAttributes = traitAttributes;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addTraitAttributesItem(String traitAttributesItem) {
+		if (this.traitAttributes == null) {
+			this.traitAttributes = new ArrayList<String>();
+		}
+		this.traitAttributes.add(traitAttributesItem);
+		return this;
+	}
+
+	/**
+	 * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot;
+	 * + \&quot;Attribute\&quot;, the attribute is the observed feature (or
+	 * characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute
+	 * &#x3D; \&quot;colour\&quot;
+	 *
+	 * @return traitAttributes
+	 **/
+
+	public List<String> getTraitAttributes() {
+		return traitAttributes;
+	}
+
+	public void setTraitAttributes(List<String> traitAttributes) {
+		this.traitAttributes = traitAttributes;
+	}
+
 	public BrAPIObservationVariableSearchRequest traitClasses(List<String> traitClasses) {
 		this.traitClasses = traitClasses;
 		return this;
@@ -338,10 +750,9 @@ public BrAPIObservationVariableSearchRequest addTraitClassesItem(String traitCla
 
 	/**
 	 * List of trait classes to filter search results
-	 * 
+	 *
 	 * @return traitClasses
 	 **/
-	
 
 	public List<String> getTraitClasses() {
 		return traitClasses;
@@ -365,11 +776,10 @@ public BrAPIObservationVariableSearchRequest addTraitDbIdsItem(String traitDbIds
 	}
 
 	/**
-	 * List of trait unique ID to filter search results
-	 * 
+	 * The unique identifier for a Trait
+	 *
 	 * @return traitDbIds
 	 **/
-	
 
 	public List<String> getTraitDbIds() {
 		return traitDbIds;
@@ -379,8 +789,178 @@ public void setTraitDbIds(List<String> traitDbIds) {
 		this.traitDbIds = traitDbIds;
 	}
 
+	public BrAPIObservationVariableSearchRequest traitEntities(List<String> traitEntities) {
+		this.traitEntities = traitEntities;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addTraitEntitiesItem(String traitEntitiesItem) {
+		if (this.traitEntities == null) {
+			this.traitEntities = new ArrayList<String>();
+		}
+		this.traitEntities.add(traitEntitiesItem);
+		return this;
+	}
+
+	/**
+	 * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot;
+	 * + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait
+	 * refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D;
+	 * \&quot;grain\&quot;
+	 *
+	 * @return traitEntities
+	 **/
+
+	public List<String> getTraitEntities() {
+		return traitEntities;
+	}
+
+	public void setTraitEntities(List<String> traitEntities) {
+		this.traitEntities = traitEntities;
+	}
+
+	public BrAPIObservationVariableSearchRequest traitEntityPUIs(List<String> traitEntityPUIs) {
+		this.traitEntityPUIs = traitEntityPUIs;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addTraitEntityPUIsItem(String traitEntityPUIsItem) {
+		if (this.traitEntityPUIs == null) {
+			this.traitEntityPUIs = new ArrayList<String>();
+		}
+		this.traitEntityPUIs.add(traitEntityPUIsItem);
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of a Trait Entity, usually in the form of a
+	 * URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D;
+	 * \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the
+	 * plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity
+	 * &#x3D; \&quot;grain\&quot;
+	 *
+	 * @return traitEntityPUIs
+	 **/
+
+	public List<String> getTraitEntityPUIs() {
+		return traitEntityPUIs;
+	}
+
+	public void setTraitEntityPUIs(List<String> traitEntityPUIs) {
+		this.traitEntityPUIs = traitEntityPUIs;
+	}
+
+	public BrAPIObservationVariableSearchRequest traitNames(List<String> traitNames) {
+		this.traitNames = traitNames;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addTraitNamesItem(String traitNamesItem) {
+		if (this.traitNames == null) {
+			this.traitNames = new ArrayList<String>();
+		}
+		this.traitNames.add(traitNamesItem);
+		return this;
+	}
+
+	/**
+	 * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait -
+	 * Name of the (plant or environmental) trait under observation
+	 *
+	 * @return traitNames
+	 **/
+
+	public List<String> getTraitNames() {
+		return traitNames;
+	}
+
+	public void setTraitNames(List<String> traitNames) {
+		this.traitNames = traitNames;
+	}
+
+	public BrAPIObservationVariableSearchRequest traitPUIs(List<String> traitPUIs) {
+		this.traitPUIs = traitPUIs;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addTraitPUIsItem(String traitPUIsItem) {
+		if (this.traitPUIs == null) {
+			this.traitPUIs = new ArrayList<String>();
+		}
+		this.traitPUIs.add(traitPUIsItem);
+		return this;
+	}
+
+	/**
+	 * The Permanent Unique Identifier of a Trait, usually in the form of a URI
+	 *
+	 * @return traitPUIs
+	 **/
+
+	public List<String> getTraitPUIs() {
+		return traitPUIs;
+	}
+
+	public void setTraitPUIs(List<String> traitPUIs) {
+		this.traitPUIs = traitPUIs;
+	}
+
+	public BrAPIObservationVariableSearchRequest trialDbIds(List<String> trialDbIds) {
+		this.trialDbIds = trialDbIds;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
+		if (this.trialDbIds == null) {
+			this.trialDbIds = new ArrayList<String>();
+		}
+		this.trialDbIds.add(trialDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a trial to search for
+	 *
+	 * @return trialDbIds
+	 **/
+
+	public List<String> getTrialDbIds() {
+		return trialDbIds;
+	}
+
+	public void setTrialDbIds(List<String> trialDbIds) {
+		this.trialDbIds = trialDbIds;
+	}
+
+	public BrAPIObservationVariableSearchRequest trialNames(List<String> trialNames) {
+		this.trialNames = trialNames;
+		return this;
+	}
+
+	public BrAPIObservationVariableSearchRequest addTrialNamesItem(String trialNamesItem) {
+		if (this.trialNames == null) {
+			this.trialNames = new ArrayList<String>();
+		}
+		this.trialNames.add(trialNamesItem);
+		return this;
+	}
+
+	/**
+	 * The human readable name of a trial to search for
+	 *
+	 * @return trialNames
+	 **/
+
+	public List<String> getTrialNames() {
+		return trialNames;
+	}
+
+	public void setTrialNames(List<String> trialNames) {
+		this.trialNames = trialNames;
+	}
+
 	@Override
-	public boolean equals(java.lang.Object o) {
+	public boolean equals(Object o) {
 		if (this == o) {
 			return true;
 		}
@@ -388,45 +968,87 @@ public boolean equals(java.lang.Object o) {
 			return false;
 		}
 		BrAPIObservationVariableSearchRequest observationVariableSearchRequest = (BrAPIObservationVariableSearchRequest) o;
-		return Objects.equals(this.externalReferenceIDs, observationVariableSearchRequest.externalReferenceIDs)
+		return Objects.equals(this.commonCropNames, observationVariableSearchRequest.commonCropNames)
+				&& Objects.equals(this.dataTypes, observationVariableSearchRequest.dataTypes)
+				&& Objects.equals(this.externalReferenceIDs, observationVariableSearchRequest.externalReferenceIDs)
+				&& Objects.equals(this.externalReferenceIds, observationVariableSearchRequest.externalReferenceIds)
 				&& Objects.equals(this.externalReferenceSources,
 						observationVariableSearchRequest.externalReferenceSources)
-				&& Objects.equals(this.dataTypes, observationVariableSearchRequest.dataTypes)
 				&& Objects.equals(this.methodDbIds, observationVariableSearchRequest.methodDbIds)
+				&& Objects.equals(this.methodNames, observationVariableSearchRequest.methodNames)
+				&& Objects.equals(this.methodPUIs, observationVariableSearchRequest.methodPUIs)
 				&& Objects.equals(this.observationVariableDbIds,
 						observationVariableSearchRequest.observationVariableDbIds)
 				&& Objects.equals(this.observationVariableNames,
 						observationVariableSearchRequest.observationVariableNames)
+				&& Objects.equals(this.observationVariablePUIs,
+						observationVariableSearchRequest.observationVariablePUIs)
 				&& Objects.equals(this.ontologyDbIds, observationVariableSearchRequest.ontologyDbIds)
+				&& Objects.equals(this.programDbIds, observationVariableSearchRequest.programDbIds)
+				&& Objects.equals(this.programNames, observationVariableSearchRequest.programNames)
 				&& Objects.equals(this.scaleDbIds, observationVariableSearchRequest.scaleDbIds)
+				&& Objects.equals(this.scaleNames, observationVariableSearchRequest.scaleNames)
+				&& Objects.equals(this.scalePUIs, observationVariableSearchRequest.scalePUIs)
 				&& Objects.equals(this.studyDbId, observationVariableSearchRequest.studyDbId)
+				&& Objects.equals(this.studyDbIds, observationVariableSearchRequest.studyDbIds)
+				&& Objects.equals(this.studyNames, observationVariableSearchRequest.studyNames)
+				&& Objects.equals(this.traitAttributePUIs, observationVariableSearchRequest.traitAttributePUIs)
+				&& Objects.equals(this.traitAttributes, observationVariableSearchRequest.traitAttributes)
 				&& Objects.equals(this.traitClasses, observationVariableSearchRequest.traitClasses)
-				&& Objects.equals(this.traitDbIds, observationVariableSearchRequest.traitDbIds) && super.equals(o);
+				&& Objects.equals(this.traitDbIds, observationVariableSearchRequest.traitDbIds)
+				&& Objects.equals(this.traitEntities, observationVariableSearchRequest.traitEntities)
+				&& Objects.equals(this.traitEntityPUIs, observationVariableSearchRequest.traitEntityPUIs)
+				&& Objects.equals(this.traitNames, observationVariableSearchRequest.traitNames)
+				&& Objects.equals(this.traitPUIs, observationVariableSearchRequest.traitPUIs)
+				&& Objects.equals(this.trialDbIds, observationVariableSearchRequest.trialDbIds)
+				&& Objects.equals(this.trialNames, observationVariableSearchRequest.trialNames);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(externalReferenceIDs, externalReferenceSources, dataTypes, methodDbIds,
-				observationVariableDbIds, observationVariableNames, ontologyDbIds, scaleDbIds, studyDbId, traitClasses,
-				traitDbIds, super.hashCode());
+		return Objects.hash(commonCropNames, dataTypes, externalReferenceIDs, externalReferenceIds,
+				externalReferenceSources, methodDbIds, methodNames, methodPUIs, observationVariableDbIds,
+				observationVariableNames, observationVariablePUIs, ontologyDbIds, programDbIds, programNames,
+				scaleDbIds, scaleNames, scalePUIs, studyDbId, studyDbIds, studyNames, traitAttributePUIs,
+				traitAttributes, traitClasses, traitDbIds, traitEntities, traitEntityPUIs, traitNames, traitPUIs,
+				trialDbIds, trialNames);
 	}
 
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
-		sb.append("class ObservationVariableSearchRequest {\n");
-		sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+		sb.append("class BrAPIObservationVariableSearchRequest {\n");
+
+		sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
+		sb.append("    dataTypes: ").append(toIndentedString(dataTypes)).append("\n");
 		sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
+		sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
 		sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-		sb.append("    dataTypes: ").append(toIndentedString(dataTypes)).append("\n");
 		sb.append("    methodDbIds: ").append(toIndentedString(methodDbIds)).append("\n");
+		sb.append("    methodNames: ").append(toIndentedString(methodNames)).append("\n");
+		sb.append("    methodPUIs: ").append(toIndentedString(methodPUIs)).append("\n");
 		sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
 		sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
+		sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
 		sb.append("    ontologyDbIds: ").append(toIndentedString(ontologyDbIds)).append("\n");
+		sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
+		sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
 		sb.append("    scaleDbIds: ").append(toIndentedString(scaleDbIds)).append("\n");
+		sb.append("    scaleNames: ").append(toIndentedString(scaleNames)).append("\n");
+		sb.append("    scalePUIs: ").append(toIndentedString(scalePUIs)).append("\n");
 		sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
+		sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
+		sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
+		sb.append("    traitAttributePUIs: ").append(toIndentedString(traitAttributePUIs)).append("\n");
+		sb.append("    traitAttributes: ").append(toIndentedString(traitAttributes)).append("\n");
 		sb.append("    traitClasses: ").append(toIndentedString(traitClasses)).append("\n");
 		sb.append("    traitDbIds: ").append(toIndentedString(traitDbIds)).append("\n");
+		sb.append("    traitEntities: ").append(toIndentedString(traitEntities)).append("\n");
+		sb.append("    traitEntityPUIs: ").append(toIndentedString(traitEntityPUIs)).append("\n");
+		sb.append("    traitNames: ").append(toIndentedString(traitNames)).append("\n");
+		sb.append("    traitPUIs: ").append(toIndentedString(traitPUIs)).append("\n");
+		sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
+		sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
 		sb.append("}");
 		return sb.toString();
 	}
@@ -435,10 +1057,11 @@ public String toString() {
 	 * Convert the given object to string with each line indented by 4 spaces
 	 * (except the first line).
 	 */
-	private String toIndentedString(java.lang.Object o) {
+	private String toIndentedString(Object o) {
 		if (o == null) {
 			return "null";
 		}
 		return o.toString().replace("\n", "\n    ");
 	}
+
 }

From 19603936e92aa54b6f9cf4989f9b249594b57970 Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Wed, 16 Aug 2023 17:54:51 -0400
Subject: [PATCH 06/28] unit tests pass

---
 .../germplasm/GermplasmAttributesApiTest.java | 303 ++++++++++--------
 .../v2/modules/phenotype/ScalesAPITests.java  |   4 +-
 .../modules/phenotype/VariablesAPITests.java  |   1 -
 3 files changed, 166 insertions(+), 142 deletions(-)

diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/GermplasmAttributesApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/GermplasmAttributesApiTest.java
index 26e54278..e41aed95 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/GermplasmAttributesApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/GermplasmAttributesApiTest.java
@@ -14,6 +14,7 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.brapi.client.v2.ApiResponse;
+import org.brapi.client.v2.BrAPIClientTest;
 import org.brapi.client.v2.model.exceptions.ApiException;
 import org.brapi.client.v2.model.queryParams.germplasm.GermplasmAttributeQueryParams;
 import org.brapi.v2.model.BrAPIAcceptedSearchResponse;
@@ -24,152 +25,176 @@
 import org.brapi.v2.model.germ.response.BrAPIGermplasmAttributeSingleResponse;
 import org.brapi.v2.model.pheno.response.BrAPIObservationUnitListResponse;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
 /**
  * API tests for GermplasmAttributesApi
  */
-public class GermplasmAttributesApiTest {
-
-    private final GermplasmAttributesApi api = new GermplasmAttributesApi();
-
-    /**
-     * Get the details for a specific Germplasm Attribute
-     *
-     * Get the details for a specific Germplasm Attribute
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void attributesAttributeDbIdGetTest() throws ApiException {
-        String attributeDbId = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPIGermplasmAttributeSingleResponse> response = api.attributesAttributeDbIdGet(attributeDbId);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Update an existing Germplasm Attribute
-     *
-     * Update an existing Germplasm Attribute
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void attributesAttributeDbIdPutTest() throws ApiException {
-        String attributeDbId = null;
-        BrAPIGermplasmAttribute body = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPIGermplasmAttributeSingleResponse> response = api.attributesAttributeDbIdPut(attributeDbId, body);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Get the Categories of Germplasm Attributes
-     *
-     * List all available attribute categories.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void attributesCategoriesGetTest() throws ApiException {
-        Integer page = null;
-        Integer pageSize = null;
-        
-        ApiResponse<BrAPIGermplasmAttributeCategoryListResponse> response = api.attributesCategoriesGet(page, pageSize);
-
-        // TODO: test validations
-    }
-    /**
-     * Get the Germplasm Attributes
-     *
-     * List available attributes.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void attributesGetTest() throws ApiException {
-        String attributeCategory = null;
-        String attributeDbId = null;
-        String attributeName = null;
-        String germplasmDbId = null;
-        String externalReferenceID = null;
-        String externalReferenceSource = null;
-        Integer page = null;
-        Integer pageSize = null;
-        
-        GermplasmAttributeQueryParams queryParams = new GermplasmAttributeQueryParams();
-        ApiResponse<BrAPIGermplasmAttributeListResponse> response = api.attributesGet(queryParams);
-
-        // TODO: test validations
-    }
-    /**
-     * Create new Germplasm Attributes
-     *
-     * Create new Germplasm Attributes
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void attributesPostTest() throws ApiException {
-        List<BrAPIGermplasmAttribute> body = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPIGermplasmAttributeListResponse> response = api.attributesPost(body);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Submit a search request for Germplasm Attributes
-     *
-     * Search for a set of Germplasm Attributes based on some criteria          See Search Services for additional implementation details.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void searchAttributesPostTest() throws ApiException {
-        BrAPIGermplasmAttributeSearchRequest body = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-            ApiResponse<Pair<Optional<BrAPIGermplasmAttributeListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api.searchAttributesPost(body);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Get the results of a Germplasm Attributes search request
-     *
-     * Get the results of a Germplasm Attributes search request  See Search Services for additional implementation details.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void searchAttributesSearchResultsDbIdGetTest() throws ApiException {
-        String searchResultsDbId = null;
-        Integer page = null;
-        Integer pageSize = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-            ApiResponse<Pair<Optional<BrAPIGermplasmAttributeListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response =
-                    api.searchAttributesSearchResultsDbIdGet(searchResultsDbId, page, pageSize);
-		});
-
-        // TODO: test validations
-    }
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class GermplasmAttributesApiTest extends BrAPIClientTest {
+
+	private final GermplasmAttributesApi api = new GermplasmAttributesApi(this.apiClient);
+
+	/**
+	 * Get the details for a specific Germplasm Attribute
+	 *
+	 * Get the details for a specific Germplasm Attribute
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void attributesAttributeDbIdGetTest() throws ApiException {
+		String attributeDbId = "attribute1";
+
+		ApiResponse<BrAPIGermplasmAttributeSingleResponse> response = api.attributesAttributeDbIdGet(attributeDbId);
+
+		assertEquals(attributeDbId, response.getBody().getResult().getAttributeDbId());
+	}
+
+	/**
+	 * Update an existing Germplasm Attribute
+	 *
+	 * Update an existing Germplasm Attribute
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void attributesAttributeDbIdPutTest() throws ApiException {
+		String attributeDbId = "attribute1";
+		BrAPIGermplasmAttribute body = new BrAPIGermplasmAttribute().attributeName("New Name");
+
+		ApiResponse<BrAPIGermplasmAttributeSingleResponse> response = api.attributesAttributeDbIdPut(attributeDbId,
+				body);
+
+		assertEquals(attributeDbId, response.getBody().getResult().getAttributeDbId());
+		assertEquals("New Name", response.getBody().getResult().getAttributeName());
+	}
+
+	/**
+	 * Get the Categories of Germplasm Attributes
+	 *
+	 * List all available attribute categories.
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void attributesCategoriesGetTest() throws ApiException {
+		Integer page = null;
+		Integer pageSize = null;
+
+		ApiResponse<BrAPIGermplasmAttributeCategoryListResponse> response = api.attributesCategoriesGet(page, pageSize);
+
+		assertFalse(response.getBody().getResult().getData().isEmpty());
+	}
+
+	/**
+	 * Get the Germplasm Attributes
+	 *
+	 * List available attributes.
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void attributesGetTest() throws ApiException {
+		String attributeCategory = null;
+		String attributeDbId = "attribute1";
+		String attributeName = null;
+		String germplasmDbId = null;
+		String externalReferenceID = null;
+		String externalReferenceSource = null;
+		Integer page = null;
+		Integer pageSize = null;
+
+		GermplasmAttributeQueryParams queryParams = new GermplasmAttributeQueryParams().attributeDbId(attributeDbId);
+		ApiResponse<BrAPIGermplasmAttributeListResponse> response = api.attributesGet(queryParams);
+
+		assertEquals(attributeDbId, response.getBody().getResult().getData().get(0).getAttributeDbId());
+	}
+
+	/**
+	 * Create new Germplasm Attributes
+	 *
+	 * Create new Germplasm Attributes
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void attributesPostTest() throws ApiException {
+		BrAPIGermplasmAttribute attr = new BrAPIGermplasmAttribute().attributeName("New Attribute");
+		List<BrAPIGermplasmAttribute> body = Arrays.asList(attr);
+
+		ApiResponse<BrAPIGermplasmAttributeListResponse> response = api.attributesPost(body);
+
+		assertEquals(attr.getAttributeName(), response.getBody().getResult().getData().get(0).getAttributeName());
+	}
+
+	/**
+	 * Submit a search request for Germplasm Attributes
+	 *
+	 * Search for a set of Germplasm Attributes based on some criteria See Search
+	 * Services for additional implementation details.
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void searchAttributesPostTest() throws ApiException {
+		BrAPIGermplasmAttributeSearchRequest body = new BrAPIGermplasmAttributeSearchRequest()
+				.addAttributeDbIdsItem("attribute1")
+				.addAttributeDbIdsItem("attribute2");
+
+		ApiResponse<Pair<Optional<BrAPIGermplasmAttributeListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api
+				.searchAttributesPost(body);
+		
+        Optional<BrAPIGermplasmAttributeListResponse> listResponse = response.getBody().getLeft();
+        Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+        // only results are returned
+        assertTrue(listResponse.isPresent());
+        assertFalse(searchIdResponse.isPresent());
+
+        assertEquals(2, listResponse.get().getResult().getData().size(), "unexpected number of pedigree nodes returned");
+	}
+
+	/**
+	 * Get the results of a Germplasm Attributes search request
+	 *
+	 * Get the results of a Germplasm Attributes search request See Search Services
+	 * for additional implementation details.
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void searchAttributesSearchResultsDbIdGetTest() throws ApiException {
+		BrAPIGermplasmAttributeSearchRequest baseRequest = new BrAPIGermplasmAttributeSearchRequest()
+				.addAttributeDbIdsItem("attribute1")
+				.addAttributeDbIdsItem("attribute1")
+				.addAttributeDbIdsItem("attribute1")
+				.addAttributeDbIdsItem("attribute1")
+				.addAttributeDbIdsItem("attribute2");
+
+        ApiResponse<Pair<Optional<BrAPIGermplasmAttributeListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = this.api.searchAttributesPost(baseRequest);
+        Optional<BrAPIGermplasmAttributeListResponse> listResponse = response.getBody().getLeft();
+        Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+        // only search ID is returned
+        assertFalse(listResponse.isPresent());
+        assertTrue(searchIdResponse.isPresent());
+
+        // Get results from search ID
+    	ApiResponse<Pair<Optional<BrAPIGermplasmAttributeListResponse>, Optional<BrAPIAcceptedSearchResponse>>> searchResponse = this.api.searchAttributesSearchResultsDbIdGet(searchIdResponse.get().getResult().getSearchResultsDbId(), 0, 10);
+        Optional<BrAPIGermplasmAttributeListResponse> listResponse2 = searchResponse.getBody().getLeft();
+        Optional<BrAPIAcceptedSearchResponse> searchIdResponse2 = searchResponse.getBody().getRight();
+        // only results are returned
+        assertTrue(listResponse2.isPresent());
+        assertFalse(searchIdResponse2.isPresent());
+
+        assertEquals(2, listResponse2.get().getResult().getData().size(), "unexpected number of pedigree nodes returned");
+	}
 }
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ScalesAPITests.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ScalesAPITests.java
index a1137569..f470773a 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ScalesAPITests.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ScalesAPITests.java
@@ -112,7 +112,7 @@ public void scalesPostSuccess() throws Exception {
 		List<BrAPIScaleValidValuesCategories> categories = Arrays.asList(low, high);
 
 		BrAPITraitDataType dataType = BrAPITraitDataType.TEXT;
-		BrAPIScaleValidValues validValues = new BrAPIScaleValidValues().min(0).max(5).categories(categories);
+		BrAPIScaleValidValues validValues = new BrAPIScaleValidValues().min(0).minimumValue("0").max(5).maximumValue("5").categories(categories);
 
 		JsonObject additionalInfo = new JsonObject();
 		additionalInfo.addProperty("test", "test");
@@ -242,7 +242,7 @@ void getScaleByIdInvalid() throws Exception {
 	public void updateScaleSuccess() throws Exception {
 		ApiResponse<BrAPIScaleListResponse> existingList = scalesAPI.scalesGet(new ScaleQueryParams());
 		BrAPIScale existingScale = existingList.getBody().getResult().getData().get(0);
-		existingScale.scaleName("updated_name").validValues(new BrAPIScaleValidValues().min(0).max(100).categories(Collections.emptyList()));
+		existingScale.scaleName("updated_name").validValues(new BrAPIScaleValidValues().min(0).minimumValue("0").max(100).maximumValue("100").categories(Collections.emptyList()));
 
 		// Check that it is a success and all data matches
 		ApiResponse<BrAPIScaleSingleResponse> updatedScaleResult = this.scalesAPI.scalesScaleDbIdPut(existingScale.getScaleDbId(), existingScale);
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/VariablesAPITests.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/VariablesAPITests.java
index 3b3edefe..22b52201 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/VariablesAPITests.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/VariablesAPITests.java
@@ -330,7 +330,6 @@ public void updateVariableNull() {
 	public void createVariableWithComplexAdditionalInfoSuccess() throws Exception {
 
 		BrAPIObservationVariable brApiVariable = buildTestVariable();
-		brApiVariable.putAdditionalInfoItem("testObject", brApiVariable);
 		brApiVariable.putAdditionalInfoItem("testBool", true);
 		brApiVariable.putAdditionalInfoItem("testString", "test");
 		brApiVariable.putAdditionalInfoItem("testInt", 1);

From 49fe7ca6f56a6dbdfbd7c4558d90480ed0881fad Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Thu, 17 Aug 2023 13:22:18 -0400
Subject: [PATCH 07/28] fixes issues #75, #76, #77, #78, #139, #140. Dependant
 on #199

---
 .../GermplasmAttributeValueQueryParams.java   |   31 +-
 ...IGermplasmAttributeValueSearchRequest.java | 1031 +++++++++--------
 2 files changed, 580 insertions(+), 482 deletions(-)

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java
index e28d0b7c..57e57f7f 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java
@@ -26,30 +26,33 @@
 
 import org.brapi.client.v2.model.queryParams.core.BrAPIQueryParams;
 
-
 @Getter
 @Setter
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(fluent=true)
+@Accessors(fluent = true)
 public class GermplasmAttributeValueQueryParams extends BrAPIQueryParams {
 
-    private String attributeValueDbId;
-    private String attributeDbId;
-    private String attributeName;
-    private String germplasmDbId;
-    private String externalReferenceSource;
-    private String externalReferenceId;
-    @Deprecated
-    private String externalReferenceID;
-    
-    public String getExternalReferenceId() {
+	private String attributeValueDbId;
+	private String attributeDbId;
+	private String attributeName;
+	private String germplasmDbId;
+	private String externalReferenceSource;
+	private String externalReferenceId;
+	@Deprecated
+	private String externalReferenceID;
+	private String programDbId;
+	private String commonCropName;
+
+	public String getExternalReferenceId() {
 		return externalReferenceId;
 	}
-    public String externalReferenceId() {
+
+	public String externalReferenceId() {
 		return externalReferenceId;
 	}
+
 	public void setExternalReferenceId(String externalReferenceId) {
 		this.externalReferenceId = externalReferenceId;
 	}
@@ -58,10 +61,12 @@ public void setExternalReferenceId(String externalReferenceId) {
 	public String getExternalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public String externalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIGermplasmAttributeValueSearchRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIGermplasmAttributeValueSearchRequest.java
index bdcea5e3..008c086a 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIGermplasmAttributeValueSearchRequest.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIGermplasmAttributeValueSearchRequest.java
@@ -6,8 +6,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-
 import org.brapi.v2.model.BrAPISearchRequestParametersPaging;
 import org.brapi.v2.model.pheno.BrAPITraitDataType;
 
@@ -15,472 +13,567 @@
  * GermplasmAttributeValueSearchRequest
  */
 
+public class BrAPIGermplasmAttributeValueSearchRequest extends BrAPISearchRequestParametersPaging {
+	@JsonProperty("attributeDbIds")
+	private List<String> attributeDbIds = null;
+
+	@JsonProperty("attributeNames")
+	private List<String> attributeNames = null;
+
+	@JsonProperty("attributeValueDbIds")
+	private List<String> attributeValueDbIds = null;
+
+	@JsonProperty("commonCropNames")
+	private List<String> commonCropNames = null;
+
+	@JsonProperty("dataTypes")
+	private List<BrAPITraitDataType> dataTypes = null;
+
+	@JsonProperty("externalReferenceIds")
+	private List<String> externalReferenceIds = null;
+
+	@Deprecated
+	@JsonProperty("externalReferenceIDs")
+	private List<String> externalReferenceIDs = null;
+
+	@JsonProperty("externalReferenceSources")
+	private List<String> externalReferenceSources = null;
+
+	@JsonProperty("germplasmDbIds")
+	private List<String> germplasmDbIds = null;
 
-public class BrAPIGermplasmAttributeValueSearchRequest extends BrAPISearchRequestParametersPaging  {
-  @JsonProperty("germplasmDbIds")
-  @Valid
-  private List<String> germplasmDbIds = null;
-
-  @JsonProperty("germplasmNames")
-  @Valid
-  private List<String> germplasmNames = null;
-
-  @JsonProperty("externalReferenceIDs")
-  @Valid
-  private List<String> externalReferenceIDs = null;
-
-  @JsonProperty("externalReferenceSources")
-  @Valid
-  private List<String> externalReferenceSources = null;
-
-  @JsonProperty("attributeDbIds")
-  @Valid
-  private List<String> attributeDbIds = null;
-
-  @JsonProperty("attributeNames")
-  @Valid
-  private List<String> attributeNames = null;
-
-  @JsonProperty("attributeValueDbIds")
-  @Valid
-  private List<String> attributeValueDbIds = null;
-
-  @JsonProperty("dataTypes")
-  @Valid
-  private List<BrAPITraitDataType> dataTypes = null;
-
-  @JsonProperty("methodDbIds")
-  @Valid
-  private List<String> methodDbIds = null;
-
-  @JsonProperty("ontologyDbIds")
-  @Valid
-  private List<String> ontologyDbIds = null;
-
-  @JsonProperty("scaleDbIds")
-  @Valid
-  private List<String> scaleDbIds = null;
-
-  @JsonProperty("traitClasses")
-  @Valid
-  private List<String> traitClasses = null;
-
-  @JsonProperty("traitDbIds")
-  @Valid
-  private List<String> traitDbIds = null;
-
-  public BrAPIGermplasmAttributeValueSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-    this.germplasmDbIds = germplasmDbIds;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-    if (this.germplasmDbIds == null) {
-      this.germplasmDbIds = new ArrayList<String>();
-    }
-    this.germplasmDbIds.add(germplasmDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of IDs which uniquely identify germplasm to search for
-   * @return germplasmDbIds
-  **/
-  
-  
-    public List<String> getGermplasmDbIds() {
-    return germplasmDbIds;
-  }
-
-  public void setGermplasmDbIds(List<String> germplasmDbIds) {
-    this.germplasmDbIds = germplasmDbIds;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest germplasmNames(List<String> germplasmNames) {
-    this.germplasmNames = germplasmNames;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-    if (this.germplasmNames == null) {
-      this.germplasmNames = new ArrayList<String>();
-    }
-    this.germplasmNames.add(germplasmNamesItem);
-    return this;
-  }
-
-  /**
-   * List of human readable names to identify germplasm to search for
-   * @return germplasmNames
-  **/
-  
-  
-    public List<String> getGermplasmNames() {
-    return germplasmNames;
-  }
-
-  public void setGermplasmNames(List<String> germplasmNames) {
-    this.germplasmNames = germplasmNames;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-    if (this.externalReferenceIDs == null) {
-      this.externalReferenceIDs = new ArrayList<String>();
-    }
-    this.externalReferenceIDs.add(externalReferenceIDsItem);
-    return this;
-  }
-
-  /**
-   * List of external references for the trait to search for
-   * @return externalReferenceIDs
-  **/
-  
-  
-    public List<String> getExternalReferenceIDs() {
-    return externalReferenceIDs;
-  }
-
-  public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-    if (this.externalReferenceSources == null) {
-      this.externalReferenceSources = new ArrayList<String>();
-    }
-    this.externalReferenceSources.add(externalReferenceSourcesItem);
-    return this;
-  }
-
-  /**
-   * List of external references sources for the trait to search for
-   * @return externalReferenceSources
-  **/
-  
-  
-    public List<String> getExternalReferenceSources() {
-    return externalReferenceSources;
-  }
-
-  public void setExternalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest attributeDbIds(List<String> attributeDbIds) {
-    this.attributeDbIds = attributeDbIds;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest addAttributeDbIdsItem(String attributeDbIdsItem) {
-    if (this.attributeDbIds == null) {
-      this.attributeDbIds = new ArrayList<String>();
-    }
-    this.attributeDbIds.add(attributeDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of Germplasm Attribute IDs to search for
-   * @return attributeDbIds
-  **/
-  
-  
-    public List<String> getAttributeDbIds() {
-    return attributeDbIds;
-  }
-
-  public void setAttributeDbIds(List<String> attributeDbIds) {
-    this.attributeDbIds = attributeDbIds;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest attributeNames(List<String> attributeNames) {
-    this.attributeNames = attributeNames;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest addAttributeNamesItem(String attributeNamesItem) {
-    if (this.attributeNames == null) {
-      this.attributeNames = new ArrayList<String>();
-    }
-    this.attributeNames.add(attributeNamesItem);
-    return this;
-  }
-
-  /**
-   * List of human readable Germplasm Attribute names to search for
-   * @return attributeNames
-  **/
-  
-  
-    public List<String> getAttributeNames() {
-    return attributeNames;
-  }
-
-  public void setAttributeNames(List<String> attributeNames) {
-    this.attributeNames = attributeNames;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest attributeValueDbIds(List<String> attributeValueDbIds) {
-    this.attributeValueDbIds = attributeValueDbIds;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest addAttributeValueDbIdsItem(String attributeValueDbIdsItem) {
-    if (this.attributeValueDbIds == null) {
-      this.attributeValueDbIds = new ArrayList<String>();
-    }
-    this.attributeValueDbIds.add(attributeValueDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of Germplasm Attribute Value IDs to search for
-   * @return attributeValueDbIds
-  **/
-  
-  
-    public List<String> getAttributeValueDbIds() {
-    return attributeValueDbIds;
-  }
-
-  public void setAttributeValueDbIds(List<String> attributeValueDbIds) {
-    this.attributeValueDbIds = attributeValueDbIds;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest dataTypes(List<BrAPITraitDataType> dataTypes) {
-    this.dataTypes = dataTypes;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest addDataTypesItem(BrAPITraitDataType dataTypesItem) {
-    if (this.dataTypes == null) {
-      this.dataTypes = new ArrayList<BrAPITraitDataType>();
-    }
-    this.dataTypes.add(dataTypesItem);
-    return this;
-  }
-
-  /**
-   * List of scale data types to filter search results
-   * @return dataTypes
-  **/
-  
-      @Valid
-    public List<BrAPITraitDataType> getDataTypes() {
-    return dataTypes;
-  }
-
-  public void setDataTypes(List<BrAPITraitDataType> dataTypes) {
-    this.dataTypes = dataTypes;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest methodDbIds(List<String> methodDbIds) {
-    this.methodDbIds = methodDbIds;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest addMethodDbIdsItem(String methodDbIdsItem) {
-    if (this.methodDbIds == null) {
-      this.methodDbIds = new ArrayList<String>();
-    }
-    this.methodDbIds.add(methodDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of methods to filter search results
-   * @return methodDbIds
-  **/
-  
-  
-    public List<String> getMethodDbIds() {
-    return methodDbIds;
-  }
-
-  public void setMethodDbIds(List<String> methodDbIds) {
-    this.methodDbIds = methodDbIds;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest ontologyDbIds(List<String> ontologyDbIds) {
-    this.ontologyDbIds = ontologyDbIds;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest addOntologyDbIdsItem(String ontologyDbIdsItem) {
-    if (this.ontologyDbIds == null) {
-      this.ontologyDbIds = new ArrayList<String>();
-    }
-    this.ontologyDbIds.add(ontologyDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of ontology IDs to search for
-   * @return ontologyDbIds
-  **/
-  
-  
-    public List<String> getOntologyDbIds() {
-    return ontologyDbIds;
-  }
-
-  public void setOntologyDbIds(List<String> ontologyDbIds) {
-    this.ontologyDbIds = ontologyDbIds;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest scaleDbIds(List<String> scaleDbIds) {
-    this.scaleDbIds = scaleDbIds;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest addScaleDbIdsItem(String scaleDbIdsItem) {
-    if (this.scaleDbIds == null) {
-      this.scaleDbIds = new ArrayList<String>();
-    }
-    this.scaleDbIds.add(scaleDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of scales to filter search results
-   * @return scaleDbIds
-  **/
-  
-  
-    public List<String> getScaleDbIds() {
-    return scaleDbIds;
-  }
-
-  public void setScaleDbIds(List<String> scaleDbIds) {
-    this.scaleDbIds = scaleDbIds;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest traitClasses(List<String> traitClasses) {
-    this.traitClasses = traitClasses;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest addTraitClassesItem(String traitClassesItem) {
-    if (this.traitClasses == null) {
-      this.traitClasses = new ArrayList<String>();
-    }
-    this.traitClasses.add(traitClassesItem);
-    return this;
-  }
-
-  /**
-   * List of trait classes to filter search results
-   * @return traitClasses
-  **/
-  
-  
-    public List<String> getTraitClasses() {
-    return traitClasses;
-  }
-
-  public void setTraitClasses(List<String> traitClasses) {
-    this.traitClasses = traitClasses;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest traitDbIds(List<String> traitDbIds) {
-    this.traitDbIds = traitDbIds;
-    return this;
-  }
-
-  public BrAPIGermplasmAttributeValueSearchRequest addTraitDbIdsItem(String traitDbIdsItem) {
-    if (this.traitDbIds == null) {
-      this.traitDbIds = new ArrayList<String>();
-    }
-    this.traitDbIds.add(traitDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of trait unique ID to filter search results
-   * @return traitDbIds
-  **/
-  
-  
-    public List<String> getTraitDbIds() {
-    return traitDbIds;
-  }
-
-  public void setTraitDbIds(List<String> traitDbIds) {
-    this.traitDbIds = traitDbIds;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIGermplasmAttributeValueSearchRequest germplasmAttributeValueSearchRequest = (BrAPIGermplasmAttributeValueSearchRequest) o;
-    return Objects.equals(this.germplasmDbIds, germplasmAttributeValueSearchRequest.germplasmDbIds) &&
-        Objects.equals(this.germplasmNames, germplasmAttributeValueSearchRequest.germplasmNames) &&
-        Objects.equals(this.externalReferenceIDs, germplasmAttributeValueSearchRequest.externalReferenceIDs) &&
-        Objects.equals(this.externalReferenceSources, germplasmAttributeValueSearchRequest.externalReferenceSources) &&
-        Objects.equals(this.attributeDbIds, germplasmAttributeValueSearchRequest.attributeDbIds) &&
-        Objects.equals(this.attributeNames, germplasmAttributeValueSearchRequest.attributeNames) &&
-        Objects.equals(this.attributeValueDbIds, germplasmAttributeValueSearchRequest.attributeValueDbIds) &&
-        Objects.equals(this.dataTypes, germplasmAttributeValueSearchRequest.dataTypes) &&
-        Objects.equals(this.methodDbIds, germplasmAttributeValueSearchRequest.methodDbIds) &&
-        Objects.equals(this.ontologyDbIds, germplasmAttributeValueSearchRequest.ontologyDbIds) &&
-        Objects.equals(this.scaleDbIds, germplasmAttributeValueSearchRequest.scaleDbIds) &&
-        Objects.equals(this.traitClasses, germplasmAttributeValueSearchRequest.traitClasses) &&
-        Objects.equals(this.traitDbIds, germplasmAttributeValueSearchRequest.traitDbIds) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(germplasmDbIds, germplasmNames, externalReferenceIDs, externalReferenceSources, attributeDbIds, attributeNames, attributeValueDbIds, dataTypes, methodDbIds, ontologyDbIds, scaleDbIds, traitClasses, traitDbIds, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class GermplasmAttributeValueSearchRequest {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-    sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-    sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-    sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-    sb.append("    attributeDbIds: ").append(toIndentedString(attributeDbIds)).append("\n");
-    sb.append("    attributeNames: ").append(toIndentedString(attributeNames)).append("\n");
-    sb.append("    attributeValueDbIds: ").append(toIndentedString(attributeValueDbIds)).append("\n");
-    sb.append("    dataTypes: ").append(toIndentedString(dataTypes)).append("\n");
-    sb.append("    methodDbIds: ").append(toIndentedString(methodDbIds)).append("\n");
-    sb.append("    ontologyDbIds: ").append(toIndentedString(ontologyDbIds)).append("\n");
-    sb.append("    scaleDbIds: ").append(toIndentedString(scaleDbIds)).append("\n");
-    sb.append("    traitClasses: ").append(toIndentedString(traitClasses)).append("\n");
-    sb.append("    traitDbIds: ").append(toIndentedString(traitDbIds)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+	@JsonProperty("germplasmNames")
+	private List<String> germplasmNames = null;
+
+	@JsonProperty("methodDbIds")
+	private List<String> methodDbIds = null;
+
+	@JsonProperty("ontologyDbIds")
+	private List<String> ontologyDbIds = null;
+
+	@JsonProperty("programDbIds")
+	private List<String> programDbIds = null;
+
+	@JsonProperty("programNames")
+	private List<String> programNames = null;
+
+	@JsonProperty("scaleDbIds")
+	private List<String> scaleDbIds = null;
+
+	@JsonProperty("traitClasses")
+	private List<String> traitClasses = null;
+
+	@JsonProperty("traitDbIds")
+	private List<String> traitDbIds = null;
+
+	public BrAPIGermplasmAttributeValueSearchRequest commonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
+		if (this.commonCropNames == null) {
+			this.commonCropNames = new ArrayList<String>();
+		}
+		this.commonCropNames.add(commonCropNamesItem);
+		return this;
+	}
+
+	public List<String> getCommonCropNames() {
+		return commonCropNames;
+	}
+
+	public void setCommonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest programDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
+		if (this.programDbIds == null) {
+			this.programDbIds = new ArrayList<String>();
+		}
+		this.programDbIds.add(programDbIdsItem);
+		return this;
+	}
+
+	public List<String> getProgramDbIds() {
+		return programDbIds;
+	}
+
+	public void setProgramDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest programNames(List<String> programNames) {
+		this.programNames = programNames;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest addProgramNamesItem(String programNamesItem) {
+		if (this.programNames == null) {
+			this.programNames = new ArrayList<String>();
+		}
+		this.programNames.add(programNamesItem);
+		return this;
+	}
+
+	public List<String> getProgramNames() {
+		return programNames;
+	}
+
+	public void setProgramNames(List<String> programNames) {
+		this.programNames = programNames;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
+		this.germplasmDbIds = germplasmDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
+		if (this.germplasmDbIds == null) {
+			this.germplasmDbIds = new ArrayList<String>();
+		}
+		this.germplasmDbIds.add(germplasmDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of IDs which uniquely identify germplasm to search for
+	 * 
+	 * @return germplasmDbIds
+	 **/
+
+	public List<String> getGermplasmDbIds() {
+		return germplasmDbIds;
+	}
+
+	public void setGermplasmDbIds(List<String> germplasmDbIds) {
+		this.germplasmDbIds = germplasmDbIds;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest germplasmNames(List<String> germplasmNames) {
+		this.germplasmNames = germplasmNames;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
+		if (this.germplasmNames == null) {
+			this.germplasmNames = new ArrayList<String>();
+		}
+		this.germplasmNames.add(germplasmNamesItem);
+		return this;
+	}
+
+	/**
+	 * List of human readable names to identify germplasm to search for
+	 * 
+	 * @return germplasmNames
+	 **/
+
+	public List<String> getGermplasmNames() {
+		return germplasmNames;
+	}
+
+	public void setGermplasmNames(List<String> germplasmNames) {
+		this.germplasmNames = germplasmNames;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
+		if (this.externalReferenceIds == null) {
+			this.externalReferenceIds = new ArrayList<String>();
+		}
+		this.externalReferenceIds.add(externalReferenceIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of external references for the trait to search for
+	 * 
+	 * @return externalReferenceIDs
+	 **/
+
+	public List<String> getExternalReferenceIds() {
+		return externalReferenceIds;
+	}
+
+	public void setExternalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+	}
+
+	@Deprecated
+	public BrAPIGermplasmAttributeValueSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+		return this;
+	}
+
+	@Deprecated
+	public BrAPIGermplasmAttributeValueSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
+		if (this.externalReferenceIDs == null) {
+			this.externalReferenceIDs = new ArrayList<String>();
+		}
+		this.externalReferenceIDs.add(externalReferenceIDsItem);
+		return this;
+	}
+
+	/**
+	 * List of external references for the trait to search for
+	 * 
+	 * @return externalReferenceIDs
+	 **/
+
+	@Deprecated
+	public List<String> getExternalReferenceIDs() {
+		return externalReferenceIDs;
+	}
+
+	@Deprecated
+	public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest addExternalReferenceSourcesItem(
+			String externalReferenceSourcesItem) {
+		if (this.externalReferenceSources == null) {
+			this.externalReferenceSources = new ArrayList<String>();
+		}
+		this.externalReferenceSources.add(externalReferenceSourcesItem);
+		return this;
+	}
+
+	/**
+	 * List of external references sources for the trait to search for
+	 * 
+	 * @return externalReferenceSources
+	 **/
+
+	public List<String> getExternalReferenceSources() {
+		return externalReferenceSources;
+	}
+
+	public void setExternalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest attributeDbIds(List<String> attributeDbIds) {
+		this.attributeDbIds = attributeDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest addAttributeDbIdsItem(String attributeDbIdsItem) {
+		if (this.attributeDbIds == null) {
+			this.attributeDbIds = new ArrayList<String>();
+		}
+		this.attributeDbIds.add(attributeDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of Germplasm Attribute IDs to search for
+	 * 
+	 * @return attributeDbIds
+	 **/
+
+	public List<String> getAttributeDbIds() {
+		return attributeDbIds;
+	}
+
+	public void setAttributeDbIds(List<String> attributeDbIds) {
+		this.attributeDbIds = attributeDbIds;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest attributeNames(List<String> attributeNames) {
+		this.attributeNames = attributeNames;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest addAttributeNamesItem(String attributeNamesItem) {
+		if (this.attributeNames == null) {
+			this.attributeNames = new ArrayList<String>();
+		}
+		this.attributeNames.add(attributeNamesItem);
+		return this;
+	}
+
+	/**
+	 * List of human readable Germplasm Attribute names to search for
+	 * 
+	 * @return attributeNames
+	 **/
+
+	public List<String> getAttributeNames() {
+		return attributeNames;
+	}
+
+	public void setAttributeNames(List<String> attributeNames) {
+		this.attributeNames = attributeNames;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest attributeValueDbIds(List<String> attributeValueDbIds) {
+		this.attributeValueDbIds = attributeValueDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest addAttributeValueDbIdsItem(String attributeValueDbIdsItem) {
+		if (this.attributeValueDbIds == null) {
+			this.attributeValueDbIds = new ArrayList<String>();
+		}
+		this.attributeValueDbIds.add(attributeValueDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of Germplasm Attribute Value IDs to search for
+	 * 
+	 * @return attributeValueDbIds
+	 **/
+
+	public List<String> getAttributeValueDbIds() {
+		return attributeValueDbIds;
+	}
+
+	public void setAttributeValueDbIds(List<String> attributeValueDbIds) {
+		this.attributeValueDbIds = attributeValueDbIds;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest dataTypes(List<BrAPITraitDataType> dataTypes) {
+		this.dataTypes = dataTypes;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest addDataTypesItem(BrAPITraitDataType dataTypesItem) {
+		if (this.dataTypes == null) {
+			this.dataTypes = new ArrayList<BrAPITraitDataType>();
+		}
+		this.dataTypes.add(dataTypesItem);
+		return this;
+	}
+
+	/**
+	 * List of scale data types to filter search results
+	 * 
+	 * @return dataTypes
+	 **/
+
+	public List<BrAPITraitDataType> getDataTypes() {
+		return dataTypes;
+	}
+
+	public void setDataTypes(List<BrAPITraitDataType> dataTypes) {
+		this.dataTypes = dataTypes;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest methodDbIds(List<String> methodDbIds) {
+		this.methodDbIds = methodDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest addMethodDbIdsItem(String methodDbIdsItem) {
+		if (this.methodDbIds == null) {
+			this.methodDbIds = new ArrayList<String>();
+		}
+		this.methodDbIds.add(methodDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of methods to filter search results
+	 * 
+	 * @return methodDbIds
+	 **/
+
+	public List<String> getMethodDbIds() {
+		return methodDbIds;
+	}
+
+	public void setMethodDbIds(List<String> methodDbIds) {
+		this.methodDbIds = methodDbIds;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest ontologyDbIds(List<String> ontologyDbIds) {
+		this.ontologyDbIds = ontologyDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest addOntologyDbIdsItem(String ontologyDbIdsItem) {
+		if (this.ontologyDbIds == null) {
+			this.ontologyDbIds = new ArrayList<String>();
+		}
+		this.ontologyDbIds.add(ontologyDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of ontology IDs to search for
+	 * 
+	 * @return ontologyDbIds
+	 **/
+
+	public List<String> getOntologyDbIds() {
+		return ontologyDbIds;
+	}
+
+	public void setOntologyDbIds(List<String> ontologyDbIds) {
+		this.ontologyDbIds = ontologyDbIds;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest scaleDbIds(List<String> scaleDbIds) {
+		this.scaleDbIds = scaleDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest addScaleDbIdsItem(String scaleDbIdsItem) {
+		if (this.scaleDbIds == null) {
+			this.scaleDbIds = new ArrayList<String>();
+		}
+		this.scaleDbIds.add(scaleDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of scales to filter search results
+	 * 
+	 * @return scaleDbIds
+	 **/
+
+	public List<String> getScaleDbIds() {
+		return scaleDbIds;
+	}
+
+	public void setScaleDbIds(List<String> scaleDbIds) {
+		this.scaleDbIds = scaleDbIds;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest traitClasses(List<String> traitClasses) {
+		this.traitClasses = traitClasses;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest addTraitClassesItem(String traitClassesItem) {
+		if (this.traitClasses == null) {
+			this.traitClasses = new ArrayList<String>();
+		}
+		this.traitClasses.add(traitClassesItem);
+		return this;
+	}
+
+	/**
+	 * List of trait classes to filter search results
+	 * 
+	 * @return traitClasses
+	 **/
+
+	public List<String> getTraitClasses() {
+		return traitClasses;
+	}
+
+	public void setTraitClasses(List<String> traitClasses) {
+		this.traitClasses = traitClasses;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest traitDbIds(List<String> traitDbIds) {
+		this.traitDbIds = traitDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmAttributeValueSearchRequest addTraitDbIdsItem(String traitDbIdsItem) {
+		if (this.traitDbIds == null) {
+			this.traitDbIds = new ArrayList<String>();
+		}
+		this.traitDbIds.add(traitDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of trait unique ID to filter search results
+	 * 
+	 * @return traitDbIds
+	 **/
+
+	public List<String> getTraitDbIds() {
+		return traitDbIds;
+	}
+
+	public void setTraitDbIds(List<String> traitDbIds) {
+		this.traitDbIds = traitDbIds;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIGermplasmAttributeValueSearchRequest germplasmAttributeValueSearchRequest = (BrAPIGermplasmAttributeValueSearchRequest) o;
+		return Objects.equals(this.germplasmDbIds, germplasmAttributeValueSearchRequest.germplasmDbIds)
+				&& Objects.equals(this.germplasmNames, germplasmAttributeValueSearchRequest.germplasmNames)
+				&& Objects.equals(this.externalReferenceIDs, germplasmAttributeValueSearchRequest.externalReferenceIDs)
+				&& Objects.equals(this.externalReferenceSources,
+						germplasmAttributeValueSearchRequest.externalReferenceSources)
+				&& Objects.equals(this.attributeDbIds, germplasmAttributeValueSearchRequest.attributeDbIds)
+				&& Objects.equals(this.attributeNames, germplasmAttributeValueSearchRequest.attributeNames)
+				&& Objects.equals(this.attributeValueDbIds, germplasmAttributeValueSearchRequest.attributeValueDbIds)
+				&& Objects.equals(this.dataTypes, germplasmAttributeValueSearchRequest.dataTypes)
+				&& Objects.equals(this.methodDbIds, germplasmAttributeValueSearchRequest.methodDbIds)
+				&& Objects.equals(this.ontologyDbIds, germplasmAttributeValueSearchRequest.ontologyDbIds)
+				&& Objects.equals(this.scaleDbIds, germplasmAttributeValueSearchRequest.scaleDbIds)
+				&& Objects.equals(this.traitClasses, germplasmAttributeValueSearchRequest.traitClasses)
+				&& Objects.equals(this.traitDbIds, germplasmAttributeValueSearchRequest.traitDbIds) && super.equals(o);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(germplasmDbIds, germplasmNames, externalReferenceIDs, externalReferenceSources,
+				attributeDbIds, attributeNames, attributeValueDbIds, dataTypes, methodDbIds, ontologyDbIds, scaleDbIds,
+				traitClasses, traitDbIds, super.hashCode());
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class GermplasmAttributeValueSearchRequest {\n");
+		sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+		sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
+		sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
+		sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
+		sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
+		sb.append("    attributeDbIds: ").append(toIndentedString(attributeDbIds)).append("\n");
+		sb.append("    attributeNames: ").append(toIndentedString(attributeNames)).append("\n");
+		sb.append("    attributeValueDbIds: ").append(toIndentedString(attributeValueDbIds)).append("\n");
+		sb.append("    dataTypes: ").append(toIndentedString(dataTypes)).append("\n");
+		sb.append("    methodDbIds: ").append(toIndentedString(methodDbIds)).append("\n");
+		sb.append("    ontologyDbIds: ").append(toIndentedString(ontologyDbIds)).append("\n");
+		sb.append("    scaleDbIds: ").append(toIndentedString(scaleDbIds)).append("\n");
+		sb.append("    traitClasses: ").append(toIndentedString(traitClasses)).append("\n");
+		sb.append("    traitDbIds: ").append(toIndentedString(traitDbIds)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 }

From ec1ea1d00247df7cf1ea70128d3d649c1a3b3faf Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Thu, 17 Aug 2023 14:40:39 -0400
Subject: [PATCH 08/28] JUnits pass

---
 .../GermplasmAttributeValuesApiTest.java      | 270 +++++++++---------
 1 file changed, 142 insertions(+), 128 deletions(-)

diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/GermplasmAttributeValuesApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/GermplasmAttributeValuesApiTest.java
index b9dfe989..3b39a462 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/GermplasmAttributeValuesApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/GermplasmAttributeValuesApiTest.java
@@ -1,6 +1,6 @@
 /*
  * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/URL_Structure.md\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Response_Structure.md\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Date_Time_Encoding.md\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Location_Encoding.md\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Error_Handling.md\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Search_Services.md\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/URL_Structure.md\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Response_Structure.md\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Date_Time_Encoding.md\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Location_Encoding.md\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Error_Handling.md\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Search_Services.md\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm AttributeValues, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
  *
  * OpenAPI spec version: 2.0
  * 
@@ -14,6 +14,7 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.brapi.client.v2.ApiResponse;
+import org.brapi.client.v2.BrAPIClientTest;
 import org.brapi.client.v2.model.exceptions.ApiException;
 import org.brapi.client.v2.model.queryParams.germplasm.GermplasmAttributeValueQueryParams;
 import org.brapi.v2.model.BrAPIAcceptedSearchResponse;
@@ -21,138 +22,151 @@
 import org.brapi.v2.model.germ.response.BrAPIGermplasmAttributeValueListResponse;
 import org.brapi.v2.model.germ.request.BrAPIGermplasmAttributeValueSearchRequest;
 import org.brapi.v2.model.germ.response.BrAPIGermplasmAttributeValueSingleResponse;
-import org.brapi.v2.model.pheno.response.BrAPIObservationUnitListResponse;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
 /**
  * API tests for GermplasmAttributeValuesApi
  */
-public class GermplasmAttributeValuesApiTest {
-
-    private final GermplasmAttributeValuesApi api = new GermplasmAttributeValuesApi();
-
-    /**
-     * Get the details for a specific Germplasm Attribute
-     *
-     * Get the details for a specific Germplasm Attribute
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void attributevaluesAttributeValueDbIdGetTest() throws ApiException {
-        String attributeValueDbId = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPIGermplasmAttributeValueSingleResponse> response = api.attributevaluesAttributeValueDbIdGet(attributeValueDbId);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Update an existing Germplasm Attribute Value
-     *
-     * Update an existing Germplasm Attribute Value
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void attributevaluesAttributeValueDbIdPutTest() throws ApiException {
-        String attributeValueDbId = null;
-        BrAPIGermplasmAttributeValue body = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPIGermplasmAttributeValueSingleResponse> response = api.attributevaluesAttributeValueDbIdPut(attributeValueDbId, body);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Get the Germplasm Attribute Values
-     *
-     * Get the Germplasm Attribute Values
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void attributevaluesGetTest() throws ApiException {
-        String attributeValueDbId = null;
-        String attributeDbId = null;
-        String attributeName = null;
-        String germplasmDbId = null;
-        String externalReferenceID = null;
-        String externalReferenceSource = null;
-        Integer page = null;
-        Integer pageSize = null;
-        
-        GermplasmAttributeValueQueryParams queryParams = new GermplasmAttributeValueQueryParams();
-        ApiResponse<BrAPIGermplasmAttributeValueListResponse> response = api.attributevaluesGet(queryParams);
-
-        // TODO: test validations
-    }
-    /**
-     * Create new Germplasm Attribute Values
-     *
-     * Create new Germplasm Attribute Values
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void attributevaluesPostTest() throws ApiException {
-        List<BrAPIGermplasmAttributeValue> body = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPIGermplasmAttributeValueListResponse> response = api.attributevaluesPost(body);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Submit a search request for Germplasm Attribute Values
-     *
-     * Search for a set of Germplasm Attribute Values based on some criteria          See Search Services for additional implementation details.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void searchAttributevaluesPostTest() throws ApiException {
-        BrAPIGermplasmAttributeValueSearchRequest body = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-            ApiResponse<Pair<Optional<BrAPIGermplasmAttributeValueListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response =
-                    api.searchAttributevaluesPost(body);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Get the results of a Germplasm Attribute Values search request
-     *
-     * Get the results of a Germplasm Attribute Values search request  See Search Services for additional implementation details.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void searchAttributevaluesSearchResultsDbIdGetTest() throws ApiException {
-        String searchResultsDbId = null;
-        Integer page = null;
-        Integer pageSize = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-            ApiResponse<Pair<Optional<BrAPIGermplasmAttributeValueListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response =
-                    api.searchAttributevaluesSearchResultsDbIdGet(searchResultsDbId, page, pageSize);
-		});
-
-        // TODO: test validations
-    }
-}
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class GermplasmAttributeValuesApiTest extends BrAPIClientTest {
+
+    private final GermplasmAttributeValuesApi api = new GermplasmAttributeValuesApi(this.apiClient);
+
+	/**
+	 * Get the details for a specific Germplasm Attribute
+	 *
+	 * Get the details for a specific Germplasm Attribute
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void attributesAttributeValueDbIdGetTest() throws ApiException {
+		String attributeValueDbId = "attribute_val1";
+
+		ApiResponse<BrAPIGermplasmAttributeValueSingleResponse> response = api.attributevaluesAttributeValueDbIdGet(attributeValueDbId);
+
+		assertEquals(attributeValueDbId, response.getBody().getResult().getAttributeValueDbId());
+	}
+
+	/**
+	 * Update an existing Germplasm Attribute
+	 *
+	 * Update an existing Germplasm Attribute
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void attributesAttributeValueDbIdPutTest() throws ApiException {
+		String attributeValueDbId = "attribute_val1";
+		BrAPIGermplasmAttributeValue body = new BrAPIGermplasmAttributeValue().value("new value");
+
+		ApiResponse<BrAPIGermplasmAttributeValueSingleResponse> response = api.attributevaluesAttributeValueDbIdPut(attributeValueDbId, body);
+
+		assertEquals(attributeValueDbId, response.getBody().getResult().getAttributeValueDbId());
+		assertEquals("new value", response.getBody().getResult().getValue());
+	}
+
+	/**
+	 * Get the Germplasm AttributeValues
+	 *
+	 * List available attributes.
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void attributesGetTest() throws ApiException {
+		String attributeValueDbId = "attribute_val1";
+
+		GermplasmAttributeValueQueryParams queryParams = new GermplasmAttributeValueQueryParams().attributeValueDbId(attributeValueDbId);
+		ApiResponse<BrAPIGermplasmAttributeValueListResponse> response = api.attributevaluesGet(queryParams);
+
+		assertEquals(attributeValueDbId, response.getBody().getResult().getData().get(0).getAttributeValueDbId());
+	}
+
+	/**
+	 * Create new Germplasm AttributeValues
+	 *
+	 * Create new Germplasm AttributeValues
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void attributesPostTest() throws ApiException {
+		BrAPIGermplasmAttributeValue attr = new BrAPIGermplasmAttributeValue().attributeDbId("attribute1").value("new value");
+		List<BrAPIGermplasmAttributeValue> body = Arrays.asList(attr);
+
+		ApiResponse<BrAPIGermplasmAttributeValueListResponse> response = api.attributevaluesPost(body);
+
+		assertEquals(attr.getAttributeDbId(), response.getBody().getResult().getData().get(0).getAttributeDbId());
+		assertEquals(attr.getValue(), response.getBody().getResult().getData().get(0).getValue());
+	}
+
+	/**
+	 * Submit a search request for Germplasm AttributeValues
+	 *
+	 * Search for a set of Germplasm AttributeValues based on some criteria See Search
+	 * Services for additional implementation details.
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void searchAttributeValuesPostTest() throws ApiException {
+		BrAPIGermplasmAttributeValueSearchRequest body = new BrAPIGermplasmAttributeValueSearchRequest()
+				.addAttributeValueDbIdsItem("attribute_val1")
+				.addAttributeValueDbIdsItem("attribute_val2");
+
+		ApiResponse<Pair<Optional<BrAPIGermplasmAttributeValueListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api
+				.searchAttributevaluesPost(body);
+		
+        Optional<BrAPIGermplasmAttributeValueListResponse> listResponse = response.getBody().getLeft();
+        Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+        // only results are returned
+        assertTrue(listResponse.isPresent());
+        assertFalse(searchIdResponse.isPresent());
+
+        assertEquals(2, listResponse.get().getResult().getData().size(), "unexpected number of pedigree nodes returned");
+	}
+
+	/**
+	 * Get the results of a Germplasm AttributeValues search request
+	 *
+	 * Get the results of a Germplasm AttributeValues search request See Search Services
+	 * for additional implementation details.
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void searchAttributeValuesSearchResultsDbIdGetTest() throws ApiException {
+		BrAPIGermplasmAttributeValueSearchRequest baseRequest = new BrAPIGermplasmAttributeValueSearchRequest()
+				.addAttributeValueDbIdsItem("attribute_val1")
+				.addAttributeValueDbIdsItem("attribute_val2")
+				.addAttributeValueDbIdsItem("attribute_val3")
+				.addAttributeValueDbIdsItem("attribute_val2")
+				.addAttributeValueDbIdsItem("attribute_val1");
+
+        ApiResponse<Pair<Optional<BrAPIGermplasmAttributeValueListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = this.api.searchAttributevaluesPost(baseRequest);
+        Optional<BrAPIGermplasmAttributeValueListResponse> listResponse = response.getBody().getLeft();
+        Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+        // only search ID is returned
+        assertFalse(listResponse.isPresent());
+        assertTrue(searchIdResponse.isPresent());
+
+        // Get results from search ID
+    	ApiResponse<Pair<Optional<BrAPIGermplasmAttributeValueListResponse>, Optional<BrAPIAcceptedSearchResponse>>> searchResponse = this.api.searchAttributevaluesSearchResultsDbIdGet(searchIdResponse.get().getResult().getSearchResultsDbId(), 0, 10);
+        Optional<BrAPIGermplasmAttributeValueListResponse> listResponse2 = searchResponse.getBody().getLeft();
+        Optional<BrAPIAcceptedSearchResponse> searchIdResponse2 = searchResponse.getBody().getRight();
+        // only results are returned
+        assertTrue(listResponse2.isPresent());
+        assertFalse(searchIdResponse2.isPresent());
+
+        assertEquals(3, listResponse2.get().getResult().getData().size(), "unexpected number of pedigree nodes returned");
+	}
+}
\ No newline at end of file

From 0e46ced7fa9d7d729d3fe37daaa9e19a7948cb27 Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Thu, 17 Aug 2023 15:18:19 -0400
Subject: [PATCH 09/28] fixes #126, #127, #128. Dependent on #199

---
 .../germplasm/PlannedCrossQueryParams.java    |  29 +-
 .../v2/modules/germplasm/CrossesApiTest.java  |  49 +-
 .../v2/model/germ/BrAPIPlannedCross.java      | 561 +++++++++---------
 .../model/germ/BrAPIPlannedCrossStatus.java   |  39 ++
 4 files changed, 377 insertions(+), 301 deletions(-)
 create mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPlannedCrossStatus.java

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/PlannedCrossQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/PlannedCrossQueryParams.java
index dafc9351..6f690b6a 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/PlannedCrossQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/PlannedCrossQueryParams.java
@@ -31,22 +31,29 @@
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(fluent=true)
+@Accessors(fluent = true)
 public class PlannedCrossQueryParams extends BrAPIQueryParams {
 
-    private String crossingProjectDbId;
-    private String plannedCrossDbId;
-    private String externalReferenceSource;
-    private String externalReferenceId;
-    @Deprecated
-    private String externalReferenceID;
-    
-    public String getExternalReferenceId() {
+	private String commonCropName;
+	private String crossingProjectDbId;
+	private String crossingProjectName;
+	private String externalReferenceId;
+	@Deprecated
+	private String externalReferenceID;
+	private String externalReferenceSource;
+	private String plannedCrossDbId;
+	private String plannedCrossName;
+	private String programDbId;
+	private String status;
+
+	public String getExternalReferenceId() {
 		return externalReferenceId;
 	}
-    public String externalReferenceId() {
+
+	public String externalReferenceId() {
 		return externalReferenceId;
 	}
+
 	public void setExternalReferenceId(String externalReferenceId) {
 		this.externalReferenceId = externalReferenceId;
 	}
@@ -55,10 +62,12 @@ public void setExternalReferenceId(String externalReferenceId) {
 	public String getExternalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public String externalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/CrossesApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/CrossesApiTest.java
index b362175c..315a0734 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/CrossesApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/CrossesApiTest.java
@@ -13,6 +13,7 @@
 package org.brapi.client.v2.modules.germplasm;
 
 import org.brapi.client.v2.ApiResponse;
+import org.brapi.client.v2.BrAPIClientTest;
 import org.brapi.client.v2.model.exceptions.ApiException;
 import org.brapi.client.v2.model.queryParams.germplasm.CrossQueryParams;
 import org.brapi.client.v2.model.queryParams.germplasm.PlannedCrossQueryParams;
@@ -21,15 +22,21 @@
 import org.brapi.v2.model.germ.response.BrAPICrossesListResponse;
 import org.brapi.v2.model.germ.response.BrAPIPlannedCrossesListResponse;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class CrossesApiTest {
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class CrossesApiTest  extends BrAPIClientTest{
 
-    private final CrossesApi api = new CrossesApi();
+    private final CrossesApi api = new CrossesApi(this.apiClient);
 
     /**
      * Get a filtered list of Cross entities
@@ -99,17 +106,13 @@ public void crossesPutTest() throws ApiException {
      */
     @Test
     public void plannedcrossesGetTest() throws ApiException {
-        String crossingProjectDbId = null;
-        String plannedCrossDbId = null;
-        String externalReferenceID = null;
-        String externalReferenceSource = null;
-        Integer page = null;
-        Integer pageSize = null;
+        String plannedCrossDbId = "cross4";
         
-        PlannedCrossQueryParams queryParams = new PlannedCrossQueryParams();
+        PlannedCrossQueryParams queryParams = new PlannedCrossQueryParams().plannedCrossDbId(plannedCrossDbId);
         ApiResponse<BrAPIPlannedCrossesListResponse> response = api.plannedcrossesGet(queryParams);
 
-        // TODO: test validations
+        assertEquals(1, response.getBody().getResult().getData().size());
+        assertEquals(plannedCrossDbId, response.getBody().getResult().getData().get(0).getPlannedCrossDbId());
     }
     /**
      * Create new Planned Cross entities on this server
@@ -121,13 +124,17 @@ public void plannedcrossesGetTest() throws ApiException {
      */
     @Test
     public void plannedcrossesPostTest() throws ApiException {
-        List<BrAPIPlannedCross> body = null;
+    	BrAPIPlannedCross pCross = new BrAPIPlannedCross()
+    			.crossingProjectDbId("crossing_project2")
+    			.plannedCrossName("New Name");
+        List<BrAPIPlannedCross> body = Arrays.asList(pCross);
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
         ApiResponse<BrAPIPlannedCrossesListResponse> response = api.plannedcrossesPost(body);
-		});
 
-        // TODO: test validations
+        assertEquals(1, response.getBody().getResult().getData().size());
+        assertNotNull(response.getBody().getResult().getData().get(0).getPlannedCrossDbId());
+        assertEquals(pCross.getPlannedCrossName(), response.getBody().getResult().getData().get(0).getPlannedCrossName());
+        assertEquals(pCross.getCrossingProjectDbId(), response.getBody().getResult().getData().get(0).getCrossingProjectDbId());
     }
     /**
      * Update existing Planned Cross entities on this server
@@ -139,12 +146,18 @@ public void plannedcrossesPostTest() throws ApiException {
      */
     @Test
     public void plannedcrossesPutTest() throws ApiException {
-        Map<String, BrAPIPlannedCross> body = null;
+    	BrAPIPlannedCross pCross = new BrAPIPlannedCross()
+    			.crossingProjectDbId("crossing_project2")
+    			.plannedCrossName("New Name")
+    			.plannedCrossDbId("cross2");
+        Map<String, BrAPIPlannedCross> body = new HashMap<String, BrAPIPlannedCross>();
+        body.put("cross2", pCross);
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
         ApiResponse<BrAPIPlannedCrossesListResponse> response = api.plannedcrossesPut(body);
-		});
 
-        // TODO: test validations
+        assertEquals(1, response.getBody().getResult().getData().size());
+        assertEquals(pCross.getPlannedCrossDbId(), response.getBody().getResult().getData().get(0).getPlannedCrossDbId());
+        assertEquals(pCross.getPlannedCrossName(), response.getBody().getResult().getData().get(0).getPlannedCrossName());
+        assertEquals(pCross.getCrossingProjectDbId(), response.getBody().getResult().getData().get(0).getCrossingProjectDbId());
     }
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPlannedCross.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPlannedCross.java
index 17f94d53..e526e254 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPlannedCross.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPlannedCross.java
@@ -1,8 +1,6 @@
 package org.brapi.v2.model.germ;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
 import com.google.gson.Gson;
@@ -14,280 +12,297 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.brapi.v2.model.NullableJsonElementTypeAdapterFactory;
 
-import javax.validation.Valid;
-
-
 /**
  * PlannedCross
  */
 
-
 public class BrAPIPlannedCross {
-  @JsonProperty("plannedCrossDbId")
-  private String plannedCrossDbId = null;
-
-  @JsonProperty("additionalInfo")
-  @Valid
-  @JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
-  private JsonObject additionalInfo = null;
-
-  @JsonProperty("crossType")
-  private BrAPICrossType crossType = null;
-
-  @JsonProperty("crossingProjectDbId")
-  private String crossingProjectDbId = null;
-
-  @JsonProperty("crossingProjectName")
-  private String crossingProjectName = null;
-
-  @JsonProperty("externalReferences")
-  private List<BrAPIExternalReference> externalReferences = null;
-
-  @JsonProperty("parent1")
-  private BrAPICrossParent parent1 = null;
-
-  @JsonProperty("parent2")
-  private BrAPICrossParent parent2 = null;
-
-  @JsonProperty("plannedCrossName")
-  private String plannedCrossName = null;
-
-  private final transient Gson gson = new Gson();
-
-  public BrAPIPlannedCross plannedCrossDbId(String plannedCrossDbId) {
-    this.plannedCrossDbId = plannedCrossDbId;
-    return this;
-  }
-
-  /**
-   * the unique identifier for a cross
-   * @return plannedCrossDbId
-  **/
-  
-  
-    public String getPlannedCrossDbId() {
-    return plannedCrossDbId;
-  }
-
-  public void setPlannedCrossDbId(String plannedCrossDbId) {
-    this.plannedCrossDbId = plannedCrossDbId;
-  }
-
-  public BrAPIPlannedCross additionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-    return this;
-  }
-
-  public BrAPIPlannedCross putAdditionalInfoItem(String key, Object additionalInfoItem) {
-    if (this.additionalInfo == null) {
-      this.additionalInfo = new JsonObject();
-    }
-    JsonElement newElement = gson.toJsonTree(additionalInfoItem);
-    this.additionalInfo.add(key, newElement);
-    return this;
-  }
-
-  /**
-   * Additional arbitrary info
-   * @return additionalInfo
-   **/
-
-
-  public JsonObject getAdditionalInfo() {
-    return additionalInfo;
-  }
-
-  public void setAdditionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-  }
-
-  public BrAPIPlannedCross crossType(BrAPICrossType crossType) {
-    this.crossType = crossType;
-    return this;
-  }
-
-  /**
-   * the type of cross
-   * @return crossType
-   **/
-
-
-  public BrAPICrossType getCrossType() {
-    return crossType;
-  }
-
-  public void setCrossType(BrAPICrossType crossType) {
-    this.crossType = crossType;
-  }
-
-  public BrAPIPlannedCross crossingProjectDbId(String crossingProjectDbId) {
-    this.crossingProjectDbId = crossingProjectDbId;
-    return this;
-  }
-
-  /**
-   * the unique identifier for a crossing project
-   * @return crossingProjectDbId
-   **/
-
-
-  public String getCrossingProjectDbId() {
-    return crossingProjectDbId;
-  }
-
-  public void setCrossingProjectDbId(String crossingProjectDbId) {
-    this.crossingProjectDbId = crossingProjectDbId;
-  }
-
-  public BrAPIPlannedCross crossingProjectName(String crossingProjectName) {
-    this.crossingProjectName = crossingProjectName;
-    return this;
-  }
-
-  /**
-   * the human readable name for a crossing project
-   * @return crossingProjectName
-   **/
-
-
-  public String getCrossingProjectName() {
-    return crossingProjectName;
-  }
-
-  public void setCrossingProjectName(String crossingProjectName) {
-    this.crossingProjectName = crossingProjectName;
-  }
-
-  public BrAPIPlannedCross externalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-    return this;
-  }
-
-  /**
-   * Get externalReferences
-   * @return externalReferences
-   **/
-
-
-  @Valid
-  public List<BrAPIExternalReference> getExternalReferences() {
-    return externalReferences;
-  }
-
-  public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-  }
-
-  public BrAPIPlannedCross parent1(BrAPICrossParent parent1) {
-    this.parent1 = parent1;
-    return this;
-  }
-
-  /**
-   * Get parent1
-   * @return parent1
-   **/
-
-
-  @Valid
-  public BrAPICrossParent getParent1() {
-    return parent1;
-  }
-
-  public void setParent1(BrAPICrossParent parent1) {
-    this.parent1 = parent1;
-  }
-
-  public BrAPIPlannedCross parent2(BrAPICrossParent parent2) {
-    this.parent2 = parent2;
-    return this;
-  }
-
-  /**
-   * Get parent2
-   * @return parent2
-   **/
-
-
-  @Valid
-  public BrAPICrossParent getParent2() {
-    return parent2;
-  }
-
-  public void setParent2(BrAPICrossParent parent2) {
-    this.parent2 = parent2;
-  }
-
-  public BrAPIPlannedCross plannedCrossName(String plannedCrossName) {
-    this.plannedCrossName = plannedCrossName;
-    return this;
-  }
-
-  /**
-   * the human readable name for a cross
-   * @return plannedCrossName
-   **/
-
-
-  public String getPlannedCrossName() {
-    return plannedCrossName;
-  }
-
-  public void setPlannedCrossName(String plannedCrossName) {
-    this.plannedCrossName = plannedCrossName;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIPlannedCross plannedCross = (BrAPIPlannedCross) o;
-    return Objects.equals(this.plannedCrossDbId, plannedCross.plannedCrossDbId) &&
-            Objects.equals(this.additionalInfo, plannedCross.additionalInfo) &&
-            Objects.equals(this.crossType, plannedCross.crossType) &&
-            Objects.equals(this.crossingProjectDbId, plannedCross.crossingProjectDbId) &&
-            Objects.equals(this.crossingProjectName, plannedCross.crossingProjectName) &&
-            Objects.equals(this.externalReferences, plannedCross.externalReferences) &&
-            Objects.equals(this.parent1, plannedCross.parent1) &&
-            Objects.equals(this.parent2, plannedCross.parent2) &&
-            Objects.equals(this.plannedCrossName, plannedCross.plannedCrossName);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(plannedCrossDbId, additionalInfo, crossType, crossingProjectDbId, crossingProjectName, externalReferences, parent1, parent2, plannedCrossName);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PlannedCross {\n");
-    sb.append("    plannedCrossDbId: ").append(toIndentedString(plannedCrossDbId)).append("\n");
-    sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-    sb.append("    crossType: ").append(toIndentedString(crossType)).append("\n");
-    sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
-    sb.append("    crossingProjectName: ").append(toIndentedString(crossingProjectName)).append("\n");
-    sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-    sb.append("    parent1: ").append(toIndentedString(parent1)).append("\n");
-    sb.append("    parent2: ").append(toIndentedString(parent2)).append("\n");
-    sb.append("    plannedCrossName: ").append(toIndentedString(plannedCrossName)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+	@JsonProperty("plannedCrossDbId")
+	private String plannedCrossDbId = null;
+
+	@JsonProperty("additionalInfo")
+	@JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
+	private JsonObject additionalInfo = null;
+
+	@JsonProperty("crossType")
+	private BrAPICrossType crossType = null;
+
+	@JsonProperty("crossingProjectDbId")
+	private String crossingProjectDbId = null;
+
+	@JsonProperty("crossingProjectName")
+	private String crossingProjectName = null;
+
+	@JsonProperty("externalReferences")
+	private List<BrAPIExternalReference> externalReferences = null;
+
+	@JsonProperty("parent1")
+	private BrAPICrossParent parent1 = null;
+
+	@JsonProperty("parent2")
+	private BrAPICrossParent parent2 = null;
+
+	@JsonProperty("plannedCrossName")
+	private String plannedCrossName = null;
+
+	@JsonProperty("status")
+	private BrAPIPlannedCrossStatus status = null;
+
+	private final transient Gson gson = new Gson();
+
+	public BrAPIPlannedCross plannedCrossDbId(String plannedCrossDbId) {
+		this.plannedCrossDbId = plannedCrossDbId;
+		return this;
+	}
+
+	/**
+	 * the unique identifier for a cross
+	 * 
+	 * @return plannedCrossDbId
+	 **/
+
+	public String getPlannedCrossDbId() {
+		return plannedCrossDbId;
+	}
+
+	public void setPlannedCrossDbId(String plannedCrossDbId) {
+		this.plannedCrossDbId = plannedCrossDbId;
+	}
+
+	public BrAPIPlannedCross additionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+		return this;
+	}
+
+	public BrAPIPlannedCross putAdditionalInfoItem(String key, Object additionalInfoItem) {
+		if (this.additionalInfo == null) {
+			this.additionalInfo = new JsonObject();
+		}
+		JsonElement newElement = gson.toJsonTree(additionalInfoItem);
+		this.additionalInfo.add(key, newElement);
+		return this;
+	}
+
+	/**
+	 * Additional arbitrary info
+	 * 
+	 * @return additionalInfo
+	 **/
+
+	public JsonObject getAdditionalInfo() {
+		return additionalInfo;
+	}
+
+	public void setAdditionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+	}
+
+	public BrAPIPlannedCross crossType(BrAPICrossType crossType) {
+		this.crossType = crossType;
+		return this;
+	}
+
+	/**
+	 * the type of cross
+	 * 
+	 * @return crossType
+	 **/
+
+	public BrAPICrossType getCrossType() {
+		return crossType;
+	}
+
+	public void setCrossType(BrAPICrossType crossType) {
+		this.crossType = crossType;
+	}
+
+	public BrAPIPlannedCross crossingProjectDbId(String crossingProjectDbId) {
+		this.crossingProjectDbId = crossingProjectDbId;
+		return this;
+	}
+
+	/**
+	 * the unique identifier for a crossing project
+	 * 
+	 * @return crossingProjectDbId
+	 **/
+
+	public String getCrossingProjectDbId() {
+		return crossingProjectDbId;
+	}
+
+	public void setCrossingProjectDbId(String crossingProjectDbId) {
+		this.crossingProjectDbId = crossingProjectDbId;
+	}
+
+	public BrAPIPlannedCross crossingProjectName(String crossingProjectName) {
+		this.crossingProjectName = crossingProjectName;
+		return this;
+	}
+
+	/**
+	 * the human readable name for a crossing project
+	 * 
+	 * @return crossingProjectName
+	 **/
+
+	public String getCrossingProjectName() {
+		return crossingProjectName;
+	}
+
+	public void setCrossingProjectName(String crossingProjectName) {
+		this.crossingProjectName = crossingProjectName;
+	}
+
+	public BrAPIPlannedCross externalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+		return this;
+	}
+
+	/**
+	 * Get externalReferences
+	 * 
+	 * @return externalReferences
+	 **/
+
+	public List<BrAPIExternalReference> getExternalReferences() {
+		return externalReferences;
+	}
+
+	public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+	}
+
+	public BrAPIPlannedCross parent1(BrAPICrossParent parent1) {
+		this.parent1 = parent1;
+		return this;
+	}
+
+	/**
+	 * Get parent1
+	 * 
+	 * @return parent1
+	 **/
+
+	public BrAPICrossParent getParent1() {
+		return parent1;
+	}
+
+	public void setParent1(BrAPICrossParent parent1) {
+		this.parent1 = parent1;
+	}
+
+	public BrAPIPlannedCross parent2(BrAPICrossParent parent2) {
+		this.parent2 = parent2;
+		return this;
+	}
+
+	/**
+	 * Get parent2
+	 * 
+	 * @return parent2
+	 **/
+
+	public BrAPICrossParent getParent2() {
+		return parent2;
+	}
+
+	public void setParent2(BrAPICrossParent parent2) {
+		this.parent2 = parent2;
+	}
+
+	public BrAPIPlannedCross plannedCrossName(String plannedCrossName) {
+		this.plannedCrossName = plannedCrossName;
+		return this;
+	}
+
+	/**
+	 * the human readable name for a cross
+	 * 
+	 * @return plannedCrossName
+	 **/
+
+	public String getPlannedCrossName() {
+		return plannedCrossName;
+	}
+
+	public void setPlannedCrossName(String plannedCrossName) {
+		this.plannedCrossName = plannedCrossName;
+	}
+
+	public BrAPIPlannedCross status(BrAPIPlannedCrossStatus status) {
+		this.status = status;
+		return this;
+	}
+
+	/**
+	 * The status of this planned cross. Is it waiting to be performed
+	 * (&#x27;TODO&#x27;), has it been completed successfully (&#x27;DONE&#x27;), or
+	 * has it not been done on purpose (&#x27;SKIPPED&#x27;).
+	 *
+	 * @return status
+	 **/
+	public BrAPIPlannedCrossStatus getStatus() {
+		return status;
+	}
+
+	public void setStatus(BrAPIPlannedCrossStatus status) {
+		this.status = status;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIPlannedCross plannedCross = (BrAPIPlannedCross) o;
+		return Objects.equals(this.plannedCrossDbId, plannedCross.plannedCrossDbId)
+				&& Objects.equals(this.additionalInfo, plannedCross.additionalInfo)
+				&& Objects.equals(this.crossType, plannedCross.crossType)
+				&& Objects.equals(this.crossingProjectDbId, plannedCross.crossingProjectDbId)
+				&& Objects.equals(this.crossingProjectName, plannedCross.crossingProjectName)
+				&& Objects.equals(this.externalReferences, plannedCross.externalReferences)
+				&& Objects.equals(this.parent1, plannedCross.parent1)
+				&& Objects.equals(this.parent2, plannedCross.parent2)
+				&& Objects.equals(this.plannedCrossName, plannedCross.plannedCrossName)
+				&& Objects.equals(this.status, plannedCross.status);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(plannedCrossDbId, additionalInfo, crossType, crossingProjectDbId, crossingProjectName,
+				externalReferences, parent1, parent2, plannedCrossName, status);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class PlannedCross {\n");
+		sb.append("    plannedCrossDbId: ").append(toIndentedString(plannedCrossDbId)).append("\n");
+		sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
+		sb.append("    crossType: ").append(toIndentedString(crossType)).append("\n");
+		sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
+		sb.append("    crossingProjectName: ").append(toIndentedString(crossingProjectName)).append("\n");
+		sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
+		sb.append("    parent1: ").append(toIndentedString(parent1)).append("\n");
+		sb.append("    parent2: ").append(toIndentedString(parent2)).append("\n");
+		sb.append("    plannedCrossName: ").append(toIndentedString(plannedCrossName)).append("\n");
+		sb.append("    status: ").append(toIndentedString(status)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPlannedCrossStatus.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPlannedCrossStatus.java
new file mode 100644
index 00000000..3d965bcb
--- /dev/null
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPlannedCrossStatus.java
@@ -0,0 +1,39 @@
+package org.brapi.v2.model.germ;
+
+import org.brapi.v2.model.BrAPIEnum;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum BrAPIPlannedCrossStatus implements BrAPIEnum {
+    TODO("TODO"),
+    DONE("DONE"),
+    SKIPPED("SKIPPED");
+
+    private String value;
+
+    BrAPIPlannedCrossStatus(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static BrAPIPlannedCrossStatus fromValue(String text) {
+      for (BrAPIPlannedCrossStatus b : BrAPIPlannedCrossStatus.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+
+	@Override
+	public String getBrapiValue() {
+		return value;
+	}
+}

From ab279e302f22b50e75cbdf7b5edea71873982d52 Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Thu, 17 Aug 2023 16:09:31 -0400
Subject: [PATCH 10/28] fixes #123, #124, #125, #153, #154. Dependent on #199

---
 .../queryParams/core/PeopleQueryParams.java   |  31 +-
 .../client/v2/modules/core/PeopleApiTest.java |  92 +-
 .../request/BrAPIPersonSearchRequest.java     | 873 ++++++++++--------
 3 files changed, 575 insertions(+), 421 deletions(-)

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/PeopleQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/PeopleQueryParams.java
index 769996a1..0acb2b8f 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/PeopleQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/PeopleQueryParams.java
@@ -29,24 +29,28 @@
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(fluent=true)
+@Accessors(fluent = true)
 public class PeopleQueryParams extends BrAPIQueryParams {
 
-    private String firstName;
-    private String lastName;
-    private String personDbId;
-    private String userID;
-    private String externalReferenceSource;
-    private String externalReferenceId;
-    @Deprecated
-    private String externalReferenceID;
-    
-    public String getExternalReferenceId() {
+	private String commonCropName;
+	private String externalReferenceId;
+	@Deprecated
+	private String externalReferenceID;
+	private String externalReferenceSource;
+	private String firstName;
+	private String lastName;
+	private String personDbId;
+	private String programDbId;
+	private String userID;
+
+	public String getExternalReferenceId() {
 		return externalReferenceId;
 	}
-    public String externalReferenceId() {
+
+	public String externalReferenceId() {
 		return externalReferenceId;
 	}
+
 	public void setExternalReferenceId(String externalReferenceId) {
 		this.externalReferenceId = externalReferenceId;
 	}
@@ -55,13 +59,14 @@ public void setExternalReferenceId(String externalReferenceId) {
 	public String getExternalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public String externalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
-
 }
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/PeopleApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/PeopleApiTest.java
index 47d04384..867f6aca 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/PeopleApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/PeopleApiTest.java
@@ -29,7 +29,10 @@
 import java.util.List;
 import java.util.Optional;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * API tests for PeopleApi
@@ -49,19 +52,13 @@ public class PeopleApiTest extends BrAPIClientTest {
      */
     @Test
     public void peopleGetTest() throws ApiException {
-        String firstName = null;
-        String lastName = null;
-        String personDbId = null;
-        String userID = null;
-        String externalReferenceID = null;
-        String externalReferenceSource = null;
-        Integer page = null;
-        Integer pageSize = null;
+        String personDbId = "person1";
         
-        PeopleQueryParams queryParams = new PeopleQueryParams();
+        PeopleQueryParams queryParams = new PeopleQueryParams().personDbId(personDbId);
         ApiResponse<BrAPIPersonListResponse> response = api.peopleGet(queryParams);
 
-        // TODO: test validations
+        assertEquals(1, response.getBody().getResult().getData().size());
+        assertEquals(personDbId, response.getBody().getResult().getData().get(0).getPersonDbId());
     }
     /**
      * Get the details for a specific Person
@@ -73,13 +70,11 @@ public void peopleGetTest() throws ApiException {
      */
     @Test
     public void peoplePersonDbIdGetTest() throws ApiException {
-        String personDbId = null;
+        String personDbId = "person1";
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
         ApiResponse<BrAPIPersonSingleResponse> response = api.peoplePersonDbIdGet(personDbId);
-		});
 
-        // TODO: test validations
+        assertEquals(personDbId, response.getBody().getResult().getPersonDbId());
     }
     /**
      * Update an existing Person
@@ -91,14 +86,13 @@ public void peoplePersonDbIdGetTest() throws ApiException {
      */
     @Test
     public void peoplePersonDbIdPutTest() throws ApiException {
-        String personDbId = null;
-        BrAPIPerson body = null;
+        String personDbId = "person1";
+        BrAPIPerson body = new BrAPIPerson().firstName("New Name");
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
         ApiResponse<BrAPIPersonSingleResponse> response = api.peoplePersonDbIdPut(personDbId, body);
-		});
 
-        // TODO: test validations
+        assertEquals(personDbId, response.getBody().getResult().getPersonDbId());
+        assertEquals(body.getFirstName(), response.getBody().getResult().getFirstName());
     }
     /**
      * Create new People
@@ -110,11 +104,13 @@ public void peoplePersonDbIdPutTest() throws ApiException {
      */
     @Test
     public void peoplePostTest() throws ApiException {
-        List<BrAPIPerson> body = Arrays.asList(new BrAPIPerson());
+        List<BrAPIPerson> body = Arrays.asList(new BrAPIPerson().firstName("New Name"));
         
         ApiResponse<BrAPIPersonListResponse> response = api.peoplePost(body);
 
-        // TODO: test validations
+        assertEquals(1, response.getBody().getResult().getData().size());
+        assertNotNull(response.getBody().getResult().getData().get(0).getPersonDbId());
+        assertEquals("New Name", response.getBody().getResult().getData().get(0).getFirstName());
     }
     /**
      * Submit a search request for People
@@ -126,11 +122,20 @@ public void peoplePostTest() throws ApiException {
      */
     @Test
     public void searchPeoplePostTest() throws ApiException {
-        BrAPIPersonSearchRequest body = new BrAPIPersonSearchRequest();
-
-        ApiResponse<Pair<Optional<BrAPIPersonListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api.searchPeoplePost(body);
-
-        // TODO: test validations
+		BrAPIPersonSearchRequest body = new BrAPIPersonSearchRequest()
+				.addPersonDbIdsItem("person1")
+				.addPersonDbIdsItem("person2");
+
+		ApiResponse<Pair<Optional<BrAPIPersonListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api
+				.searchPeoplePost(body);
+		
+        Optional<BrAPIPersonListResponse> listResponse = response.getBody().getLeft();
+        Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+        // only results are returned
+        assertTrue(listResponse.isPresent());
+        assertFalse(searchIdResponse.isPresent());
+
+        assertEquals(2, listResponse.get().getResult().getData().size(), "unexpected number of pedigree nodes returned");
     }
     /**
      * Get the results of a People search request
@@ -142,15 +147,28 @@ public void searchPeoplePostTest() throws ApiException {
      */
     @Test
     public void searchPeopleSearchResultsDbIdGetTest() throws ApiException {
-        String searchResultsDbId = null;
-        Integer page = null;
-        Integer pageSize = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-            ApiResponse<Pair<Optional<BrAPIPersonListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response =
-                    api.searchPeopleSearchResultsDbIdGet(searchResultsDbId, page, pageSize);
-		});
-
-        // TODO: test validations
+		BrAPIPersonSearchRequest baseRequest = new BrAPIPersonSearchRequest()
+				.addPersonDbIdsItem("person1")
+				.addPersonDbIdsItem("person1")
+				.addPersonDbIdsItem("person1")
+				.addPersonDbIdsItem("person2")
+				.addPersonDbIdsItem("person2");
+
+        ApiResponse<Pair<Optional<BrAPIPersonListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = this.api.searchPeoplePost(baseRequest);
+        Optional<BrAPIPersonListResponse> listResponse = response.getBody().getLeft();
+        Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+        // only search ID is returned
+        assertFalse(listResponse.isPresent());
+        assertTrue(searchIdResponse.isPresent());
+
+        // Get results from search ID
+    	ApiResponse<Pair<Optional<BrAPIPersonListResponse>, Optional<BrAPIAcceptedSearchResponse>>> searchResponse = this.api.searchPeopleSearchResultsDbIdGet(searchIdResponse.get().getResult().getSearchResultsDbId(), 0, 10);
+        Optional<BrAPIPersonListResponse> listResponse2 = searchResponse.getBody().getLeft();
+        Optional<BrAPIAcceptedSearchResponse> searchIdResponse2 = searchResponse.getBody().getRight();
+        // only results are returned
+        assertTrue(listResponse2.isPresent());
+        assertFalse(searchIdResponse2.isPresent());
+
+        assertEquals(2, listResponse2.get().getResult().getData().size(), "unexpected number of pedigree nodes returned");
     }
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPIPersonSearchRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPIPersonSearchRequest.java
index 6c04d2bb..a252180b 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPIPersonSearchRequest.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPIPersonSearchRequest.java
@@ -6,381 +6,512 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-
 import org.brapi.v2.model.BrAPISearchRequestParametersPaging;
 
 /**
- * PersonSearchRequest
+ * BrAPIPersonSearchRequest
  */
 
+public class BrAPIPersonSearchRequest extends BrAPISearchRequestParametersPaging {
+	@JsonProperty("commonCropNames")
+	private List<String> commonCropNames = null;
+
+	@JsonProperty("emailAddresses")
+	private List<String> emailAddresses = null;
+
+	@JsonProperty("externalReferenceIds")
+	private List<String> externalReferenceIds = null;
+
+	@Deprecated
+	@JsonProperty("externalReferenceIDs")
+	private List<String> externalReferenceIDs = null;
+
+	@JsonProperty("externalReferenceSources")
+	private List<String> externalReferenceSources = null;
+
+	@JsonProperty("firstNames")
+	private List<String> firstNames = null;
+
+	@JsonProperty("lastNames")
+	private List<String> lastNames = null;
+
+	@JsonProperty("mailingAddresses")
+	private List<String> mailingAddresses = null;
+
+	@JsonProperty("middleNames")
+	private List<String> middleNames = null;
+
+	@JsonProperty("personDbIds")
+	private List<String> personDbIds = null;
+
+	@JsonProperty("phoneNumbers")
+	private List<String> phoneNumbers = null;
+
+	@JsonProperty("programDbIds")
+	private List<String> programDbIds = null;
+
+	@JsonProperty("programNames")
+	private List<String> programNames = null;
+
+	@JsonProperty("userIDs")
+	private List<String> userIDs = null;
+
+	public BrAPIPersonSearchRequest commonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+		return this;
+	}
+
+	public BrAPIPersonSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
+		if (this.commonCropNames == null) {
+			this.commonCropNames = new ArrayList<String>();
+		}
+		this.commonCropNames.add(commonCropNamesItem);
+		return this;
+	}
+
+	/**
+	 * The BrAPI Common Crop Name is the simple, generalized, widely accepted name
+	 * of the organism being researched. It is most often used in multi-crop systems
+	 * where digital resources need to be divided at a high level. Things like
+	 * &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of
+	 * common crop names. Use this parameter to only return results associated with
+	 * the given crops. Use &#x60;GET /commoncropnames&#x60; to find the list of
+	 * available crops on a server.
+	 *
+	 * @return commonCropNames
+	 **/
+	public List<String> getCommonCropNames() {
+		return commonCropNames;
+	}
+
+	public void setCommonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+	}
+
+	public BrAPIPersonSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+		return this;
+	}
+
+	public BrAPIPersonSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
+		if (this.externalReferenceIds == null) {
+			this.externalReferenceIds = new ArrayList<String>();
+		}
+		this.externalReferenceIds.add(externalReferenceIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of external reference IDs. Could be a simple strings or a URIs. (use
+	 * with &#x60;externalReferenceSources&#x60; parameter)
+	 *
+	 * @return externalReferenceIds
+	 **/
+	public List<String> getExternalReferenceIds() {
+		return externalReferenceIds;
+	}
+
+	public void setExternalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+	}
+
+	@Deprecated
+	public BrAPIPersonSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+		return this;
+	}
+
+	@Deprecated
+	public BrAPIPersonSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
+		if (this.externalReferenceIDs == null) {
+			this.externalReferenceIDs = new ArrayList<String>();
+		}
+		this.externalReferenceIDs.add(externalReferenceIDsItem);
+		return this;
+	}
+
+	/**
+	 * List of external references for the trait to search for
+	 * 
+	 * @return externalReferenceIDs
+	 **/
+
+	@Deprecated
+	public List<String> getExternalReferenceIDs() {
+		return externalReferenceIDs;
+	}
+
+	@Deprecated
+	public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+	}
+
+	public BrAPIPersonSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+		return this;
+	}
+
+	public BrAPIPersonSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
+		if (this.externalReferenceSources == null) {
+			this.externalReferenceSources = new ArrayList<String>();
+		}
+		this.externalReferenceSources.add(externalReferenceSourcesItem);
+		return this;
+	}
+
+	/**
+	 * List of external references sources for the trait to search for
+	 * 
+	 * @return externalReferenceSources
+	 **/
+
+	public List<String> getExternalReferenceSources() {
+		return externalReferenceSources;
+	}
+
+	public void setExternalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+	}
+
+	public BrAPIPersonSearchRequest emailAddresses(List<String> emailAddresses) {
+		this.emailAddresses = emailAddresses;
+		return this;
+	}
+
+	public BrAPIPersonSearchRequest addEmailAddressesItem(String emailAddressesItem) {
+		if (this.emailAddresses == null) {
+			this.emailAddresses = new ArrayList<String>();
+		}
+		this.emailAddresses.add(emailAddressesItem);
+		return this;
+	}
+
+	/**
+	 * email address for this person
+	 * 
+	 * @return emailAddresses
+	 **/
+
+	public List<String> getEmailAddresses() {
+		return emailAddresses;
+	}
+
+	public void setEmailAddresses(List<String> emailAddresses) {
+		this.emailAddresses = emailAddresses;
+	}
+
+	public BrAPIPersonSearchRequest firstNames(List<String> firstNames) {
+		this.firstNames = firstNames;
+		return this;
+	}
+
+	public BrAPIPersonSearchRequest addFirstNamesItem(String firstNamesItem) {
+		if (this.firstNames == null) {
+			this.firstNames = new ArrayList<String>();
+		}
+		this.firstNames.add(firstNamesItem);
+		return this;
+	}
+
+	/**
+	 * Persons first name
+	 * 
+	 * @return firstNames
+	 **/
+
+	public List<String> getFirstNames() {
+		return firstNames;
+	}
+
+	public void setFirstNames(List<String> firstNames) {
+		this.firstNames = firstNames;
+	}
+
+	public BrAPIPersonSearchRequest lastNames(List<String> lastNames) {
+		this.lastNames = lastNames;
+		return this;
+	}
+
+	public BrAPIPersonSearchRequest addLastNamesItem(String lastNamesItem) {
+		if (this.lastNames == null) {
+			this.lastNames = new ArrayList<String>();
+		}
+		this.lastNames.add(lastNamesItem);
+		return this;
+	}
+
+	/**
+	 * Persons last name
+	 * 
+	 * @return lastNames
+	 **/
+
+	public List<String> getLastNames() {
+		return lastNames;
+	}
+
+	public void setLastNames(List<String> lastNames) {
+		this.lastNames = lastNames;
+	}
+
+	public BrAPIPersonSearchRequest mailingAddresses(List<String> mailingAddresses) {
+		this.mailingAddresses = mailingAddresses;
+		return this;
+	}
+
+	public BrAPIPersonSearchRequest addMailingAddressesItem(String mailingAddressesItem) {
+		if (this.mailingAddresses == null) {
+			this.mailingAddresses = new ArrayList<String>();
+		}
+		this.mailingAddresses.add(mailingAddressesItem);
+		return this;
+	}
+
+	/**
+	 * physical address of this person
+	 * 
+	 * @return mailingAddresses
+	 **/
+
+	public List<String> getMailingAddresses() {
+		return mailingAddresses;
+	}
+
+	public void setMailingAddresses(List<String> mailingAddresses) {
+		this.mailingAddresses = mailingAddresses;
+	}
+
+	public BrAPIPersonSearchRequest middleNames(List<String> middleNames) {
+		this.middleNames = middleNames;
+		return this;
+	}
+
+	public BrAPIPersonSearchRequest addMiddleNamesItem(String middleNamesItem) {
+		if (this.middleNames == null) {
+			this.middleNames = new ArrayList<String>();
+		}
+		this.middleNames.add(middleNamesItem);
+		return this;
+	}
+
+	/**
+	 * Persons middle name
+	 * 
+	 * @return middleNames
+	 **/
+
+	public List<String> getMiddleNames() {
+		return middleNames;
+	}
+
+	public void setMiddleNames(List<String> middleNames) {
+		this.middleNames = middleNames;
+	}
+
+	public BrAPIPersonSearchRequest personDbIds(List<String> personDbIds) {
+		this.personDbIds = personDbIds;
+		return this;
+	}
+
+	public BrAPIPersonSearchRequest addPersonDbIdsItem(String personDbIdsItem) {
+		if (this.personDbIds == null) {
+			this.personDbIds = new ArrayList<String>();
+		}
+		this.personDbIds.add(personDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * Unique ID for this person
+	 * 
+	 * @return personDbIds
+	 **/
+
+	public List<String> getPersonDbIds() {
+		return personDbIds;
+	}
+
+	public void setPersonDbIds(List<String> personDbIds) {
+		this.personDbIds = personDbIds;
+	}
+
+	public BrAPIPersonSearchRequest phoneNumbers(List<String> phoneNumbers) {
+		this.phoneNumbers = phoneNumbers;
+		return this;
+	}
+
+	public BrAPIPersonSearchRequest addPhoneNumbersItem(String phoneNumbersItem) {
+		if (this.phoneNumbers == null) {
+			this.phoneNumbers = new ArrayList<String>();
+		}
+		this.phoneNumbers.add(phoneNumbersItem);
+		return this;
+	}
+
+	/**
+	 * phone number of this person
+	 * 
+	 * @return phoneNumbers
+	 **/
+
+	public List<String> getPhoneNumbers() {
+		return phoneNumbers;
+	}
+
+	public void setPhoneNumbers(List<String> phoneNumbers) {
+		this.phoneNumbers = phoneNumbers;
+	}
+
+	public BrAPIPersonSearchRequest programDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+		return this;
+	}
+
+	public BrAPIPersonSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
+		if (this.programDbIds == null) {
+			this.programDbIds = new ArrayList<String>();
+		}
+		this.programDbIds.add(programDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * A BrAPI Program represents the high level organization or group who is
+	 * responsible for conducting trials and studies. Things like Breeding Programs
+	 * and Funded Projects are considered BrAPI Programs. Use this parameter to only
+	 * return results associated with the given programs. Use &#x60;GET
+	 * /programs&#x60; to find the list of available programs on a server.
+	 *
+	 * @return programDbIds
+	 **/
+	public List<String> getProgramDbIds() {
+		return programDbIds;
+	}
+
+	public void setProgramDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+	}
+
+	public BrAPIPersonSearchRequest programNames(List<String> programNames) {
+		this.programNames = programNames;
+		return this;
+	}
+
+	public BrAPIPersonSearchRequest addProgramNamesItem(String programNamesItem) {
+		if (this.programNames == null) {
+			this.programNames = new ArrayList<String>();
+		}
+		this.programNames.add(programNamesItem);
+		return this;
+	}
+
+	/**
+	 * Use this parameter to only return results associated with the given program
+	 * names. Program names are not required to be unique. Use &#x60;GET
+	 * /programs&#x60; to find the list of available programs on a server.
+	 *
+	 * @return programNames
+	 **/
+	public List<String> getProgramNames() {
+		return programNames;
+	}
+
+	public void setProgramNames(List<String> programNames) {
+		this.programNames = programNames;
+	}
+
+	public BrAPIPersonSearchRequest userIDs(List<String> userIDs) {
+		this.userIDs = userIDs;
+		return this;
+	}
+
+	public BrAPIPersonSearchRequest addUserIDsItem(String userIDsItem) {
+		if (this.userIDs == null) {
+			this.userIDs = new ArrayList<String>();
+		}
+		this.userIDs.add(userIDsItem);
+		return this;
+	}
+
+	/**
+	 * A systems user ID associated with this person. Different from personDbId
+	 * because you could have a person who is not a user of the system.
+	 * 
+	 * @return userIDs
+	 **/
+
+	public List<String> getUserIDs() {
+		return userIDs;
+	}
+
+	public void setUserIDs(List<String> userIDs) {
+		this.userIDs = userIDs;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIPersonSearchRequest personSearchRequest = (BrAPIPersonSearchRequest) o;
+		return Objects.equals(this.commonCropNames, personSearchRequest.commonCropNames)
+				&& Objects.equals(this.emailAddresses, personSearchRequest.emailAddresses)
+				&& Objects.equals(this.externalReferenceIDs, personSearchRequest.externalReferenceIDs)
+				&& Objects.equals(this.externalReferenceIds, personSearchRequest.externalReferenceIds)
+				&& Objects.equals(this.externalReferenceSources, personSearchRequest.externalReferenceSources)
+				&& Objects.equals(this.firstNames, personSearchRequest.firstNames)
+				&& Objects.equals(this.lastNames, personSearchRequest.lastNames)
+				&& Objects.equals(this.mailingAddresses, personSearchRequest.mailingAddresses)
+				&& Objects.equals(this.middleNames, personSearchRequest.middleNames)
+				&& Objects.equals(this.personDbIds, personSearchRequest.personDbIds)
+				&& Objects.equals(this.phoneNumbers, personSearchRequest.phoneNumbers)
+				&& Objects.equals(this.programDbIds, personSearchRequest.programDbIds)
+				&& Objects.equals(this.programNames, personSearchRequest.programNames)
+				&& Objects.equals(this.userIDs, personSearchRequest.userIDs) && super.equals(o);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(commonCropNames, emailAddresses, externalReferenceIDs, externalReferenceIds,
+				externalReferenceSources, firstNames, lastNames, mailingAddresses, middleNames, personDbIds,
+				phoneNumbers, programDbIds, programNames, userIDs);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class BrAPIPersonSearchRequest {\n");
+
+		sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
+		sb.append("    emailAddresses: ").append(toIndentedString(emailAddresses)).append("\n");
+		sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
+		sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
+		sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
+		sb.append("    firstNames: ").append(toIndentedString(firstNames)).append("\n");
+		sb.append("    lastNames: ").append(toIndentedString(lastNames)).append("\n");
+		sb.append("    mailingAddresses: ").append(toIndentedString(mailingAddresses)).append("\n");
+		sb.append("    middleNames: ").append(toIndentedString(middleNames)).append("\n");
+		sb.append("    personDbIds: ").append(toIndentedString(personDbIds)).append("\n");
+		sb.append("    phoneNumbers: ").append(toIndentedString(phoneNumbers)).append("\n");
+		sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
+		sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
+		sb.append("    userIDs: ").append(toIndentedString(userIDs)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 
-public class BrAPIPersonSearchRequest extends BrAPISearchRequestParametersPaging  {
-  @JsonProperty("externalReferenceIDs")
-  @Valid
-  private List<String> externalReferenceIDs = null;
-
-  @JsonProperty("externalReferenceSources")
-  @Valid
-  private List<String> externalReferenceSources = null;
-
-  @JsonProperty("emailAddresses")
-  @Valid
-  private List<String> emailAddresses = null;
-
-  @JsonProperty("firstNames")
-  @Valid
-  private List<String> firstNames = null;
-
-  @JsonProperty("lastNames")
-  @Valid
-  private List<String> lastNames = null;
-
-  @JsonProperty("mailingAddresses")
-  @Valid
-  private List<String> mailingAddresses = null;
-
-  @JsonProperty("middleNames")
-  @Valid
-  private List<String> middleNames = null;
-
-  @JsonProperty("personDbIds")
-  @Valid
-  private List<String> personDbIds = null;
-
-  @JsonProperty("phoneNumbers")
-  @Valid
-  private List<String> phoneNumbers = null;
-
-  @JsonProperty("userIDs")
-  @Valid
-  private List<String> userIDs = null;
-
-  public BrAPIPersonSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-    return this;
-  }
-
-  public BrAPIPersonSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-    if (this.externalReferenceIDs == null) {
-      this.externalReferenceIDs = new ArrayList<String>();
-    }
-    this.externalReferenceIDs.add(externalReferenceIDsItem);
-    return this;
-  }
-
-  /**
-   * List of external references for the trait to search for
-   * @return externalReferenceIDs
-  **/
-  
-  
-    public List<String> getExternalReferenceIDs() {
-    return externalReferenceIDs;
-  }
-
-  public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-  }
-
-  public BrAPIPersonSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-    return this;
-  }
-
-  public BrAPIPersonSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-    if (this.externalReferenceSources == null) {
-      this.externalReferenceSources = new ArrayList<String>();
-    }
-    this.externalReferenceSources.add(externalReferenceSourcesItem);
-    return this;
-  }
-
-  /**
-   * List of external references sources for the trait to search for
-   * @return externalReferenceSources
-  **/
-  
-  
-    public List<String> getExternalReferenceSources() {
-    return externalReferenceSources;
-  }
-
-  public void setExternalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-  }
-
-  public BrAPIPersonSearchRequest emailAddresses(List<String> emailAddresses) {
-    this.emailAddresses = emailAddresses;
-    return this;
-  }
-
-  public BrAPIPersonSearchRequest addEmailAddressesItem(String emailAddressesItem) {
-    if (this.emailAddresses == null) {
-      this.emailAddresses = new ArrayList<String>();
-    }
-    this.emailAddresses.add(emailAddressesItem);
-    return this;
-  }
-
-  /**
-   * email address for this person
-   * @return emailAddresses
-  **/
-  
-  
-    public List<String> getEmailAddresses() {
-    return emailAddresses;
-  }
-
-  public void setEmailAddresses(List<String> emailAddresses) {
-    this.emailAddresses = emailAddresses;
-  }
-
-  public BrAPIPersonSearchRequest firstNames(List<String> firstNames) {
-    this.firstNames = firstNames;
-    return this;
-  }
-
-  public BrAPIPersonSearchRequest addFirstNamesItem(String firstNamesItem) {
-    if (this.firstNames == null) {
-      this.firstNames = new ArrayList<String>();
-    }
-    this.firstNames.add(firstNamesItem);
-    return this;
-  }
-
-  /**
-   * Persons first name
-   * @return firstNames
-  **/
-  
-  
-    public List<String> getFirstNames() {
-    return firstNames;
-  }
-
-  public void setFirstNames(List<String> firstNames) {
-    this.firstNames = firstNames;
-  }
-
-  public BrAPIPersonSearchRequest lastNames(List<String> lastNames) {
-    this.lastNames = lastNames;
-    return this;
-  }
-
-  public BrAPIPersonSearchRequest addLastNamesItem(String lastNamesItem) {
-    if (this.lastNames == null) {
-      this.lastNames = new ArrayList<String>();
-    }
-    this.lastNames.add(lastNamesItem);
-    return this;
-  }
-
-  /**
-   * Persons last name
-   * @return lastNames
-  **/
-  
-  
-    public List<String> getLastNames() {
-    return lastNames;
-  }
-
-  public void setLastNames(List<String> lastNames) {
-    this.lastNames = lastNames;
-  }
-
-  public BrAPIPersonSearchRequest mailingAddresses(List<String> mailingAddresses) {
-    this.mailingAddresses = mailingAddresses;
-    return this;
-  }
-
-  public BrAPIPersonSearchRequest addMailingAddressesItem(String mailingAddressesItem) {
-    if (this.mailingAddresses == null) {
-      this.mailingAddresses = new ArrayList<String>();
-    }
-    this.mailingAddresses.add(mailingAddressesItem);
-    return this;
-  }
-
-  /**
-   * physical address of this person
-   * @return mailingAddresses
-  **/
-  
-  
-    public List<String> getMailingAddresses() {
-    return mailingAddresses;
-  }
-
-  public void setMailingAddresses(List<String> mailingAddresses) {
-    this.mailingAddresses = mailingAddresses;
-  }
-
-  public BrAPIPersonSearchRequest middleNames(List<String> middleNames) {
-    this.middleNames = middleNames;
-    return this;
-  }
-
-  public BrAPIPersonSearchRequest addMiddleNamesItem(String middleNamesItem) {
-    if (this.middleNames == null) {
-      this.middleNames = new ArrayList<String>();
-    }
-    this.middleNames.add(middleNamesItem);
-    return this;
-  }
-
-  /**
-   * Persons middle name
-   * @return middleNames
-  **/
-  
-  
-    public List<String> getMiddleNames() {
-    return middleNames;
-  }
-
-  public void setMiddleNames(List<String> middleNames) {
-    this.middleNames = middleNames;
-  }
-
-  public BrAPIPersonSearchRequest personDbIds(List<String> personDbIds) {
-    this.personDbIds = personDbIds;
-    return this;
-  }
-
-  public BrAPIPersonSearchRequest addPersonDbIdsItem(String personDbIdsItem) {
-    if (this.personDbIds == null) {
-      this.personDbIds = new ArrayList<String>();
-    }
-    this.personDbIds.add(personDbIdsItem);
-    return this;
-  }
-
-  /**
-   * Unique ID for this person
-   * @return personDbIds
-  **/
-  
-  
-    public List<String> getPersonDbIds() {
-    return personDbIds;
-  }
-
-  public void setPersonDbIds(List<String> personDbIds) {
-    this.personDbIds = personDbIds;
-  }
-
-  public BrAPIPersonSearchRequest phoneNumbers(List<String> phoneNumbers) {
-    this.phoneNumbers = phoneNumbers;
-    return this;
-  }
-
-  public BrAPIPersonSearchRequest addPhoneNumbersItem(String phoneNumbersItem) {
-    if (this.phoneNumbers == null) {
-      this.phoneNumbers = new ArrayList<String>();
-    }
-    this.phoneNumbers.add(phoneNumbersItem);
-    return this;
-  }
-
-  /**
-   * phone number of this person
-   * @return phoneNumbers
-  **/
-  
-  
-    public List<String> getPhoneNumbers() {
-    return phoneNumbers;
-  }
-
-  public void setPhoneNumbers(List<String> phoneNumbers) {
-    this.phoneNumbers = phoneNumbers;
-  }
-
-  public BrAPIPersonSearchRequest userIDs(List<String> userIDs) {
-    this.userIDs = userIDs;
-    return this;
-  }
-
-  public BrAPIPersonSearchRequest addUserIDsItem(String userIDsItem) {
-    if (this.userIDs == null) {
-      this.userIDs = new ArrayList<String>();
-    }
-    this.userIDs.add(userIDsItem);
-    return this;
-  }
-
-  /**
-   * A systems user ID associated with this person. Different from personDbId because you could have a person who is not a user of the system.
-   * @return userIDs
-  **/
-  
-  
-    public List<String> getUserIDs() {
-    return userIDs;
-  }
-
-  public void setUserIDs(List<String> userIDs) {
-    this.userIDs = userIDs;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIPersonSearchRequest personSearchRequest = (BrAPIPersonSearchRequest) o;
-    return Objects.equals(this.externalReferenceIDs, personSearchRequest.externalReferenceIDs) &&
-        Objects.equals(this.externalReferenceSources, personSearchRequest.externalReferenceSources) &&
-        Objects.equals(this.emailAddresses, personSearchRequest.emailAddresses) &&
-        Objects.equals(this.firstNames, personSearchRequest.firstNames) &&
-        Objects.equals(this.lastNames, personSearchRequest.lastNames) &&
-        Objects.equals(this.mailingAddresses, personSearchRequest.mailingAddresses) &&
-        Objects.equals(this.middleNames, personSearchRequest.middleNames) &&
-        Objects.equals(this.personDbIds, personSearchRequest.personDbIds) &&
-        Objects.equals(this.phoneNumbers, personSearchRequest.phoneNumbers) &&
-        Objects.equals(this.userIDs, personSearchRequest.userIDs) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(externalReferenceIDs, externalReferenceSources, emailAddresses, firstNames, lastNames, mailingAddresses, middleNames, personDbIds, phoneNumbers, userIDs, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PersonSearchRequest {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-    sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-    sb.append("    emailAddresses: ").append(toIndentedString(emailAddresses)).append("\n");
-    sb.append("    firstNames: ").append(toIndentedString(firstNames)).append("\n");
-    sb.append("    lastNames: ").append(toIndentedString(lastNames)).append("\n");
-    sb.append("    mailingAddresses: ").append(toIndentedString(mailingAddresses)).append("\n");
-    sb.append("    middleNames: ").append(toIndentedString(middleNames)).append("\n");
-    sb.append("    personDbIds: ").append(toIndentedString(personDbIds)).append("\n");
-    sb.append("    phoneNumbers: ").append(toIndentedString(phoneNumbers)).append("\n");
-    sb.append("    userIDs: ").append(toIndentedString(userIDs)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
 }

From f83a2c751a43c35c8d803ba71d94119cfbc3d2b1 Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Thu, 17 Aug 2023 17:05:23 -0400
Subject: [PATCH 11/28] fixes issues #79, #80, #81, #82, #83, #84, #85.
 Dependent on #199

---
 .../germplasm/CrossQueryParams.java           |  28 +-
 .../germplasm/CrossingProjectQueryParams.java |  26 +-
 .../v2/modules/germplasm/CrossesApiTest.java  |  51 +-
 .../org/brapi/v2/model/germ/BrAPICross.java   | 738 ++++++++++--------
 .../germ/BrAPICrossPollinationEvent.java      | 130 +++
 .../v2/model/germ/BrAPICrossingProject.java   | 527 +++++++------
 6 files changed, 870 insertions(+), 630 deletions(-)
 create mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPICrossPollinationEvent.java

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossQueryParams.java
index b87ab8e3..6fd2f91f 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossQueryParams.java
@@ -31,22 +31,28 @@
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(fluent=true)
+@Accessors(fluent = true)
 public class CrossQueryParams extends BrAPIQueryParams {
 
-    private String crossingProjectDbId;
-    private String crossDbId;
-    private String externalReferenceSource;
-    private String externalReferenceId;
-    @Deprecated
-    private String externalReferenceID;
-    
-    public String getExternalReferenceId() {
+	private String commonCropName;
+	private String crossingProjectDbId;
+	private String crossingProjectName;
+	private String crossDbId;
+	private String crossName;
+	private String externalReferenceSource;
+	private String externalReferenceId;
+	@Deprecated
+	private String externalReferenceID;
+	private String programDbId;
+
+	public String getExternalReferenceId() {
 		return externalReferenceId;
 	}
-    public String externalReferenceId() {
+
+	public String externalReferenceId() {
 		return externalReferenceId;
 	}
+
 	public void setExternalReferenceId(String externalReferenceId) {
 		this.externalReferenceId = externalReferenceId;
 	}
@@ -55,10 +61,12 @@ public void setExternalReferenceId(String externalReferenceId) {
 	public String getExternalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public String externalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossingProjectQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossingProjectQueryParams.java
index 85f8e761..b82ad8e3 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossingProjectQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossingProjectQueryParams.java
@@ -31,21 +31,27 @@
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(fluent=true)
+@Accessors(fluent = true)
 public class CrossingProjectQueryParams extends BrAPIQueryParams {
 
-    private String crossingProjectDbId;
-    private String externalReferenceSource;
-    private String externalReferenceId;
-    @Deprecated
-    private String externalReferenceID;
-    
-    public String getExternalReferenceId() {
+	private String commonCropName;
+	private String crossingProjectDbId;
+	private String crossingProjectName;
+	private String externalReferenceId;;
+	@Deprecated
+	private String externalReferenceID;
+	private String externalReferenceSource;
+	private Boolean includePotentialParents;
+	private String programDbId;
+
+	public String getExternalReferenceId() {
 		return externalReferenceId;
 	}
-    public String externalReferenceId() {
+
+	public String externalReferenceId() {
 		return externalReferenceId;
 	}
+
 	public void setExternalReferenceId(String externalReferenceId) {
 		this.externalReferenceId = externalReferenceId;
 	}
@@ -54,10 +60,12 @@ public void setExternalReferenceId(String externalReferenceId) {
 	public String getExternalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public String externalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/CrossesApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/CrossesApiTest.java
index b362175c..a30dbcc6 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/CrossesApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/CrossesApiTest.java
@@ -13,6 +13,7 @@
 package org.brapi.client.v2.modules.germplasm;
 
 import org.brapi.client.v2.ApiResponse;
+import org.brapi.client.v2.BrAPIClientTest;
 import org.brapi.client.v2.model.exceptions.ApiException;
 import org.brapi.client.v2.model.queryParams.germplasm.CrossQueryParams;
 import org.brapi.client.v2.model.queryParams.germplasm.PlannedCrossQueryParams;
@@ -21,15 +22,21 @@
 import org.brapi.v2.model.germ.response.BrAPICrossesListResponse;
 import org.brapi.v2.model.germ.response.BrAPIPlannedCrossesListResponse;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class CrossesApiTest {
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class CrossesApiTest extends BrAPIClientTest{
 
-    private final CrossesApi api = new CrossesApi();
+    private final CrossesApi api = new CrossesApi(this.apiClient);
 
     /**
      * Get a filtered list of Cross entities
@@ -41,17 +48,13 @@ public class CrossesApiTest {
      */
     @Test
     public void crossesGetTest() throws ApiException {
-        String crossingProjectDbId = null;
-        String crossDbId = null;
-        String externalReferenceID = null;
-        String externalReferenceSource = null;
-        Integer page = null;
-        Integer pageSize = null;
+        String crossDbId = "cross1";
         
-        CrossQueryParams queryParams = new CrossQueryParams();
+        CrossQueryParams queryParams = new CrossQueryParams().crossDbId(crossDbId);
         ApiResponse<BrAPICrossesListResponse> response = api.crossesGet(queryParams);
-
-        // TODO: test validations
+        
+        assertEquals(1, response.getBody().getResult().getData().size());
+        assertEquals(crossDbId, response.getBody().getResult().getData().get(0).getCrossDbId());
     }
     /**
      * Create new Cross entities on this server
@@ -63,13 +66,17 @@ public void crossesGetTest() throws ApiException {
      */
     @Test
     public void crossesPostTest() throws ApiException {
-        List<BrAPICross> body = null;
+    	BrAPICross cross = new BrAPICross()
+    			.crossingProjectDbId("crossing_project2")
+    			.crossName("New Name");
+        List<BrAPICross> body = Arrays.asList(cross);
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
         ApiResponse<BrAPICrossesListResponse> response = api.crossesPost(body);
-		});
 
-        // TODO: test validations
+        assertEquals(1, response.getBody().getResult().getData().size());
+        assertNotNull(response.getBody().getResult().getData().get(0).getCrossDbId());
+        assertEquals(cross.getCrossName(), response.getBody().getResult().getData().get(0).getCrossName());
+        assertEquals(cross.getCrossingProjectDbId(), response.getBody().getResult().getData().get(0).getCrossingProjectDbId());
     }
     /**
      * Update existing Cross entities on this server
@@ -81,13 +88,19 @@ public void crossesPostTest() throws ApiException {
      */
     @Test
     public void crossesPutTest() throws ApiException {
-        Map<String, BrAPICross> body = null;
+    	BrAPICross cross = new BrAPICross()
+    			.crossingProjectDbId("crossing_project2")
+    			.crossName("New Name")
+    			.crossDbId("cross1");
+        Map<String, BrAPICross> body = new HashMap<String, BrAPICross>();
+        body.put("cross1", cross);
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
         ApiResponse<BrAPICrossesListResponse> response = api.crossesPut(body);
-		});
 
-        // TODO: test validations
+        assertEquals(1, response.getBody().getResult().getData().size());
+        assertEquals(cross.getCrossDbId(), response.getBody().getResult().getData().get(0).getCrossDbId());
+        assertEquals(cross.getCrossName(), response.getBody().getResult().getData().get(0).getCrossName());
+        assertEquals(cross.getCrossingProjectDbId(), response.getBody().getResult().getData().get(0).getCrossingProjectDbId());
     }
     /**
      * Get a filtered list of Planned Cross entities
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPICross.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPICross.java
index 7e493b8e..359b714e 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPICross.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPICross.java
@@ -12,348 +12,408 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.brapi.v2.model.NullableJsonElementTypeAdapterFactory;
 
-import javax.validation.Valid;
-
-
 /**
  * Cross
  */
 
-
 public class BrAPICross {
-  @JsonProperty("crossDbId")
-  private String crossDbId = null;
-
-  @JsonProperty("additionalInfo")
-  @Valid
-  @JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
-  private JsonObject additionalInfo = null;
-
-  @JsonProperty("crossAttributes")
-  @Valid
-  private List<BrAPICrossCrossAttributes> crossAttributes = null;
-
-  @JsonProperty("crossName")
-  private String crossName = null;
-
-  @JsonProperty("crossType")
-  private BrAPICrossType crossType = null;
-
-  @JsonProperty("crossingProjectDbId")
-  private String crossingProjectDbId = null;
-
-  @JsonProperty("crossingProjectName")
-  private String crossingProjectName = null;
-
-  @JsonProperty("externalReferences")
-  private List<BrAPIExternalReference> externalReferences = null;
-
-  @JsonProperty("parent1")
-  private BrAPICrossParent parent1 = null;
-
-  @JsonProperty("parent2")
-  private BrAPICrossParent parent2 = null;
-
-  @JsonProperty("pollinationTimeStamp")
-  private OffsetDateTime pollinationTimeStamp = null;
-
-  private final transient Gson gson = new Gson();
-
-  public BrAPICross crossDbId(String crossDbId) {
-    this.crossDbId = crossDbId;
-    return this;
-  }
-
-  /**
-   * the unique identifier for a cross
-   * @return crossDbId
-  **/
-  
-  
-    public String getCrossDbId() {
-    return crossDbId;
-  }
-
-  public void setCrossDbId(String crossDbId) {
-    this.crossDbId = crossDbId;
-  }
-
-  public BrAPICross additionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-    return this;
-  }
-
-  public BrAPICross putAdditionalInfoItem(String key, Object additionalInfoItem) {
-    if (this.additionalInfo == null) {
-      this.additionalInfo = new JsonObject();
-    }
-    JsonElement newElement = gson.toJsonTree(additionalInfoItem);
-    this.additionalInfo.add(key, newElement);
-    return this;
-  }
-
-  /**
-   * Additional arbitrary info
-   *
-   * @return additionalInfo
-   **/
-
-
-  public JsonObject getAdditionalInfo() {
-    return additionalInfo;
-  }
-
-  public void setAdditionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-  }
-
-  public BrAPICross crossAttributes(List<BrAPICrossCrossAttributes> crossAttributes) {
-    this.crossAttributes = crossAttributes;
-    return this;
-  }
-
-  public BrAPICross addCrossAttributesItem(BrAPICrossCrossAttributes crossAttributesItem) {
-    if (this.crossAttributes == null) {
-      this.crossAttributes = new ArrayList<BrAPICrossCrossAttributes>();
-    }
-    this.crossAttributes.add(crossAttributesItem);
-    return this;
-  }
-
-  /**
-   * Set of custom attributes associated with a cross
-   *
-   * @return crossAttributes
-   **/
-
-  @Valid
-  public List<BrAPICrossCrossAttributes> getCrossAttributes() {
-    return crossAttributes;
-  }
-
-  public void setCrossAttributes(List<BrAPICrossCrossAttributes> crossAttributes) {
-    this.crossAttributes = crossAttributes;
-  }
-
-  public BrAPICross crossName(String crossName) {
-    this.crossName = crossName;
-    return this;
-  }
-
-  /**
-   * the human readable name for a cross
-   *
-   * @return crossName
-   **/
-
-
-  public String getCrossName() {
-    return crossName;
-  }
-
-  public void setCrossName(String crossName) {
-    this.crossName = crossName;
-  }
-
-  public BrAPICross crossType(BrAPICrossType crossType) {
-    this.crossType = crossType;
-    return this;
-  }
-
-  /**
-   * the type of cross
-   *
-   * @return crossType
-   **/
-
-
-  public BrAPICrossType getCrossType() {
-    return crossType;
-  }
-
-  public void setCrossType(BrAPICrossType crossType) {
-    this.crossType = crossType;
-  }
-
-  public BrAPICross crossingProjectDbId(String crossingProjectDbId) {
-    this.crossingProjectDbId = crossingProjectDbId;
-    return this;
-  }
-
-  /**
-   * the unique identifier for a crossing project
-   *
-   * @return crossingProjectDbId
-   **/
-
-
-  public String getCrossingProjectDbId() {
-    return crossingProjectDbId;
-  }
-
-  public void setCrossingProjectDbId(String crossingProjectDbId) {
-    this.crossingProjectDbId = crossingProjectDbId;
-  }
-
-  public BrAPICross crossingProjectName(String crossingProjectName) {
-    this.crossingProjectName = crossingProjectName;
-    return this;
-  }
-
-  /**
-   * the human readable name for a crossing project
-   *
-   * @return crossingProjectName
-   **/
-
-
-  public String getCrossingProjectName() {
-    return crossingProjectName;
-  }
-
-  public void setCrossingProjectName(String crossingProjectName) {
-    this.crossingProjectName = crossingProjectName;
-  }
-
-  public BrAPICross externalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-    return this;
-  }
-
-  /**
-   * Get externalReferences
-   *
-   * @return externalReferences
-   **/
-
-
-  @Valid
-  public List<BrAPIExternalReference> getExternalReferences() {
-    return externalReferences;
-  }
-
-  public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-  }
-
-  public BrAPICross parent1(BrAPICrossParent parent1) {
-    this.parent1 = parent1;
-    return this;
-  }
-
-  /**
-   * Get parent1
-   *
-   * @return parent1
-   **/
-
-
-  @Valid
-  public BrAPICrossParent getParent1() {
-    return parent1;
-  }
-
-  public void setParent1(BrAPICrossParent parent1) {
-    this.parent1 = parent1;
-  }
-
-  public BrAPICross parent2(BrAPICrossParent parent2) {
-    this.parent2 = parent2;
-    return this;
-  }
-
-  /**
-   * Get parent2
-   *
-   * @return parent2
-   **/
-
-
-  @Valid
-  public BrAPICrossParent getParent2() {
-    return parent2;
-  }
-
-  public void setParent2(BrAPICrossParent parent2) {
-    this.parent2 = parent2;
-  }
-
-  public BrAPICross pollinationTimeStamp(OffsetDateTime pollinationTimeStamp) {
-    this.pollinationTimeStamp = pollinationTimeStamp;
-    return this;
-  }
-
-  /**
-   * the timestamp when the pollination took place
-   *
-   * @return pollinationTimeStamp
-   **/
-
-
-  @Valid
-  public OffsetDateTime getPollinationTimeStamp() {
-    return pollinationTimeStamp;
-  }
-
-  public void setPollinationTimeStamp(OffsetDateTime pollinationTimeStamp) {
-    this.pollinationTimeStamp = pollinationTimeStamp;
-  }
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPICross cross = (BrAPICross) o;
-    return Objects.equals(this.crossDbId, cross.crossDbId) &&
-            Objects.equals(this.additionalInfo, cross.additionalInfo)
-            && Objects.equals(this.crossAttributes, cross.crossAttributes)
-            && Objects.equals(this.crossName, cross.crossName)
-            && Objects.equals(this.crossType, cross.crossType)
-            && Objects.equals(this.crossingProjectDbId, cross.crossingProjectDbId)
-            && Objects.equals(this.crossingProjectName, cross.crossingProjectName)
-            && Objects.equals(this.externalReferences, cross.externalReferences)
-            && Objects.equals(this.parent1, cross.parent1)
-            && Objects.equals(this.parent2, cross.parent2)
-            && Objects.equals(this.pollinationTimeStamp, cross.pollinationTimeStamp);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(crossDbId, additionalInfo, crossAttributes, crossName, crossType, crossingProjectDbId,
-                        crossingProjectName, externalReferences, parent1, parent2, pollinationTimeStamp);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Cross {\n");
-    sb.append("    crossDbId: ").append(toIndentedString(crossDbId)).append("\n");
-    sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-    sb.append("    crossAttributes: ").append(toIndentedString(crossAttributes)).append("\n");
-    sb.append("    crossName: ").append(toIndentedString(crossName)).append("\n");
-    sb.append("    crossType: ").append(toIndentedString(crossType)).append("\n");
-    sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
-    sb.append("    crossingProjectName: ").append(toIndentedString(crossingProjectName)).append("\n");
-    sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-    sb.append("    parent1: ").append(toIndentedString(parent1)).append("\n");
-    sb.append("    parent2: ").append(toIndentedString(parent2)).append("\n");
-    sb.append("    pollinationTimeStamp: ").append(toIndentedString(pollinationTimeStamp)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+	@JsonProperty("crossDbId")
+	private String crossDbId = null;
+
+	@JsonProperty("additionalInfo")
+	@JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
+	private JsonObject additionalInfo = null;
+
+	@JsonProperty("crossAttributes")
+	private List<BrAPICrossCrossAttributes> crossAttributes = null;
+
+	@JsonProperty("crossName")
+	private String crossName = null;
+
+	@JsonProperty("crossType")
+	private BrAPICrossType crossType = null;
+
+	@JsonProperty("crossingProjectDbId")
+	private String crossingProjectDbId = null;
+
+	@JsonProperty("crossingProjectName")
+	private String crossingProjectName = null;
+
+	@JsonProperty("plannedCrossDbId")
+	private String plannedCrossDbId = null;
+
+	@JsonProperty("plannedCrossName")
+	private String plannedCrossName = null;
+
+	@JsonProperty("externalReferences")
+	private List<BrAPIExternalReference> externalReferences = null;
+
+	@JsonProperty("parent1")
+	private BrAPICrossParent parent1 = null;
+
+	@JsonProperty("parent2")
+	private BrAPICrossParent parent2 = null;
+
+	@JsonProperty("pollinationEvents")
+	private List<BrAPICrossPollinationEvent> pollinationEvents = null;
+
+	@Deprecated
+	@JsonProperty("pollinationTimeStamp")
+	private OffsetDateTime pollinationTimeStamp = null;
+
+	private final transient Gson gson = new Gson();
+
+	public BrAPICross crossDbId(String crossDbId) {
+		this.crossDbId = crossDbId;
+		return this;
+	}
+
+	/**
+	 * the unique identifier for a cross
+	 * 
+	 * @return crossDbId
+	 **/
+
+	public String getCrossDbId() {
+		return crossDbId;
+	}
+
+	public void setCrossDbId(String crossDbId) {
+		this.crossDbId = crossDbId;
+	}
+
+	public BrAPICross additionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+		return this;
+	}
+
+	public BrAPICross putAdditionalInfoItem(String key, Object additionalInfoItem) {
+		if (this.additionalInfo == null) {
+			this.additionalInfo = new JsonObject();
+		}
+		JsonElement newElement = gson.toJsonTree(additionalInfoItem);
+		this.additionalInfo.add(key, newElement);
+		return this;
+	}
+
+	/**
+	 * Additional arbitrary info
+	 *
+	 * @return additionalInfo
+	 **/
+
+	public JsonObject getAdditionalInfo() {
+		return additionalInfo;
+	}
+
+	public void setAdditionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+	}
+
+	public BrAPICross crossAttributes(List<BrAPICrossCrossAttributes> crossAttributes) {
+		this.crossAttributes = crossAttributes;
+		return this;
+	}
+
+	public BrAPICross addCrossAttributesItem(BrAPICrossCrossAttributes crossAttributesItem) {
+		if (this.crossAttributes == null) {
+			this.crossAttributes = new ArrayList<BrAPICrossCrossAttributes>();
+		}
+		this.crossAttributes.add(crossAttributesItem);
+		return this;
+	}
+
+	/**
+	 * Set of custom attributes associated with a cross
+	 *
+	 * @return crossAttributes
+	 **/
+
+	public List<BrAPICrossCrossAttributes> getCrossAttributes() {
+		return crossAttributes;
+	}
+
+	public void setCrossAttributes(List<BrAPICrossCrossAttributes> crossAttributes) {
+		this.crossAttributes = crossAttributes;
+	}
+
+	public BrAPICross crossName(String crossName) {
+		this.crossName = crossName;
+		return this;
+	}
+
+	/**
+	 * the human readable name for a cross
+	 *
+	 * @return crossName
+	 **/
+
+	public String getCrossName() {
+		return crossName;
+	}
+
+	public void setCrossName(String crossName) {
+		this.crossName = crossName;
+	}
+
+	public BrAPICross crossType(BrAPICrossType crossType) {
+		this.crossType = crossType;
+		return this;
+	}
+
+	/**
+	 * the type of cross
+	 *
+	 * @return crossType
+	 **/
+
+	public BrAPICrossType getCrossType() {
+		return crossType;
+	}
+
+	public void setCrossType(BrAPICrossType crossType) {
+		this.crossType = crossType;
+	}
+
+	public BrAPICross crossingProjectDbId(String crossingProjectDbId) {
+		this.crossingProjectDbId = crossingProjectDbId;
+		return this;
+	}
+
+	/**
+	 * the unique identifier for a crossing project
+	 *
+	 * @return crossingProjectDbId
+	 **/
+
+	public String getCrossingProjectDbId() {
+		return crossingProjectDbId;
+	}
+
+	public void setCrossingProjectDbId(String crossingProjectDbId) {
+		this.crossingProjectDbId = crossingProjectDbId;
+	}
+
+	public BrAPICross crossingProjectName(String crossingProjectName) {
+		this.crossingProjectName = crossingProjectName;
+		return this;
+	}
+
+	/**
+	 * the human readable name for a crossing project
+	 *
+	 * @return crossingProjectName
+	 **/
+
+	public String getCrossingProjectName() {
+		return crossingProjectName;
+	}
+
+	public void setCrossingProjectName(String crossingProjectName) {
+		this.crossingProjectName = crossingProjectName;
+	}
+
+	public BrAPICross externalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+		return this;
+	}
+
+	/**
+	 * Get externalReferences
+	 *
+	 * @return externalReferences
+	 **/
+
+	public List<BrAPIExternalReference> getExternalReferences() {
+		return externalReferences;
+	}
+
+	public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+	}
+
+	public BrAPICross parent1(BrAPICrossParent parent1) {
+		this.parent1 = parent1;
+		return this;
+	}
+
+	/**
+	 * Get parent1
+	 *
+	 * @return parent1
+	 **/
+
+	public BrAPICrossParent getParent1() {
+		return parent1;
+	}
+
+	public void setParent1(BrAPICrossParent parent1) {
+		this.parent1 = parent1;
+	}
+
+	public BrAPICross parent2(BrAPICrossParent parent2) {
+		this.parent2 = parent2;
+		return this;
+	}
+
+	/**
+	 * Get parent2
+	 *
+	 * @return parent2
+	 **/
+
+	public BrAPICrossParent getParent2() {
+		return parent2;
+	}
+
+	public BrAPICross plannedCrossDbId(String plannedCrossDbId) {
+		this.plannedCrossDbId = plannedCrossDbId;
+		return this;
+	}
+
+	/**
+	 * the unique identifier for a planned cross
+	 *
+	 * @return plannedCrossDbId
+	 **/
+	public String getPlannedCrossDbId() {
+		return plannedCrossDbId;
+	}
+
+	public void setPlannedCrossDbId(String plannedCrossDbId) {
+		this.plannedCrossDbId = plannedCrossDbId;
+	}
+
+	public BrAPICross plannedCrossName(String plannedCrossName) {
+		this.plannedCrossName = plannedCrossName;
+		return this;
+	}
+
+	/**
+	 * the human readable name for a planned cross
+	 *
+	 * @return plannedCrossName
+	 **/
+	public String getPlannedCrossName() {
+		return plannedCrossName;
+	}
+
+	public void setPlannedCrossName(String plannedCrossName) {
+		this.plannedCrossName = plannedCrossName;
+	}
+
+	public BrAPICross pollinationEvents(List<BrAPICrossPollinationEvent> pollinationEvents) {
+		this.pollinationEvents = pollinationEvents;
+		return this;
+	}
+
+	public BrAPICross addPollinationEventsItem(BrAPICrossPollinationEvent pollinationEventsItem) {
+		if (this.pollinationEvents == null) {
+			this.pollinationEvents = new ArrayList<BrAPICrossPollinationEvent>();
+		}
+		this.pollinationEvents.add(pollinationEventsItem);
+		return this;
+	}
+
+	/**
+	 * The list of pollination events that occurred for this cross
+	 *
+	 * @return pollinationEvents
+	 **/
+	public List<BrAPICrossPollinationEvent> getPollinationEvents() {
+		return pollinationEvents;
+	}
+
+	public void setPollinationEvents(List<BrAPICrossPollinationEvent> pollinationEvents) {
+		this.pollinationEvents = pollinationEvents;
+	}
+
+	public void setParent2(BrAPICrossParent parent2) {
+		this.parent2 = parent2;
+	}
+
+	@Deprecated
+	public BrAPICross pollinationTimeStamp(OffsetDateTime pollinationTimeStamp) {
+		this.pollinationTimeStamp = pollinationTimeStamp;
+		return this;
+	}
+
+	/**
+	 * the timestamp when the pollination took place
+	 *
+	 * @return pollinationTimeStamp
+	 **/
+
+	@Deprecated
+	public OffsetDateTime getPollinationTimeStamp() {
+		return pollinationTimeStamp;
+	}
+
+	@Deprecated
+	public void setPollinationTimeStamp(OffsetDateTime pollinationTimeStamp) {
+		this.pollinationTimeStamp = pollinationTimeStamp;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPICross cross = (BrAPICross) o;
+		return Objects.equals(this.additionalInfo, cross.additionalInfo)
+				&& Objects.equals(this.crossAttributes, cross.crossAttributes)
+				&& Objects.equals(this.crossDbId, cross.crossDbId) && Objects.equals(this.crossName, cross.crossName)
+				&& Objects.equals(this.crossType, cross.crossType)
+				&& Objects.equals(this.crossingProjectDbId, cross.crossingProjectDbId)
+				&& Objects.equals(this.crossingProjectName, cross.crossingProjectName)
+				&& Objects.equals(this.externalReferences, cross.externalReferences)
+				&& Objects.equals(this.parent1, cross.parent1) && Objects.equals(this.parent2, cross.parent2)
+				&& Objects.equals(this.plannedCrossDbId, cross.plannedCrossDbId)
+				&& Objects.equals(this.plannedCrossName, cross.plannedCrossName)
+				&& Objects.equals(this.pollinationEvents, cross.pollinationEvents)
+				&& Objects.equals(this.pollinationTimeStamp, cross.pollinationTimeStamp);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(additionalInfo, crossAttributes, crossDbId, crossName, crossType, crossingProjectDbId,
+				crossingProjectName, externalReferences, parent1, parent2, plannedCrossDbId, plannedCrossName,
+				pollinationEvents, pollinationTimeStamp);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class Cross {\n");
+		sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
+		sb.append("    crossAttributes: ").append(toIndentedString(crossAttributes)).append("\n");
+		sb.append("    crossDbId: ").append(toIndentedString(crossDbId)).append("\n");
+		sb.append("    crossName: ").append(toIndentedString(crossName)).append("\n");
+		sb.append("    crossType: ").append(toIndentedString(crossType)).append("\n");
+		sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
+		sb.append("    crossingProjectName: ").append(toIndentedString(crossingProjectName)).append("\n");
+		sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
+		sb.append("    parent1: ").append(toIndentedString(parent1)).append("\n");
+		sb.append("    parent2: ").append(toIndentedString(parent2)).append("\n");
+		sb.append("    plannedCrossDbId: ").append(toIndentedString(plannedCrossDbId)).append("\n");
+		sb.append("    plannedCrossName: ").append(toIndentedString(plannedCrossName)).append("\n");
+		sb.append("    pollinationEvents: ").append(toIndentedString(pollinationEvents)).append("\n");
+		sb.append("    pollinationTimeStamp: ").append(toIndentedString(pollinationTimeStamp)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPICrossPollinationEvent.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPICrossPollinationEvent.java
new file mode 100644
index 00000000..c60175da
--- /dev/null
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPICrossPollinationEvent.java
@@ -0,0 +1,130 @@
+/*
+ * BrAPI-Germplasm
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ *
+ * OpenAPI spec version: 2.1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package org.brapi.v2.model.germ;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.time.OffsetDateTime;
+import java.util.Objects;
+
+/**
+ * CrossPollinationEvents
+ */
+
+public class BrAPICrossPollinationEvent {
+	@JsonProperty("pollinationNumber")
+	private String pollinationNumber = null;
+
+	@JsonProperty("pollinationSuccessful")
+	private Boolean pollinationSuccessful = null;
+
+	@JsonProperty("pollinationTimeStamp")
+	private OffsetDateTime pollinationTimeStamp = null;
+
+	public BrAPICrossPollinationEvent pollinationNumber(String pollinationNumber) {
+		this.pollinationNumber = pollinationNumber;
+		return this;
+	}
+
+	/**
+	 * The unique identifier for this pollination event
+	 *
+	 * @return pollinationNumber
+	 **/
+	public String getPollinationNumber() {
+		return pollinationNumber;
+	}
+
+	public void setPollinationNumber(String pollinationNumber) {
+		this.pollinationNumber = pollinationNumber;
+	}
+
+	public BrAPICrossPollinationEvent pollinationSuccessful(Boolean pollinationSuccessful) {
+		this.pollinationSuccessful = pollinationSuccessful;
+		return this;
+	}
+
+	/**
+	 * True if the pollination was successful
+	 *
+	 * @return pollinationSuccessful
+	 **/
+	public Boolean isPollinationSuccessful() {
+		return pollinationSuccessful;
+	}
+
+	public void setPollinationSuccessful(Boolean pollinationSuccessful) {
+		this.pollinationSuccessful = pollinationSuccessful;
+	}
+
+	public BrAPICrossPollinationEvent pollinationTimeStamp(OffsetDateTime pollinationTimeStamp) {
+		this.pollinationTimeStamp = pollinationTimeStamp;
+		return this;
+	}
+
+	/**
+	 * The timestamp when the pollination took place
+	 *
+	 * @return pollinationTimeStamp
+	 **/
+	public OffsetDateTime getPollinationTimeStamp() {
+		return pollinationTimeStamp;
+	}
+
+	public void setPollinationTimeStamp(OffsetDateTime pollinationTimeStamp) {
+		this.pollinationTimeStamp = pollinationTimeStamp;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPICrossPollinationEvent crossPollinationEvents = (BrAPICrossPollinationEvent) o;
+		return Objects.equals(this.pollinationNumber, crossPollinationEvents.pollinationNumber)
+				&& Objects.equals(this.pollinationSuccessful, crossPollinationEvents.pollinationSuccessful)
+				&& Objects.equals(this.pollinationTimeStamp, crossPollinationEvents.pollinationTimeStamp);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(pollinationNumber, pollinationSuccessful, pollinationTimeStamp);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class CrossPollinationEvents {\n");
+
+		sb.append("    pollinationNumber: ").append(toIndentedString(pollinationNumber)).append("\n");
+		sb.append("    pollinationSuccessful: ").append(toIndentedString(pollinationSuccessful)).append("\n");
+		sb.append("    pollinationTimeStamp: ").append(toIndentedString(pollinationTimeStamp)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
+
+}
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPICrossingProject.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPICrossingProject.java
index 57f4e46e..0761f893 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPICrossingProject.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPICrossingProject.java
@@ -1,8 +1,7 @@
 package org.brapi.v2.model.germ;
 
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
 import com.google.gson.Gson;
@@ -14,259 +13,281 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.brapi.v2.model.NullableJsonElementTypeAdapterFactory;
 
-import javax.validation.Valid;
-
-
 /**
  * CrossingProject
  */
 
-
-public class BrAPICrossingProject  {
-  @JsonProperty("crossingProjectDbId")
-  private String crossingProjectDbId = null;
-
-  @JsonProperty("additionalInfo")
-  @Valid
-  @JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
-  private JsonObject additionalInfo = null;
-
-  @JsonProperty("commonCropName")
-  private String commonCropName = null;
-
-  @JsonProperty("crossingProjectDescription")
-  private String crossingProjectDescription = null;
-
-  @JsonProperty("crossingProjectName")
-  private String crossingProjectName = null;
-
-  @JsonProperty("externalReferences")
-  private List<BrAPIExternalReference> externalReferences = null;
-
-  @JsonProperty("programDbId")
-  private String programDbId = null;
-
-  @JsonProperty("programName")
-  private String programName = null;
-
-  private final transient Gson gson = new Gson();
-
-  public BrAPICrossingProject crossingProjectDbId(String crossingProjectDbId) {
-    this.crossingProjectDbId = crossingProjectDbId;
-    return this;
-  }
-
-  /**
-   * the unique identifier for a crossing project
-   * @return crossingProjectDbId
-  **/
-  
-  
-    public String getCrossingProjectDbId() {
-    return crossingProjectDbId;
-  }
-
-  public void setCrossingProjectDbId(String crossingProjectDbId) {
-    this.crossingProjectDbId = crossingProjectDbId;
-  }
-
-  public BrAPICrossingProject additionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-    return this;
-  }
-
-  public BrAPICrossingProject putAdditionalInfoItem(String key, Object additionalInfoItem) {
-    if (this.additionalInfo == null) {
-      this.additionalInfo = new JsonObject();
-    }
-    JsonElement newElement = gson.toJsonTree(additionalInfoItem);
-    this.additionalInfo.add(key, newElement);
-    return this;
-  }
-
-  /**
-   * Additional arbitrary info
-   *
-   * @return additionalInfo
-   **/
-
-
-  public JsonObject getAdditionalInfo() {
-    return additionalInfo;
-  }
-
-  public void setAdditionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-  }
-
-  public BrAPICrossingProject commonCropName(String commonCropName) {
-    this.commonCropName = commonCropName;
-    return this;
-  }
-
-  /**
-   * the common name of a crop (for multi-crop systems)
-   *
-   * @return commonCropName
-   **/
-
-
-  public String getCommonCropName() {
-    return commonCropName;
-  }
-
-  public void setCommonCropName(String commonCropName) {
-    this.commonCropName = commonCropName;
-  }
-
-  public BrAPICrossingProject crossingProjectDescription(String crossingProjectDescription) {
-    this.crossingProjectDescription = crossingProjectDescription;
-    return this;
-  }
-
-  /**
-   * the description for a crossing project
-   *
-   * @return crossingProjectDescription
-   **/
-
-
-  public String getCrossingProjectDescription() {
-    return crossingProjectDescription;
-  }
-
-  public void setCrossingProjectDescription(String crossingProjectDescription) {
-    this.crossingProjectDescription = crossingProjectDescription;
-  }
-
-  public BrAPICrossingProject crossingProjectName(String crossingProjectName) {
-    this.crossingProjectName = crossingProjectName;
-    return this;
-  }
-
-  /**
-   * the human readable name for a crossing project
-   *
-   * @return crossingProjectName
-   **/
-
-
-  public String getCrossingProjectName() {
-    return crossingProjectName;
-  }
-
-  public void setCrossingProjectName(String crossingProjectName) {
-    this.crossingProjectName = crossingProjectName;
-  }
-
-  public BrAPICrossingProject externalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-    return this;
-  }
-
-  /**
-   * Get externalReferences
-   *
-   * @return externalReferences
-   **/
-
-
-  @Valid
-  public List<BrAPIExternalReference> getExternalReferences() {
-    return externalReferences;
-  }
-
-  public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-  }
-
-  public BrAPICrossingProject programDbId(String programDbId) {
-    this.programDbId = programDbId;
-    return this;
-  }
-
-  /**
-   * the unique identifier for a program
-   *
-   * @return programDbId
-   **/
-
-
-  public String getProgramDbId() {
-    return programDbId;
-  }
-
-  public void setProgramDbId(String programDbId) {
-    this.programDbId = programDbId;
-  }
-
-  public BrAPICrossingProject programName(String programName) {
-    this.programName = programName;
-    return this;
-  }
-
-  /**
-   * the human readable name for a program
-   *
-   * @return programName
-   **/
-
-
-  public String getProgramName() {
-    return programName;
-  }
-
-  public void setProgramName(String programName) {
-    this.programName = programName;
-  }
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPICrossingProject crossingProject = (BrAPICrossingProject) o;
-    return Objects.equals(this.crossingProjectDbId, crossingProject.crossingProjectDbId) &&
-            Objects.equals(this.commonCropName, crossingProject.commonCropName)
-            && Objects.equals(this.crossingProjectDescription, crossingProject.crossingProjectDescription)
-            && Objects.equals(this.crossingProjectName, crossingProject.crossingProjectName)
-            && Objects.equals(this.externalReferences, crossingProject.externalReferences)
-            && Objects.equals(this.programDbId, crossingProject.programDbId)
-            && Objects.equals(this.programName, crossingProject.programName);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(crossingProjectDbId, commonCropName, crossingProjectDescription, crossingProjectName, externalReferences,
-                        programDbId, programName);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CrossingProject {\n");
-    sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
-    sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-    sb.append("    crossingProjectDescription: ").append(toIndentedString(crossingProjectDescription)).append("\n");
-    sb.append("    crossingProjectName: ").append(toIndentedString(crossingProjectName)).append("\n");
-    sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-    sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-    sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+public class BrAPICrossingProject {
+	@JsonProperty("crossingProjectDbId")
+	private String crossingProjectDbId = null;
+
+	@JsonProperty("additionalInfo")
+	@JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
+	private JsonObject additionalInfo = null;
+
+	@JsonProperty("commonCropName")
+	private String commonCropName = null;
+
+	@JsonProperty("crossingProjectDescription")
+	private String crossingProjectDescription = null;
+
+	@JsonProperty("crossingProjectName")
+	private String crossingProjectName = null;
+
+	@JsonProperty("externalReferences")
+	private List<BrAPIExternalReference> externalReferences = null;
+
+	@JsonProperty("potentialParents")
+	private List<BrAPICrossParent> potentialParents = null;
+
+	@JsonProperty("programDbId")
+	private String programDbId = null;
+
+	@JsonProperty("programName")
+	private String programName = null;
+
+	private final transient Gson gson = new Gson();
+
+	public BrAPICrossingProject crossingProjectDbId(String crossingProjectDbId) {
+		this.crossingProjectDbId = crossingProjectDbId;
+		return this;
+	}
+
+	/**
+	 * the unique identifier for a crossing project
+	 * 
+	 * @return crossingProjectDbId
+	 **/
+
+	public String getCrossingProjectDbId() {
+		return crossingProjectDbId;
+	}
+
+	public void setCrossingProjectDbId(String crossingProjectDbId) {
+		this.crossingProjectDbId = crossingProjectDbId;
+	}
+
+	public BrAPICrossingProject additionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+		return this;
+	}
+
+	public BrAPICrossingProject putAdditionalInfoItem(String key, Object additionalInfoItem) {
+		if (this.additionalInfo == null) {
+			this.additionalInfo = new JsonObject();
+		}
+		JsonElement newElement = gson.toJsonTree(additionalInfoItem);
+		this.additionalInfo.add(key, newElement);
+		return this;
+	}
+
+	/**
+	 * Additional arbitrary info
+	 *
+	 * @return additionalInfo
+	 **/
+
+	public JsonObject getAdditionalInfo() {
+		return additionalInfo;
+	}
+
+	public void setAdditionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+	}
+
+	public BrAPICrossingProject commonCropName(String commonCropName) {
+		this.commonCropName = commonCropName;
+		return this;
+	}
+
+	/**
+	 * the common name of a crop (for multi-crop systems)
+	 *
+	 * @return commonCropName
+	 **/
+
+	public String getCommonCropName() {
+		return commonCropName;
+	}
+
+	public void setCommonCropName(String commonCropName) {
+		this.commonCropName = commonCropName;
+	}
+
+	public BrAPICrossingProject crossingProjectDescription(String crossingProjectDescription) {
+		this.crossingProjectDescription = crossingProjectDescription;
+		return this;
+	}
+
+	/**
+	 * the description for a crossing project
+	 *
+	 * @return crossingProjectDescription
+	 **/
+
+	public String getCrossingProjectDescription() {
+		return crossingProjectDescription;
+	}
+
+	public void setCrossingProjectDescription(String crossingProjectDescription) {
+		this.crossingProjectDescription = crossingProjectDescription;
+	}
+
+	public BrAPICrossingProject crossingProjectName(String crossingProjectName) {
+		this.crossingProjectName = crossingProjectName;
+		return this;
+	}
+
+	/**
+	 * the human readable name for a crossing project
+	 *
+	 * @return crossingProjectName
+	 **/
+
+	public String getCrossingProjectName() {
+		return crossingProjectName;
+	}
+
+	public void setCrossingProjectName(String crossingProjectName) {
+		this.crossingProjectName = crossingProjectName;
+	}
+
+	public BrAPICrossingProject externalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+		return this;
+	}
+
+	/**
+	 * Get externalReferences
+	 *
+	 * @return externalReferences
+	 **/
+
+	public List<BrAPIExternalReference> getExternalReferences() {
+		return externalReferences;
+	}
+
+	public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+	}
+
+	public BrAPICrossingProject potentialParents(List<BrAPICrossParent> potentialParents) {
+		this.potentialParents = potentialParents;
+		return this;
+	}
+
+	public BrAPICrossingProject addPotentialParentsItem(BrAPICrossParent potentialParentsItem) {
+		if (this.potentialParents == null) {
+			this.potentialParents = new ArrayList<BrAPICrossParent>();
+		}
+		this.potentialParents.add(potentialParentsItem);
+		return this;
+	}
+
+	/**
+	 * A list of all the potential parents in the crossing block, available in the
+	 * crossing project &lt;br/&gt; If the parameter
+	 * &#x27;includePotentialParents&#x27; is false, the array
+	 * &#x27;potentialParents&#x27; should be empty, null, or excluded from the
+	 * response object.
+	 *
+	 * @return potentialParents
+	 **/
+	public List<BrAPICrossParent> getPotentialParents() {
+		return potentialParents;
+	}
+
+	public void setPotentialParents(List<BrAPICrossParent> potentialParents) {
+		this.potentialParents = potentialParents;
+	}
+
+	public BrAPICrossingProject programDbId(String programDbId) {
+		this.programDbId = programDbId;
+		return this;
+	}
+
+	/**
+	 * the unique identifier for a program
+	 *
+	 * @return programDbId
+	 **/
+
+	public String getProgramDbId() {
+		return programDbId;
+	}
+
+	public void setProgramDbId(String programDbId) {
+		this.programDbId = programDbId;
+	}
+
+	public BrAPICrossingProject programName(String programName) {
+		this.programName = programName;
+		return this;
+	}
+
+	/**
+	 * the human readable name for a program
+	 *
+	 * @return programName
+	 **/
+
+	public String getProgramName() {
+		return programName;
+	}
+
+	public void setProgramName(String programName) {
+		this.programName = programName;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPICrossingProject crossingProject = (BrAPICrossingProject) o;
+		return Objects.equals(this.crossingProjectDbId, crossingProject.crossingProjectDbId)
+				&& Objects.equals(this.commonCropName, crossingProject.commonCropName)
+				&& Objects.equals(this.crossingProjectDescription, crossingProject.crossingProjectDescription)
+				&& Objects.equals(this.crossingProjectName, crossingProject.crossingProjectName)
+				&& Objects.equals(this.externalReferences, crossingProject.externalReferences)
+				&& Objects.equals(this.potentialParents, crossingProject.potentialParents)
+				&& Objects.equals(this.programDbId, crossingProject.programDbId)
+				&& Objects.equals(this.programName, crossingProject.programName);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(crossingProjectDbId, commonCropName, crossingProjectDescription, crossingProjectName,
+				externalReferences, potentialParents, programDbId, programName);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class CrossingProject {\n");
+		sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
+		sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
+		sb.append("    crossingProjectDescription: ").append(toIndentedString(crossingProjectDescription)).append("\n");
+		sb.append("    crossingProjectName: ").append(toIndentedString(crossingProjectName)).append("\n");
+		sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
+		sb.append("    potentialParents: ").append(toIndentedString(potentialParents)).append("\n");
+		sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
+		sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 }

From 494dfc7feab7f06b5a10c4006a16f3f608e8cec3 Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Fri, 18 Aug 2023 10:52:02 -0400
Subject: [PATCH 12/28] fixes #86

---
 .../org/brapi/v2/model/pheno/BrAPIEvent.java  | 646 ++++++++++--------
 .../v2/model/pheno/BrAPIEventDateRange.java   | 145 ++++
 .../pheno/BrAPIEventEventParameters.java      | 124 ----
 .../v2/model/pheno/BrAPIEventParameters.java  | 294 ++++++++
 4 files changed, 783 insertions(+), 426 deletions(-)
 create mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIEventDateRange.java
 delete mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIEventEventParameters.java
 create mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIEventParameters.java

diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIEvent.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIEvent.java
index fda1baad..3e6aeec9 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIEvent.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIEvent.java
@@ -4,319 +4,361 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.time.OffsetDateTime;
 
-import javax.validation.Valid;
-
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.JsonAdapter;
 import org.brapi.v2.model.NullableJsonElementTypeAdapterFactory;
-import org.brapi.v2.model.pheno.BrAPIEventEventParameters;
-
 
 /**
  * Event
  */
 
-
-public class BrAPIEvent   {
-  @JsonProperty("additionalInfo")
-  @Valid
-  @JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
-  private JsonObject additionalInfo = null;
-
-  @JsonProperty("date")
-  @Valid
-  private List<OffsetDateTime> date = null;
-
-  @JsonProperty("eventDbId")
-  private String eventDbId = null;
-
-  @JsonProperty("eventDescription")
-  private String eventDescription = null;
-
-  @JsonProperty("eventParameters")
-  @Valid
-  private List<BrAPIEventEventParameters> eventParameters = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("eventTypeDbId")
-  private String eventTypeDbId = null;
-
-  @JsonProperty("observationUnitDbIds")
-  @Valid
-  private List<String> observationUnitDbIds = null;
-
-  @JsonProperty("studyDbId")
-  private String studyDbId = null;
-
-  private final transient Gson gson = new Gson();
-
-  public BrAPIEvent additionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-    return this;
-  }
-
-  public BrAPIEvent putAdditionalInfoItem(String key, Object additionalInfoItem) {
-    if (this.additionalInfo == null) {
-      this.additionalInfo = new JsonObject();
-    }
-    JsonElement newElement = gson.toJsonTree(additionalInfoItem);
-    this.additionalInfo.add(key, newElement);
-    return this;
-  }
-
-  /**
-   * Additional arbitrary info
-   * @return additionalInfo
-  **/
-  
-  
-    public JsonObject getAdditionalInfo() {
-    return additionalInfo;
-  }
-
-  public void setAdditionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-  }
-
-  public BrAPIEvent date(List<OffsetDateTime> date) {
-    this.date = date;
-    return this;
-  }
-
-  public BrAPIEvent addDateItem(OffsetDateTime dateItem) {
-    if (this.date == null) {
-      this.date = new ArrayList<OffsetDateTime>();
-    }
-    this.date.add(dateItem);
-    return this;
-  }
-
-  /**
-   * A list of dates when the event occured  MIAPPE V1.1 (DM-68) Event date - Date and time of the event.
-   * @return date
-  **/
-  
-      @Valid
-    public List<OffsetDateTime> getDate() {
-    return date;
-  }
-
-  public void setDate(List<OffsetDateTime> date) {
-    this.date = date;
-  }
-
-  public BrAPIEvent eventDbId(String eventDbId) {
-    this.eventDbId = eventDbId;
-    return this;
-  }
-
-  /**
-   * Internal database identifier
-   * @return eventDbId
-  **/
-  
-      
-
-    public String getEventDbId() {
-    return eventDbId;
-  }
-
-  public void setEventDbId(String eventDbId) {
-    this.eventDbId = eventDbId;
-  }
-
-  public BrAPIEvent eventDescription(String eventDescription) {
-    this.eventDescription = eventDescription;
-    return this;
-  }
-
-  /**
-   * A detailed, human-readable description of this event  MIAPPE V1.1 (DM-67) Event description - Description of the event, including details such as amount applied and possibly duration of the event. 
-   * @return eventDescription
-  **/
-  
-  
-    public String getEventDescription() {
-    return eventDescription;
-  }
-
-  public void setEventDescription(String eventDescription) {
-    this.eventDescription = eventDescription;
-  }
-
-  public BrAPIEvent eventParameters(List<BrAPIEventEventParameters> eventParameters) {
-    this.eventParameters = eventParameters;
-    return this;
-  }
-
-  public BrAPIEvent addEventParametersItem(BrAPIEventEventParameters eventParametersItem) {
-    if (this.eventParameters == null) {
-      this.eventParameters = new ArrayList<BrAPIEventEventParameters>();
-    }
-    this.eventParameters.add(eventParametersItem);
-    return this;
-  }
-
-  /**
-   * A list of objects describing additional event parameters. Each of the following accepts a human-readable value or URI
-   * @return eventParameters
-  **/
-  
-      @Valid
-    public List<BrAPIEventEventParameters> getEventParameters() {
-    return eventParameters;
-  }
-
-  public void setEventParameters(List<BrAPIEventEventParameters> eventParameters) {
-    this.eventParameters = eventParameters;
-  }
-
-  public BrAPIEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * General category for this event (e.g. Sowing, Watering, Rain). Each eventType should correspond to exactly one eventTypeDbId, if provided.  MIAPPE V1.1 (DM-65) Event type - Short name of the event.
-   * @return eventType
-  **/
-  
-      
-
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public BrAPIEvent eventTypeDbId(String eventTypeDbId) {
-    this.eventTypeDbId = eventTypeDbId;
-    return this;
-  }
-
-  /**
-   * An identifier for this event type, in the form of an ontology class reference  MIAPPE V1.1 (DM-66) Event accession number - Accession number of the event type in a suitable controlled vocabulary (Crop Ontology).
-   * @return eventTypeDbId
-  **/
-  
-  
-    public String getEventTypeDbId() {
-    return eventTypeDbId;
-  }
-
-  public void setEventTypeDbId(String eventTypeDbId) {
-    this.eventTypeDbId = eventTypeDbId;
-  }
-
-  public BrAPIEvent observationUnitDbIds(List<String> observationUnitDbIds) {
-    this.observationUnitDbIds = observationUnitDbIds;
-    return this;
-  }
-
-  public BrAPIEvent addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-    if (this.observationUnitDbIds == null) {
-      this.observationUnitDbIds = new ArrayList<String>();
-    }
-    this.observationUnitDbIds.add(observationUnitDbIdsItem);
-    return this;
-  }
-
-  /**
-   * A list of the affected observation units. If this parameter is not given, it is understood that the event affected all units in the study
-   * @return observationUnitDbIds
-  **/
-  
-  
-    public List<String> getObservationUnitDbIds() {
-    return observationUnitDbIds;
-  }
-
-  public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-    this.observationUnitDbIds = observationUnitDbIds;
-  }
-
-  public BrAPIEvent studyDbId(String studyDbId) {
-    this.studyDbId = studyDbId;
-    return this;
-  }
-
-  /**
-   * The study in which the event occurred
-   * @return studyDbId
-  **/
-  
-  
-    public String getStudyDbId() {
-    return studyDbId;
-  }
-
-  public void setStudyDbId(String studyDbId) {
-    this.studyDbId = studyDbId;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIEvent event = (BrAPIEvent) o;
-    return Objects.equals(this.additionalInfo, event.additionalInfo) &&
-        Objects.equals(this.date, event.date) &&
-        Objects.equals(this.eventDbId, event.eventDbId) &&
-        Objects.equals(this.eventDescription, event.eventDescription) &&
-        Objects.equals(this.eventParameters, event.eventParameters) &&
-        Objects.equals(this.eventType, event.eventType) &&
-        Objects.equals(this.eventTypeDbId, event.eventTypeDbId) &&
-        Objects.equals(this.observationUnitDbIds, event.observationUnitDbIds) &&
-        Objects.equals(this.studyDbId, event.studyDbId);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(additionalInfo, date, eventDbId, eventDescription, eventParameters, eventType, eventTypeDbId, observationUnitDbIds, studyDbId);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Event {\n");
-    
-    sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    eventDbId: ").append(toIndentedString(eventDbId)).append("\n");
-    sb.append("    eventDescription: ").append(toIndentedString(eventDescription)).append("\n");
-    sb.append("    eventParameters: ").append(toIndentedString(eventParameters)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    eventTypeDbId: ").append(toIndentedString(eventTypeDbId)).append("\n");
-    sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-    sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+public class BrAPIEvent {
+	@JsonProperty("additionalInfo")
+	@JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
+	private JsonObject additionalInfo = null;
+
+	@Deprecated
+	@JsonProperty("date")
+	private List<OffsetDateTime> date = null;
+
+	@JsonProperty("eventDateRange")
+	private BrAPIEventDateRange eventDateRange = null;
+
+	@JsonProperty("eventDbId")
+	private String eventDbId = null;
+
+	@JsonProperty("eventDescription")
+	private String eventDescription = null;
+
+	@JsonProperty("eventParameters")
+	private List<BrAPIEventParameters> eventParameters = null;
+
+	@JsonProperty("eventType")
+	private String eventType = null;
+
+	@JsonProperty("eventTypeDbId")
+	private String eventTypeDbId = null;
+
+	@JsonProperty("observationUnitDbIds")
+	private List<String> observationUnitDbIds = null;
+
+	@JsonProperty("studyDbId")
+	private String studyDbId = null;
+
+	@JsonProperty("studyName")
+	private String studyName = null;
+
+	private final transient Gson gson = new Gson();
+
+	public BrAPIEvent additionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+		return this;
+	}
+
+	public BrAPIEvent putAdditionalInfoItem(String key, Object additionalInfoItem) {
+		if (this.additionalInfo == null) {
+			this.additionalInfo = new JsonObject();
+		}
+		JsonElement newElement = gson.toJsonTree(additionalInfoItem);
+		this.additionalInfo.add(key, newElement);
+		return this;
+	}
+
+	/**
+	 * Additional arbitrary info
+	 * 
+	 * @return additionalInfo
+	 **/
+
+	public JsonObject getAdditionalInfo() {
+		return additionalInfo;
+	}
+
+	public void setAdditionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+	}
+
+	@Deprecated
+	public BrAPIEvent date(List<OffsetDateTime> date) {
+		this.date = date;
+		return this;
+	}
+
+	@Deprecated
+	public BrAPIEvent addDateItem(OffsetDateTime dateItem) {
+		if (this.date == null) {
+			this.date = new ArrayList<OffsetDateTime>();
+		}
+		this.date.add(dateItem);
+		return this;
+	}
+
+	/**
+	 * A list of dates when the event occured MIAPPE V1.1 (DM-68) Event date - Date
+	 * and time of the event.
+	 * 
+	 * @return date
+	 **/
+
+	@Deprecated
+	public List<OffsetDateTime> getDate() {
+		return date;
+	}
+
+	@Deprecated
+	public void setDate(List<OffsetDateTime> date) {
+		this.date = date;
+	}
+
+	public BrAPIEvent eventDateRange(BrAPIEventDateRange eventDateRange) {
+		this.eventDateRange = eventDateRange;
+		return this;
+	}
+
+	/**
+	 * Get eventDateRange
+	 *
+	 * @return eventDateRange
+	 **/
+	public BrAPIEventDateRange getEventDateRange() {
+		return eventDateRange;
+	}
+
+	public void setEventDateRange(BrAPIEventDateRange eventDateRange) {
+		this.eventDateRange = eventDateRange;
+	}
+
+	public BrAPIEvent eventDbId(String eventDbId) {
+		this.eventDbId = eventDbId;
+		return this;
+	}
+
+	/**
+	 * Internal database identifier
+	 * 
+	 * @return eventDbId
+	 **/
+
+	public String getEventDbId() {
+		return eventDbId;
+	}
+
+	public void setEventDbId(String eventDbId) {
+		this.eventDbId = eventDbId;
+	}
+
+	public BrAPIEvent eventDescription(String eventDescription) {
+		this.eventDescription = eventDescription;
+		return this;
+	}
+
+	/**
+	 * A detailed, human-readable description of this event MIAPPE V1.1 (DM-67)
+	 * Event description - Description of the event, including details such as
+	 * amount applied and possibly duration of the event.
+	 * 
+	 * @return eventDescription
+	 **/
+
+	public String getEventDescription() {
+		return eventDescription;
+	}
+
+	public void setEventDescription(String eventDescription) {
+		this.eventDescription = eventDescription;
+	}
+
+	public BrAPIEvent eventParameters(List<BrAPIEventParameters> eventParameters) {
+		this.eventParameters = eventParameters;
+		return this;
+	}
+
+	public BrAPIEvent addEventParametersItem(BrAPIEventParameters eventParametersItem) {
+		if (this.eventParameters == null) {
+			this.eventParameters = new ArrayList<BrAPIEventParameters>();
+		}
+		this.eventParameters.add(eventParametersItem);
+		return this;
+	}
+
+	/**
+	 * A list of objects describing additional event parameters. Each of the
+	 * following accepts a human-readable value or URI
+	 * 
+	 * @return eventParameters
+	 **/
+
+	public List<BrAPIEventParameters> getEventParameters() {
+		return eventParameters;
+	}
+
+	public void setEventParameters(List<BrAPIEventParameters> eventParameters) {
+		this.eventParameters = eventParameters;
+	}
+
+	public BrAPIEvent eventType(String eventType) {
+		this.eventType = eventType;
+		return this;
+	}
+
+	/**
+	 * General category for this event (e.g. Sowing, Watering, Rain). Each eventType
+	 * should correspond to exactly one eventTypeDbId, if provided. MIAPPE V1.1
+	 * (DM-65) Event type - Short name of the event.
+	 * 
+	 * @return eventType
+	 **/
+
+	public String getEventType() {
+		return eventType;
+	}
+
+	public void setEventType(String eventType) {
+		this.eventType = eventType;
+	}
+
+	public BrAPIEvent eventTypeDbId(String eventTypeDbId) {
+		this.eventTypeDbId = eventTypeDbId;
+		return this;
+	}
+
+	/**
+	 * An identifier for this event type, in the form of an ontology class reference
+	 * MIAPPE V1.1 (DM-66) Event accession number - Accession number of the event
+	 * type in a suitable controlled vocabulary (Crop Ontology).
+	 * 
+	 * @return eventTypeDbId
+	 **/
+
+	public String getEventTypeDbId() {
+		return eventTypeDbId;
+	}
+
+	public void setEventTypeDbId(String eventTypeDbId) {
+		this.eventTypeDbId = eventTypeDbId;
+	}
+
+	public BrAPIEvent observationUnitDbIds(List<String> observationUnitDbIds) {
+		this.observationUnitDbIds = observationUnitDbIds;
+		return this;
+	}
+
+	public BrAPIEvent addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
+		if (this.observationUnitDbIds == null) {
+			this.observationUnitDbIds = new ArrayList<String>();
+		}
+		this.observationUnitDbIds.add(observationUnitDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * A list of the affected observation units. If this parameter is not given, it
+	 * is understood that the event affected all units in the study
+	 * 
+	 * @return observationUnitDbIds
+	 **/
+
+	public List<String> getObservationUnitDbIds() {
+		return observationUnitDbIds;
+	}
+
+	public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
+		this.observationUnitDbIds = observationUnitDbIds;
+	}
+
+	public BrAPIEvent studyDbId(String studyDbId) {
+		this.studyDbId = studyDbId;
+		return this;
+	}
+
+	/**
+	 * The study in which the event occurred
+	 * 
+	 * @return studyDbId
+	 **/
+
+	public String getStudyDbId() {
+		return studyDbId;
+	}
+
+	public void setStudyDbId(String studyDbId) {
+		this.studyDbId = studyDbId;
+	}
+
+	public BrAPIEvent studyName(String studyName) {
+		this.studyName = studyName;
+		return this;
+	}
+
+	/**
+	 * The human readable name of a study
+	 *
+	 * @return studyName
+	 **/
+	public String getStudyName() {
+		return studyName;
+	}
+
+	public void setStudyName(String studyName) {
+		this.studyName = studyName;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIEvent event = (BrAPIEvent) o;
+		return Objects.equals(this.additionalInfo, event.additionalInfo) && Objects.equals(this.date, event.date)
+				&& Objects.equals(this.eventDbId, event.eventDbId)
+				&& Objects.equals(this.eventDescription, event.eventDescription)
+				&& Objects.equals(this.eventParameters, event.eventParameters)
+				&& Objects.equals(this.eventType, event.eventType)
+				&& Objects.equals(this.eventTypeDbId, event.eventTypeDbId)
+				&& Objects.equals(this.observationUnitDbIds, event.observationUnitDbIds)
+				&& Objects.equals(this.studyDbId, event.studyDbId);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(additionalInfo, date, eventDbId, eventDescription, eventParameters, eventType,
+				eventTypeDbId, observationUnitDbIds, studyDbId);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class Event {\n");
+
+		sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
+		sb.append("    date: ").append(toIndentedString(date)).append("\n");
+		sb.append("    eventDbId: ").append(toIndentedString(eventDbId)).append("\n");
+		sb.append("    eventDescription: ").append(toIndentedString(eventDescription)).append("\n");
+		sb.append("    eventParameters: ").append(toIndentedString(eventParameters)).append("\n");
+		sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
+		sb.append("    eventTypeDbId: ").append(toIndentedString(eventTypeDbId)).append("\n");
+		sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
+		sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIEventDateRange.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIEventDateRange.java
new file mode 100644
index 00000000..f487d773
--- /dev/null
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIEventDateRange.java
@@ -0,0 +1,145 @@
+/*
+ * BrAPI-Phenotyping
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ *
+ * OpenAPI spec version: 2.1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package org.brapi.v2.model.pheno;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.time.OffsetDateTime;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * An object describing when a particular Event has taken place. An Event can
+ * occur at one or more discrete time points (&#x60;discreteDates&#x60;) or an
+ * event can happen continuosly over a longer peroid of time
+ * (&#x60;startDate&#x60;, &#x60;endDate&#x60;)
+ */
+public class BrAPIEventDateRange {
+	@JsonProperty("discreteDates")
+	private List<OffsetDateTime> discreteDates = null;
+
+	@JsonProperty("endDate")
+	private OffsetDateTime endDate = null;
+
+	@JsonProperty("startDate")
+	private OffsetDateTime startDate = null;
+
+	public BrAPIEventDateRange discreteDates(List<OffsetDateTime> discreteDates) {
+		this.discreteDates = discreteDates;
+		return this;
+	}
+
+	public BrAPIEventDateRange addDiscreteDatesItem(OffsetDateTime discreteDatesItem) {
+		if (this.discreteDates == null) {
+			this.discreteDates = new ArrayList<OffsetDateTime>();
+		}
+		this.discreteDates.add(discreteDatesItem);
+		return this;
+	}
+
+	/**
+	 * A list of dates when the event occurred &lt;br/&gt;MIAPPE V1.1 (DM-68) Event
+	 * date - Date and time of the event.
+	 *
+	 * @return discreteDates
+	 **/
+	public List<OffsetDateTime> getDiscreteDates() {
+		return discreteDates;
+	}
+
+	public void setDiscreteDates(List<OffsetDateTime> discreteDates) {
+		this.discreteDates = discreteDates;
+	}
+
+	public BrAPIEventDateRange endDate(OffsetDateTime endDate) {
+		this.endDate = endDate;
+		return this;
+	}
+
+	/**
+	 * The end of a continous or regularly repetitive event &lt;br/&gt;MIAPPE V1.1
+	 * (DM-68) Event date - Date and time of the event.
+	 *
+	 * @return endDate
+	 **/
+	public OffsetDateTime getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(OffsetDateTime endDate) {
+		this.endDate = endDate;
+	}
+
+	public BrAPIEventDateRange startDate(OffsetDateTime startDate) {
+		this.startDate = startDate;
+		return this;
+	}
+
+	/**
+	 * The begining of a continous or regularly repetitive event &lt;br/&gt;MIAPPE
+	 * V1.1 (DM-68) Event date - Date and time of the event.
+	 *
+	 * @return startDate
+	 **/
+	public OffsetDateTime getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(OffsetDateTime startDate) {
+		this.startDate = startDate;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIEventDateRange eventEventDateRange = (BrAPIEventDateRange) o;
+		return Objects.equals(this.discreteDates, eventEventDateRange.discreteDates)
+				&& Objects.equals(this.endDate, eventEventDateRange.endDate)
+				&& Objects.equals(this.startDate, eventEventDateRange.startDate);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(discreteDates, endDate, startDate);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class EventEventDateRange {\n");
+
+		sb.append("    discreteDates: ").append(toIndentedString(discreteDates)).append("\n");
+		sb.append("    endDate: ").append(toIndentedString(endDate)).append("\n");
+		sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
+
+}
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIEventEventParameters.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIEventEventParameters.java
deleted file mode 100644
index 397980a6..00000000
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIEventEventParameters.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.brapi.v2.model.pheno;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-
-
-
-
-/**
- * EventEventParameters
- */
-
-
-public class BrAPIEventEventParameters   {
-  @JsonProperty("key")
-  private String key = null;
-
-  @JsonProperty("rdfValue")
-  private String rdfValue = null;
-
-  @JsonProperty("value")
-  private String value = null;
-
-  public BrAPIEventEventParameters key(String key) {
-    this.key = key;
-    return this;
-  }
-
-  /**
-   * Specifies the relationship between the event and the given property. E.g. fertilizer, operator
-   * @return key
-  **/
-  
-  
-    public String getKey() {
-    return key;
-  }
-
-  public void setKey(String key) {
-    this.key = key;
-  }
-
-  public BrAPIEventEventParameters rdfValue(String rdfValue) {
-    this.rdfValue = rdfValue;
-    return this;
-  }
-
-  /**
-   * The type of the value given above, e.g. http://xmlns.com/foaf/0.1/Agent
-   * @return rdfValue
-  **/
-  
-  
-    public String getRdfValue() {
-    return rdfValue;
-  }
-
-  public void setRdfValue(String rdfValue) {
-    this.rdfValue = rdfValue;
-  }
-
-  public BrAPIEventEventParameters value(String value) {
-    this.value = value;
-    return this;
-  }
-
-  /**
-   * The value of the property for this event. E.g. nitrogen, John Doe
-   * @return value
-  **/
-  
-  
-    public String getValue() {
-    return value;
-  }
-
-  public void setValue(String value) {
-    this.value = value;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIEventEventParameters eventEventParameters = (BrAPIEventEventParameters) o;
-    return Objects.equals(this.key, eventEventParameters.key) &&
-        Objects.equals(this.rdfValue, eventEventParameters.rdfValue) &&
-        Objects.equals(this.value, eventEventParameters.value);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(key, rdfValue, value);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventEventParameters {\n");
-    
-    sb.append("    key: ").append(toIndentedString(key)).append("\n");
-    sb.append("    rdfValue: ").append(toIndentedString(rdfValue)).append("\n");
-    sb.append("    value: ").append(toIndentedString(value)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIEventParameters.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIEventParameters.java
new file mode 100644
index 00000000..0532e842
--- /dev/null
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIEventParameters.java
@@ -0,0 +1,294 @@
+package org.brapi.v2.model.pheno;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * BrAPIEventEventParameters
+ */
+
+public class BrAPIEventParameters {
+	@JsonProperty("code")
+	private String code = null;
+
+	@JsonProperty("description")
+	private String description = null;
+
+	@Deprecated
+	@JsonProperty("key")
+	private String key = null;
+
+	@JsonProperty("name")
+	private String name = null;
+
+	@Deprecated
+	@JsonProperty("rdfValue")
+	private String rdfValue = null;
+
+	@JsonProperty("units")
+	private String units = null;
+
+	@JsonProperty("value")
+	private String value = null;
+
+	@JsonProperty("valueDescription")
+	private String valueDescription = null;
+
+	@JsonProperty("valuesByDate")
+	private List<String> valuesByDate = null;
+
+	public BrAPIEventParameters code(String code) {
+		this.code = code;
+		return this;
+	}
+
+	/**
+	 * The shortened code name of an event parameter &lt;br&gt;ICASA
+	 * \&quot;Code_Display\&quot;
+	 *
+	 * @return code
+	 **/
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public BrAPIEventParameters description(String description) {
+		this.description = description;
+		return this;
+	}
+
+	/**
+	 * A human readable description of this event parameter. This description is
+	 * usually associated with the &#x27;name&#x27; and &#x27;code&#x27; of an event
+	 * parameter.
+	 *
+	 * @return description
+	 **/
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	@Deprecated
+	public BrAPIEventParameters key(String key) {
+		this.key = key;
+		return this;
+	}
+
+	/**
+	 * **Deprecated in v2.1** Please use &#x60;name&#x60;. Github issue number #440
+	 * &lt;br&gt;Specifies the relationship between the event and the given
+	 * property. E.g. fertilizer, operator
+	 *
+	 * @return key
+	 **/
+	@Deprecated
+	public String getKey() {
+		return key;
+	}
+
+	@Deprecated
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public BrAPIEventParameters name(String name) {
+		this.name = name;
+		return this;
+	}
+
+	/**
+	 * The full name of an event parameter &lt;br&gt;ICASA
+	 * \&quot;Variable_Name\&quot;
+	 *
+	 * @return name
+	 **/
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Deprecated
+	public BrAPIEventParameters rdfValue(String rdfValue) {
+		this.rdfValue = rdfValue;
+		return this;
+	}
+
+	/**
+	 * **Deprecated in v2.1** Please use &#x60;code&#x60;. Github issue number #440
+	 * &lt;brThe type of the value given above, e.g. http://xmlns.com/foaf/0.1/Agent
+	 *
+	 * @return rdfValue
+	 **/
+	@Deprecated
+	public String getRdfValue() {
+		return rdfValue;
+	}
+
+	@Deprecated
+	public void setRdfValue(String rdfValue) {
+		this.rdfValue = rdfValue;
+	}
+
+	public BrAPIEventParameters units(String units) {
+		this.units = units;
+		return this;
+	}
+
+	/**
+	 * The units or data type of the &#x27;value&#x27;. &lt;br&gt;If the
+	 * &#x27;value&#x27; comes from a standardized vocabulary or an encoded list of
+	 * values, then &#x27;unit&#x27; should be &#x27;code&#x27;. &lt;br&gt;If the
+	 * &#x27;value&#x27; IS NOT a number, then &#x27;unit&#x27; should specify a
+	 * data type eg. &#x27;text&#x27;, &#x27;boolean&#x27;, &#x27;date&#x27;, etc.
+	 * &lt;br&gt;If the value IS a number, then &#x27;unit&#x27; should specify the
+	 * units used eg. &#x27;ml&#x27;, &#x27;cm&#x27;, etc &lt;br&gt;ICASA
+	 * \&quot;Unit_or_type\&quot;
+	 *
+	 * @return units
+	 **/
+	public String getUnits() {
+		return units;
+	}
+
+	public void setUnits(String units) {
+		this.units = units;
+	}
+
+	public BrAPIEventParameters value(String value) {
+		this.value = value;
+		return this;
+	}
+
+	/**
+	 * The single value of this event parameter. This single value is accurate for
+	 * all the dates in the date range. If &#x27;value&#x27; is populated then
+	 * &#x27;valuesByDate&#x27; should NOT be populated.
+	 *
+	 * @return value
+	 **/
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public BrAPIEventParameters valueDescription(String valueDescription) {
+		this.valueDescription = valueDescription;
+		return this;
+	}
+
+	/**
+	 * If the event parameter &#x27;unit&#x27; field is &#x27;code&#x27;, then use
+	 * &#x27;valueDescription&#x27; to add a human readable description to the
+	 * value.
+	 *
+	 * @return valueDescription
+	 **/
+	public String getValueDescription() {
+		return valueDescription;
+	}
+
+	public void setValueDescription(String valueDescription) {
+		this.valueDescription = valueDescription;
+	}
+
+	public BrAPIEventParameters valuesByDate(List<String> valuesByDate) {
+		this.valuesByDate = valuesByDate;
+		return this;
+	}
+
+	public BrAPIEventParameters addValuesByDateItem(String valuesByDateItem) {
+		if (this.valuesByDate == null) {
+			this.valuesByDate = new ArrayList<String>();
+		}
+		this.valuesByDate.add(valuesByDateItem);
+		return this;
+	}
+
+	/**
+	 * An array of values corresponding to each timestamp in the
+	 * &#x27;discreteDates&#x27; array of this event. The &#x27;valuesByDate&#x27;
+	 * array should exactly match the size of the &#x27;discreteDates&#x27; array.
+	 * If &#x27;valuesByDate&#x27; is populated then &#x27;value&#x27; should NOT be
+	 * populated.
+	 *
+	 * @return valuesByDate
+	 **/
+	public List<String> getValuesByDate() {
+		return valuesByDate;
+	}
+
+	public void setValuesByDate(List<String> valuesByDate) {
+		this.valuesByDate = valuesByDate;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIEventParameters BrAPIEventEventParameters = (BrAPIEventParameters) o;
+		return Objects.equals(this.code, BrAPIEventEventParameters.code)
+				&& Objects.equals(this.description, BrAPIEventEventParameters.description)
+				&& Objects.equals(this.key, BrAPIEventEventParameters.key)
+				&& Objects.equals(this.name, BrAPIEventEventParameters.name)
+				&& Objects.equals(this.rdfValue, BrAPIEventEventParameters.rdfValue)
+				&& Objects.equals(this.units, BrAPIEventEventParameters.units)
+				&& Objects.equals(this.value, BrAPIEventEventParameters.value)
+				&& Objects.equals(this.valueDescription, BrAPIEventEventParameters.valueDescription)
+				&& Objects.equals(this.valuesByDate, BrAPIEventEventParameters.valuesByDate);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(code, description, key, name, rdfValue, units, value, valueDescription, valuesByDate);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class BrAPIEventEventParameters {\n");
+
+		sb.append("    code: ").append(toIndentedString(code)).append("\n");
+		sb.append("    description: ").append(toIndentedString(description)).append("\n");
+		sb.append("    key: ").append(toIndentedString(key)).append("\n");
+		sb.append("    name: ").append(toIndentedString(name)).append("\n");
+		sb.append("    rdfValue: ").append(toIndentedString(rdfValue)).append("\n");
+		sb.append("    units: ").append(toIndentedString(units)).append("\n");
+		sb.append("    value: ").append(toIndentedString(value)).append("\n");
+		sb.append("    valueDescription: ").append(toIndentedString(valueDescription)).append("\n");
+		sb.append("    valuesByDate: ").append(toIndentedString(valuesByDate)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
+
+}

From 034d27206bbb162a9dcc1221fc84fc5afcfd183a Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Fri, 18 Aug 2023 10:59:26 -0400
Subject: [PATCH 13/28] tests pass

---
 .../v2/modules/phenotype/EventsApiTest.java   | 54 +++++++++----------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/EventsApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/EventsApiTest.java
index aa364225..fbfb2bbb 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/EventsApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/EventsApiTest.java
@@ -13,42 +13,38 @@
 package org.brapi.client.v2.modules.phenotype;
 
 import org.brapi.client.v2.ApiResponse;
+import org.brapi.client.v2.BrAPIClientTest;
 import org.brapi.client.v2.model.exceptions.ApiException;
 import org.brapi.client.v2.model.queryParams.phenotype.EventQueryParams;
 import org.brapi.v2.model.pheno.response.BrAPIEventsResponse;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
-import java.time.OffsetDateTime;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * API tests for EventsApi
  */
-public class EventsApiTest {
-
-    private final EventsApi api = new EventsApi();
-
-    /**
-     * Get the Events
-     *
-     * Get list of events
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void eventsGetTest() throws ApiException {
-        String studyDbId = null;
-        String observationUnitDbId = null;
-        String eventDbId = null;
-        String eventType = null;
-        OffsetDateTime dateRangeStart = null;
-        OffsetDateTime dateRangeEnd = null;
-        Integer page = null;
-        Integer pageSize = null;
-        
-        EventQueryParams queryParams = new EventQueryParams();
-        ApiResponse<BrAPIEventsResponse> response = api.eventsGet(queryParams);
-
-        // TODO: test validations
-    }
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class EventsApiTest extends BrAPIClientTest {
+
+	private final EventsApi api = new EventsApi(this.apiClient);
+
+	/**
+	 * Get the Events
+	 *
+	 * Get list of events
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void eventsGetTest() throws ApiException {
+		String eventDbId = "event1";
+
+		EventQueryParams queryParams = new EventQueryParams().eventDbId(eventDbId);
+		ApiResponse<BrAPIEventsResponse> response = api.eventsGet(queryParams);
+
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(eventDbId, response.getBody().getResult().getData().get(0).getEventDbId());
+	}
 }

From 79fc2f7519636b1c5ed4d0a91e03346edb112810 Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Fri, 18 Aug 2023 15:05:24 -0400
Subject: [PATCH 14/28] fixes #174, #175, #176, #177, #178, #179, #157, #158.
 Dependant on #199

---
 .../client/v2/modules/core/ServerInfoApi.java |  213 ++-
 .../v2/modules/core/ServerInfoApiTest.java    |   11 +-
 .../v2/modules/core/StudiesApiTest.java       |  305 ++--
 .../org/brapi/v2/model/core/BrAPIService.java |  287 ++--
 .../org/brapi/v2/model/core/BrAPIStudy.java   | 1514 ++++++++--------
 .../core/request/BrAPIStudySearchRequest.java | 1523 +++++++++--------
 6 files changed, 1998 insertions(+), 1855 deletions(-)

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/ServerInfoApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/ServerInfoApi.java
index 338e9e84..45d3b34c 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/ServerInfoApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/ServerInfoApi.java
@@ -28,93 +28,128 @@
 import org.brapi.v2.model.core.response.BrAPIServerInfoResponse;
 
 public class ServerInfoApi {
-    private BrAPIClient apiClient;
-
-    public ServerInfoApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public ServerInfoApi(BrAPIClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public BrAPIClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(BrAPIClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for serverinfoGet
-     * @param dataType The data format supported by the call. (optional)
-
-
-
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    private Call serverinfoGetCall(BrAPIWSMIMEDataTypes dataType) throws ApiException {
-        Object localVarPostBody = null;
-        
-        // create path and map variables
-        String localVarPath = "/serverinfo";
-
-        Map<String, String> localVarQueryParams = new HashMap<>();
-        Map<String, String> localVarCollectionQueryParams = new HashMap<>();
-        if (dataType != null)
-            apiClient.prepQueryParameter(localVarQueryParams, "dataType", dataType);
-
-        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-        
-        
-
-        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-        final String[] localVarAccepts = {
-            "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-            
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        String[] localVarAuthNames = new String[] { "AuthorizationToken" };
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames);
-    }
-
-    /**
-     * Get the list of implemented Calls
-     * Implementation Notes  Having a consistent structure for the path string of each call is very  important for teams to be able to connect and find errors. Read more on Github.  Here are the rules for the path of each call that should be returned  Every word in the call path should match the documentation exactly, both in  spelling and capitalization. Note that path strings are all lower case, but  path parameters are camel case.  Each path should start relative to \\\&quot;/\\\&quot; and therefore should not include \\\&quot;/\\\&quot;  No leading or trailing slashes (\\\&quot;/\\\&quot;)   Path parameters are wrapped in curly braces (\\\&quot;{}\\\&quot;). The name of the path parameter  should be spelled exactly as it is specified in the documentation.  Examples   GOOD   \&quot;call\&quot;: \&quot;germplasm/{germplasmDbId}/pedigree\&quot;   BAD    \&quot;call\&quot;: \&quot;germplasm/{id}/pedigree\&quot;  BAD    \&quot;call\&quot;: \&quot;germplasm/{germplasmDBid}/pedigree\&quot;   BAD    \&quot;call\&quot;: \&quot;brapi/v2/germplasm/{germplasmDbId}/pedigree\&quot;   BAD    \&quot;call\&quot;: \&quot;/germplasm/{germplasmDbId}/pedigree/\&quot;   BAD    \&quot;call\&quot;: \&quot;germplasm/&lt;germplasmDbId&gt;/pedigree\&quot;
-     * @param dataType The data format supported by the call. (optional)
-
-     * @return ApiResponse&lt;ServerInfoResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<BrAPIServerInfoResponse> serverinfoGet(BrAPIWSMIMEDataTypes dataType) throws ApiException {
-        Call call = serverinfoGetCall(dataType);
-        Type localVarReturnType = new TypeToken<BrAPIServerInfoResponse>(){}.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the list of implemented Calls (asynchronously)
-     * Implementation Notes  Having a consistent structure for the path string of each call is very  important for teams to be able to connect and find errors. Read more on Github.  Here are the rules for the path of each call that should be returned  Every word in the call path should match the documentation exactly, both in  spelling and capitalization. Note that path strings are all lower case, but  path parameters are camel case.  Each path should start relative to \\\&quot;/\\\&quot; and therefore should not include \\\&quot;/\\\&quot;  No leading or trailing slashes (\\\&quot;/\\\&quot;)   Path parameters are wrapped in curly braces (\\\&quot;{}\\\&quot;). The name of the path parameter  should be spelled exactly as it is specified in the documentation.  Examples   GOOD   \&quot;call\&quot;: \&quot;germplasm/{germplasmDbId}/pedigree\&quot;   BAD    \&quot;call\&quot;: \&quot;germplasm/{id}/pedigree\&quot;  BAD    \&quot;call\&quot;: \&quot;germplasm/{germplasmDBid}/pedigree\&quot;   BAD    \&quot;call\&quot;: \&quot;brapi/v2/germplasm/{germplasmDbId}/pedigree\&quot;   BAD    \&quot;call\&quot;: \&quot;/germplasm/{germplasmDbId}/pedigree/\&quot;   BAD    \&quot;call\&quot;: \&quot;germplasm/&lt;germplasmDbId&gt;/pedigree\&quot;
-     * @param dataType The data format supported by the call. (optional)
-
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public Call serverinfoGetAsync(BrAPIWSMIMEDataTypes dataType, final ApiCallback<BrAPIServerInfoResponse> callback) throws ApiException {
-        Call call = serverinfoGetCall(dataType);
-        Type localVarReturnType = new TypeToken<BrAPIServerInfoResponse>(){}.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
+	private BrAPIClient apiClient;
+
+	public ServerInfoApi() {
+		this(Configuration.getDefaultApiClient());
+	}
+
+	public ServerInfoApi(BrAPIClient apiClient) {
+		this.apiClient = apiClient;
+	}
+
+	public BrAPIClient getApiClient() {
+		return apiClient;
+	}
+
+	public void setApiClient(BrAPIClient apiClient) {
+		this.apiClient = apiClient;
+	}
+
+	/**
+	 * Build call for serverinfoGet
+	 * 
+	 * @param contentType The data format supported by the call. (optional)
+	 * @return Call to execute
+	 * @throws ApiException If fail to serialize the request body object
+	 */
+	private Call serverinfoGetCall(BrAPIWSMIMEDataTypes contentType) throws ApiException {
+		Object localVarPostBody = null;
+
+		// create path and map variables
+		String localVarPath = "/serverinfo";
+
+		Map<String, String> localVarQueryParams = new HashMap<>();
+		Map<String, String> localVarCollectionQueryParams = new HashMap<>();
+		if (contentType != null)
+			apiClient.prepQueryParameter(localVarQueryParams, "dataType", contentType);
+
+		Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+		Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+		final String[] localVarAccepts = { "application/json" };
+		final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+		if (localVarAccept != null)
+			localVarHeaderParams.put("Accept", localVarAccept);
+
+		final String[] localVarContentTypes = {
+
+		};
+		final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+		localVarHeaderParams.put("Content-Type", localVarContentType);
+
+		String[] localVarAuthNames = new String[] { "AuthorizationToken" };
+		return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams,
+				localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames);
+	}
+
+	/**
+	 * Get the list of implemented Calls Implementation Notes Having a consistent
+	 * structure for the path string of each call is very important for teams to be
+	 * able to connect and find errors. Read more on Github. Here are the rules for
+	 * the path of each call that should be returned Every word in the call path
+	 * should match the documentation exactly, both in spelling and capitalization.
+	 * Note that path strings are all lower case, but path parameters are camel
+	 * case. Each path should start relative to \\\&quot;/\\\&quot; and therefore
+	 * should not include \\\&quot;/\\\&quot; No leading or trailing slashes
+	 * (\\\&quot;/\\\&quot;) Path parameters are wrapped in curly braces
+	 * (\\\&quot;{}\\\&quot;). The name of the path parameter should be spelled
+	 * exactly as it is specified in the documentation. Examples GOOD
+	 * \&quot;call\&quot;: \&quot;germplasm/{germplasmDbId}/pedigree\&quot; BAD
+	 * \&quot;call\&quot;: \&quot;germplasm/{id}/pedigree\&quot; BAD
+	 * \&quot;call\&quot;: \&quot;germplasm/{germplasmDBid}/pedigree\&quot; BAD
+	 * \&quot;call\&quot;: \&quot;brapi/v2/germplasm/{germplasmDbId}/pedigree\&quot;
+	 * BAD \&quot;call\&quot;: \&quot;/germplasm/{germplasmDbId}/pedigree/\&quot;
+	 * BAD \&quot;call\&quot;:
+	 * \&quot;germplasm/&lt;germplasmDbId&gt;/pedigree\&quot;
+	 * 
+	 * @param contentType The data format supported by the call. (optional)
+	 * 
+	 * @return ApiResponse&lt;ServerInfoResponse&gt;
+	 * @throws ApiException If fail to call the API, e.g. server error or cannot
+	 *                      deserialize the response body
+	 */
+	public ApiResponse<BrAPIServerInfoResponse> serverinfoGet(BrAPIWSMIMEDataTypes contentType) throws ApiException {
+		Call call = serverinfoGetCall(contentType);
+		Type localVarReturnType = new TypeToken<BrAPIServerInfoResponse>() {
+		}.getType();
+		return apiClient.execute(call, localVarReturnType);
+	}
+
+	/**
+	 * Get the list of implemented Calls (asynchronously) Implementation Notes
+	 * Having a consistent structure for the path string of each call is very
+	 * important for teams to be able to connect and find errors. Read more on
+	 * Github. Here are the rules for the path of each call that should be returned
+	 * Every word in the call path should match the documentation exactly, both in
+	 * spelling and capitalization. Note that path strings are all lower case, but
+	 * path parameters are camel case. Each path should start relative to
+	 * \\\&quot;/\\\&quot; and therefore should not include \\\&quot;/\\\&quot; No
+	 * leading or trailing slashes (\\\&quot;/\\\&quot;) Path parameters are wrapped
+	 * in curly braces (\\\&quot;{}\\\&quot;). The name of the path parameter should
+	 * be spelled exactly as it is specified in the documentation. Examples GOOD
+	 * \&quot;call\&quot;: \&quot;germplasm/{germplasmDbId}/pedigree\&quot; BAD
+	 * \&quot;call\&quot;: \&quot;germplasm/{id}/pedigree\&quot; BAD
+	 * \&quot;call\&quot;: \&quot;germplasm/{germplasmDBid}/pedigree\&quot; BAD
+	 * \&quot;call\&quot;: \&quot;brapi/v2/germplasm/{germplasmDbId}/pedigree\&quot;
+	 * BAD \&quot;call\&quot;: \&quot;/germplasm/{germplasmDbId}/pedigree/\&quot;
+	 * BAD \&quot;call\&quot;:
+	 * \&quot;germplasm/&lt;germplasmDbId&gt;/pedigree\&quot;
+	 * 
+	 * @param contentType The data format supported by the call. (optional)
+	 * 
+	 * @param callback    The callback to be executed when the API call finishes
+	 * @return The request call
+	 * @throws ApiException If fail to process the API call, e.g. serializing the
+	 *                      request body object
+	 */
+	public Call serverinfoGetAsync(BrAPIWSMIMEDataTypes contentType,
+			final ApiCallback<BrAPIServerInfoResponse> callback) throws ApiException {
+		Call call = serverinfoGetCall(contentType);
+		Type localVarReturnType = new TypeToken<BrAPIServerInfoResponse>() {
+		}.getType();
+		apiClient.executeAsync(call, localVarReturnType, callback);
+		return call;
+	}
 }
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/ServerInfoApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/ServerInfoApiTest.java
index 2efe380f..e8f8e728 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/ServerInfoApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/ServerInfoApiTest.java
@@ -12,18 +12,23 @@
 
 package org.brapi.client.v2.modules.core;
 
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
 import org.brapi.client.v2.ApiResponse;
+import org.brapi.client.v2.BrAPIClientTest;
 import org.brapi.client.v2.model.exceptions.ApiException;
 import org.brapi.v2.model.BrAPIWSMIMEDataTypes;
 import org.brapi.v2.model.core.response.BrAPIServerInfoResponse;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 /**
  * API tests for ServerInfoApi
  */
-public class ServerInfoApiTest {
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ServerInfoApiTest  extends BrAPIClientTest {
 
-    private final ServerInfoApi api = new ServerInfoApi();
+    private final ServerInfoApi api = new ServerInfoApi(this.apiClient);
 
     /**
      * Get the list of implemented Calls
@@ -39,6 +44,6 @@ public void serverinfoGetTest() throws ApiException {
         
         ApiResponse<BrAPIServerInfoResponse> response = api.serverinfoGet(dataType);
 
-        // TODO: test validations
+        assertNotEquals(0, response.getBody().getResult().getCalls().size());
     }
 }
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/StudiesApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/StudiesApiTest.java
index 144ee1ad..cb0c2ce6 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/StudiesApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/StudiesApiTest.java
@@ -26,12 +26,15 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
-import java.time.OffsetDateTime;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 /**
  * API tests for StudiesApi
@@ -39,148 +42,158 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class StudiesApiTest extends BrAPIClientTest {
 
-    private final StudiesApi api = new StudiesApi(this.apiClient);
-
-    /**
-     * Submit a search request for Studies
-     *
-     * Get list of studies StartDate and endDate should be ISO-8601 format for dates See Search Services for additional implementation details.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void searchStudiesPostTest() throws ApiException {
-        OffsetDateTime offsetDateTime = OffsetDateTime.parse("2014-02-02T00:00:00Z");
-        BrAPIStudySearchRequest body = new BrAPIStudySearchRequest();
-
-        ApiResponse<Pair<Optional<BrAPIStudyListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api.searchStudiesPost(body);
-
-        // TODO: test validations
-    }
-    /**
-     * Get the results of a Studies search request
-     *
-     * Get list of studies  StartDate and endDate should be ISO-8601 format for dates  See Search Services for additional implementation details.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void searchStudiesSearchResultsDbIdGetTest() throws ApiException {
-        String searchResultsDbId = null;
-        Integer page = null;
-        Integer pageSize = null;
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-            ApiResponse<Pair<Optional<BrAPIStudyListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response =
-                    api.searchStudiesSearchResultsDbIdGet(searchResultsDbId, page, pageSize);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Get a filtered list of Studies
-     *
-     * Get list of studies  StartDate and endDate should be ISO-8601 format for dates
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void studiesGetTest() throws ApiException {
-        String commonCropName = null;
-        String studyType = null;
-        String programDbId = null;
-        String locationDbId = null;
-        String seasonDbId = null;
-        String trialDbId = null;
-        String studyDbId = null;
-        String studyName = null;
-        String studyCode = null;
-        String studyPUI = null;
-        String germplasmDbId = null;
-        String observationVariableDbId = null;
-        Boolean active = null;
-        String sortBy = null;
-        String sortOrder = null;
-        String externalReferenceID = null;
-        String externalReferenceSource = null;
-        Integer page = null;
-        Integer pageSize = null;
-        
-        StudyQueryParams queryParams = new StudyQueryParams();
-        ApiResponse<BrAPIStudyListResponse> response = api.studiesGet(queryParams);
-
-        // TODO: test validations
-    }
-    /**
-     * Create new Studies.
-     *
-     * Create new studies  Implementation Notes  StartDate and endDate should be ISO-8601 format for dates  &#x60;studDbId&#x60; is generated by the server.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void studiesPostTest() throws ApiException {
-        List<BrAPIStudy> body = Arrays.asList(new BrAPIStudy());
-        
-        ApiResponse<BrAPIStudyListResponse> response = api.studiesPost(body);
-
-        // TODO: test validations
-    }
-    /**
-     * Get the details for a specific Study
-     *
-     * Retrieve the information of the study required for field data collection  An additionalInfo field was added to provide a controlled vocabulary for less common data fields.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void studiesStudyDbIdGetTest() throws ApiException {
-        String studyDbId = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPIStudySingleResponse> response = api.studiesStudyDbIdGet(studyDbId);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Update an existing Study
-     *
-     * Update an existing Study with new data
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void studiesStudyDbIdPutTest() throws ApiException {
-        String studyDbId = null;
-        BrAPIStudy body = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPIStudySingleResponse> response = api.studiesStudyDbIdPut(studyDbId, body);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Get the Study Types
-     *
-     * Call to retrieve the list of study types.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void studytypesGetTest() throws ApiException {
-        Integer page = null;
-        Integer pageSize = null;
-        
-        ApiResponse<BrAPIStudyTypesResponse> response = api.studytypesGet(page, pageSize);
-
-        // TODO: test validations
-    }
+	private final StudiesApi api = new StudiesApi(this.apiClient);
+
+	/**
+	 * Submit a search request for Studies
+	 *
+	 * Get list of studies StartDate and endDate should be ISO-8601 format for dates
+	 * See Search Services for additional implementation details.
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void searchStudiesPostTest() throws ApiException {
+		BrAPIStudySearchRequest body = new BrAPIStudySearchRequest().addStudyDbIdsItem("study1")
+				.addStudyDbIdsItem("study2");
+
+		ApiResponse<Pair<Optional<BrAPIStudyListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api
+				.searchStudiesPost(body);
+
+		Optional<BrAPIStudyListResponse> listResponse = response.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+		// only results are returned
+		assertTrue(listResponse.isPresent());
+		assertFalse(searchIdResponse.isPresent());
+
+		assertEquals(2, listResponse.get().getResult().getData().size(),
+				"unexpected number of pedigree nodes returned");
+	}
+
+	/**
+	 * Get the results of a Studies search request
+	 *
+	 * Get list of studies StartDate and endDate should be ISO-8601 format for dates
+	 * See Search Services for additional implementation details.
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void searchStudiesSearchResultsDbIdGetTest() throws ApiException {
+		BrAPIStudySearchRequest body = new BrAPIStudySearchRequest().addStudyDbIdsItem("study1")
+				.addStudyDbIdsItem("study2").addStudyDbIdsItem("study1").addStudyDbIdsItem("study2")
+				.addStudyDbIdsItem("study1").addStudyDbIdsItem("study2");
+
+		ApiResponse<Pair<Optional<BrAPIStudyListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = this.api
+				.searchStudiesPost(body);
+		Optional<BrAPIStudyListResponse> listResponse = response.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+		// only search ID is returned
+		assertFalse(listResponse.isPresent());
+		assertTrue(searchIdResponse.isPresent());
+
+		// Get results from search ID
+		ApiResponse<Pair<Optional<BrAPIStudyListResponse>, Optional<BrAPIAcceptedSearchResponse>>> searchResponse = this.api
+				.searchStudiesSearchResultsDbIdGet(searchIdResponse.get().getResult().getSearchResultsDbId(), 0, 10);
+		Optional<BrAPIStudyListResponse> listResponse2 = searchResponse.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse2 = searchResponse.getBody().getRight();
+		// only results are returned
+		assertTrue(listResponse2.isPresent());
+		assertFalse(searchIdResponse2.isPresent());
+
+		assertEquals(2, listResponse2.get().getResult().getData().size(),
+				"unexpected number of pedigree nodes returned");
+	}
+
+	/**
+	 * Get a filtered list of Studies
+	 *
+	 * Get list of studies StartDate and endDate should be ISO-8601 format for dates
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void studiesGetTest() throws ApiException {
+		String studyDbId = "study1";
+
+		StudyQueryParams queryParams = new StudyQueryParams().studyDbId(studyDbId);
+		ApiResponse<BrAPIStudyListResponse> response = api.studiesGet(queryParams);
+
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(studyDbId, response.getBody().getResult().getData().get(0).getStudyDbId());
+	}
+
+	/**
+	 * Create new Studies.
+	 *
+	 * Create new studies Implementation Notes StartDate and endDate should be
+	 * ISO-8601 format for dates &#x60;studDbId&#x60; is generated by the server.
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void studiesPostTest() throws ApiException {
+		BrAPIStudy study = new BrAPIStudy().studyName("Study Name");
+		List<BrAPIStudy> body = Arrays.asList(study);
+
+		ApiResponse<BrAPIStudyListResponse> response = api.studiesPost(body);
+
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(study.getStudyName(), response.getBody().getResult().getData().get(0).getStudyName());
+		assertNotNull(response.getBody().getResult().getData().get(0).getStudyDbId());
+
+	}
+
+	/**
+	 * Get the details for a specific Study
+	 *
+	 * Retrieve the information of the study required for field data collection An
+	 * additionalInfo field was added to provide a controlled vocabulary for less
+	 * common data fields.
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void studiesStudyDbIdGetTest() throws ApiException {
+		String studyDbId = "study1";
+
+		ApiResponse<BrAPIStudySingleResponse> response = api.studiesStudyDbIdGet(studyDbId);
+
+		assertEquals(studyDbId, response.getBody().getResult().getStudyDbId());
+	}
+
+	/**
+	 * Update an existing Study
+	 *
+	 * Update an existing Study with new data
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void studiesStudyDbIdPutTest() throws ApiException {
+		String studyDbId = "study1";
+		BrAPIStudy body = new BrAPIStudy().studyDbId(studyDbId).studyName("New Name");
+
+		ApiResponse<BrAPIStudySingleResponse> response = api.studiesStudyDbIdPut(studyDbId, body);
+
+		assertEquals(body.getStudyName(), response.getBody().getResult().getStudyName());
+		assertEquals(studyDbId, response.getBody().getResult().getStudyDbId());
+	}
+
+	/**
+	 * Get the Study Types
+	 *
+	 * Call to retrieve the list of study types.
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void studytypesGetTest() throws ApiException {
+		Integer page = null;
+		Integer pageSize = null;
+
+		ApiResponse<BrAPIStudyTypesResponse> response = api.studytypesGet(page, pageSize);
+		
+		assertNotEquals(0, response.getBody().getResult().getData().size());
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPIService.java b/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPIService.java
index 02690c25..b93359e7 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPIService.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPIService.java
@@ -10,184 +10,84 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-
+import org.brapi.v2.model.BrAPIEnum;
 import org.brapi.v2.model.BrAPIWSMIMEDataTypes;
 
 /**
  * Service
  */
 
-
 public class BrAPIService {
-	/**
-	 * Gets or Sets methods
-	 */
-	public enum MethodsEnum {
-		GET("GET"),
-
-		POST("POST"),
 
-		PUT("PUT"),
-
-		DELETE("DELETE");
-
-		@JsonCreator
-		public static MethodsEnum fromValue(String text) {
-			for (MethodsEnum b : MethodsEnum.values()) {
-				if (String.valueOf(b.value).equals(text)) {
-					return b;
-				}
-			}
-			return null;
-		}
-
-		private String value;
-
-		MethodsEnum(String value) {
-			this.value = value;
-		}
-
-		@Override
-		@JsonValue
-		public String toString() {
-			return String.valueOf(value);
-		}
-	}
-
-	/**
-	 * Gets or Sets versions
-	 */
-	public enum VersionsEnum {
-		_0("2.0"),
-
-		_1("2.1"),
-
-		_2("2.2");
-
-		@JsonCreator
-		public static VersionsEnum fromValue(String text) {
-			for (VersionsEnum b : VersionsEnum.values()) {
-				if (String.valueOf(b.value).equals(text)) {
-					return b;
-				}
-			}
-			return null;
-		}
-
-		private String value;
-
-		VersionsEnum(String value) {
-			this.value = value;
-		}
-
-		@Override
-		@JsonValue
-		public String toString() {
-			return String.valueOf(value);
-		}
-	}
+	@JsonProperty("contentTypes")
+	private List<BrAPIWSMIMEDataTypes> contentTypes = null;
 
+	@Deprecated
 	@JsonProperty("dataTypes")
-	@Valid
 	private List<BrAPIWSMIMEDataTypes> dataTypes = null;
 
 	@JsonProperty("methods")
-	@Valid
 	private List<MethodsEnum> methods = new ArrayList<MethodsEnum>();
 
 	@JsonProperty("service")
 	private String service = null;
+
 	@JsonProperty("versions")
-	@Valid
 	private List<VersionsEnum> versions = new ArrayList<VersionsEnum>();
 
-	public BrAPIService addDataTypesItem(BrAPIWSMIMEDataTypes dataTypesItem) {
-		if (this.dataTypes == null) {
-			this.dataTypes = new ArrayList<BrAPIWSMIMEDataTypes>();
+	public BrAPIService addContentTypesItem(BrAPIWSMIMEDataTypes contentTypesItem) {
+		if (this.contentTypes == null) {
+			this.contentTypes = new ArrayList<BrAPIWSMIMEDataTypes>();
 		}
-		this.dataTypes.add(dataTypesItem);
+		this.contentTypes.add(contentTypesItem);
 		return this;
 	}
 
-	public BrAPIService addMethodsItem(MethodsEnum methodsItem) {
-		this.methods.add(methodsItem);
+	public BrAPIService contentTypes(List<BrAPIWSMIMEDataTypes> contentTypes) {
+		this.contentTypes = contentTypes;
 		return this;
 	}
 
-	public BrAPIService addVersionsItem(VersionsEnum versionsItem) {
-		this.versions.add(versionsItem);
+	public List<BrAPIWSMIMEDataTypes> getContentTypes() {
+		return contentTypes;
+	}
+
+	public void setContentTypes(List<BrAPIWSMIMEDataTypes> contentTypes) {
+		this.contentTypes = contentTypes;
+	}
+
+	@Deprecated
+	public BrAPIService addDataTypesItem(BrAPIWSMIMEDataTypes dataTypesItem) {
+		if (this.dataTypes == null) {
+			this.dataTypes = new ArrayList<BrAPIWSMIMEDataTypes>();
+		}
+		this.dataTypes.add(dataTypesItem);
 		return this;
 	}
 
+	@Deprecated
 	public BrAPIService dataTypes(List<BrAPIWSMIMEDataTypes> dataTypes) {
 		this.dataTypes = dataTypes;
 		return this;
 	}
 
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		BrAPIService service = (BrAPIService) o;
-		return Objects.equals(this.dataTypes, service.dataTypes) && Objects.equals(this.methods, service.methods)
-				&& Objects.equals(this.service, service.service) && Objects.equals(this.versions, service.versions);
-	}
-
-	/**
-	 * The possible data formats returned by the available call
-	 * 
-	 * @return dataTypes
-	 **/
-	
-	@Valid
+	@Deprecated
 	public List<BrAPIWSMIMEDataTypes> getDataTypes() {
 		return dataTypes;
 	}
 
-	/**
-	 * The possible HTTP Methods to be used with the available call
-	 * 
-	 * @return methods
-	 **/
-	
-	
-
-	public List<MethodsEnum> getMethods() {
-		return methods;
-	}
-
-	/**
-	 * The name of the available call as recorded in the documentation
-	 * 
-	 * @return service
-	 **/
-	
-	
-
-	public String getService() {
-		return service;
+	@Deprecated
+	public void setDataTypes(List<BrAPIWSMIMEDataTypes> dataTypes) {
+		this.dataTypes = dataTypes;
 	}
 
-	/**
-	 * The supported versions of a particular call
-	 * 
-	 * @return versions
-	 **/
-	
-	
-
-	public List<VersionsEnum> getVersions() {
-		return versions;
+	public BrAPIService addMethodsItem(MethodsEnum methodsItem) {
+		this.methods.add(methodsItem);
+		return this;
 	}
 
-	@Override
-	public int hashCode() {
-		return Objects.hash(dataTypes, methods, service, versions);
+	public List<MethodsEnum> getMethods() {
+		return methods;
 	}
 
 	public BrAPIService methods(List<MethodsEnum> methods) {
@@ -195,27 +95,56 @@ public BrAPIService methods(List<MethodsEnum> methods) {
 		return this;
 	}
 
+	public void setMethods(List<MethodsEnum> methods) {
+		this.methods = methods;
+	}
+
+	public String getService() {
+		return service;
+	}
+
 	public BrAPIService service(String service) {
 		this.service = service;
 		return this;
 	}
 
-	public void setDataTypes(List<BrAPIWSMIMEDataTypes> dataTypes) {
-		this.dataTypes = dataTypes;
+	public void setService(String service) {
+		this.service = service;
 	}
 
-	public void setMethods(List<MethodsEnum> methods) {
-		this.methods = methods;
+	public BrAPIService addVersionsItem(VersionsEnum versionsItem) {
+		this.versions.add(versionsItem);
+		return this;
 	}
 
-	public void setService(String service) {
-		this.service = service;
+	public List<VersionsEnum> getVersions() {
+		return versions;
 	}
 
 	public void setVersions(List<VersionsEnum> versions) {
 		this.versions = versions;
 	}
 
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIService service = (BrAPIService) o;
+		return Objects.equals(this.dataTypes, service.dataTypes)
+				&& Objects.equals(this.contentTypes, service.contentTypes)
+				&& Objects.equals(this.methods, service.methods) && Objects.equals(this.service, service.service)
+				&& Objects.equals(this.versions, service.versions);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(dataTypes, methods, service, versions);
+	}
+
 	/**
 	 * Convert the given object to string with each line indented by 4 spaces
 	 * (except the first line).
@@ -244,4 +173,80 @@ public BrAPIService versions(List<VersionsEnum> versions) {
 		this.versions = versions;
 		return this;
 	}
+
+	public enum MethodsEnum implements BrAPIEnum {
+		GET("GET"),
+
+		POST("POST"),
+
+		PUT("PUT"),
+
+		DELETE("DELETE");
+
+		@JsonCreator
+		public static MethodsEnum fromValue(String text) {
+			for (MethodsEnum b : MethodsEnum.values()) {
+				if (String.valueOf(b.value).equals(text)) {
+					return b;
+				}
+			}
+			return null;
+		}
+
+		private String value;
+
+		MethodsEnum(String value) {
+			this.value = value;
+		}
+
+		@Override
+		@JsonValue
+		public String toString() {
+			return String.valueOf(value);
+		}
+
+		@Override
+		public String getBrapiValue() {
+			// TODO Auto-generated method stub
+			return value;
+		}
+	}
+
+	/**
+	 * Gets or Sets versions
+	 */
+	public enum VersionsEnum implements BrAPIEnum {
+		_0("2.0"),
+
+		_1("2.1"),
+
+		_2("2.2");
+
+		@JsonCreator
+		public static VersionsEnum fromValue(String text) {
+			for (VersionsEnum b : VersionsEnum.values()) {
+				if (String.valueOf(b.value).equals(text)) {
+					return b;
+				}
+			}
+			return null;
+		}
+
+		private String value;
+
+		VersionsEnum(String value) {
+			this.value = value;
+		}
+
+		@Override
+		@JsonValue
+		public String toString() {
+			return String.valueOf(value);
+		}
+
+		@Override
+		public String getBrapiValue() {
+			return value;
+		}
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPIStudy.java b/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPIStudy.java
index 27a63bb6..39018004 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPIStudy.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPIStudy.java
@@ -13,784 +13,818 @@
 import org.brapi.v2.model.NullableJsonElementTypeAdapterFactory;
 import org.brapi.v2.model.pheno.BrAPIObservationUnitHierarchyLevel;
 
-import javax.validation.Valid;
-
-
 /**
  * Study
  */
 
-
 public class BrAPIStudy {
-  @JsonProperty("studyDbId")
-  private String studyDbId = null;
-
-  @JsonProperty("active")
-  private Boolean active = null;
-
-  @JsonProperty("additionalInfo")
-  @Valid
-  @JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
-  private JsonObject additionalInfo = null;
-
-  @JsonProperty("commonCropName")
-  private String commonCropName = null;
-
-  @JsonProperty("contacts")
-  @Valid
-  private List<BrAPIContact> contacts = null;
-
-  @JsonProperty("culturalPractices")
-  private String culturalPractices = null;
-
-  @JsonProperty("dataLinks")
-  @Valid
-  private List<BrAPIDataLink> dataLinks = null;
-
-  @JsonProperty("documentationURL")
-  private String documentationURL = null;
-
-  @JsonProperty("endDate")
-  private OffsetDateTime endDate = null;
-
-  @JsonProperty("environmentParameters")
-  @Valid
-  private List<BrAPIEnvironmentParameter> environmentParameters = null;
-
-  @JsonProperty("experimentalDesign")
-  private BrAPIStudyExperimentalDesign experimentalDesign = null;
-
-  @JsonProperty("externalReferences")
-  private List<BrAPIExternalReference> externalReferences = null;
-
-  @JsonProperty("growthFacility")
-  private BrAPIStudyGrowthFacility growthFacility = null;
-
-  @JsonProperty("lastUpdate")
-  private BrAPIStudyLastUpdate lastUpdate = null;
-
-  @JsonProperty("license")
-  private String license = null;
-
-  @JsonProperty("locationDbId")
-  private String locationDbId = null;
-
-  @JsonProperty("locationName")
-  private String locationName = null;
-
-  @JsonProperty("observationLevels")
-  @Valid
-  private List<BrAPIObservationUnitHierarchyLevel> observationLevels = null;
-
-  @JsonProperty("observationUnitsDescription")
-  private String observationUnitsDescription = null;
-
-  @JsonProperty("seasons")
-  @Valid
-  private List<String> seasons = null;
-
-  @JsonProperty("startDate")
-  private OffsetDateTime startDate = null;
-
-  @JsonProperty("studyCode")
-  private String studyCode = null;
-
-  @JsonProperty("studyDescription")
-  private String studyDescription = null;
-
-  @JsonProperty("studyName")
-  private String studyName = null;
-
-  @JsonProperty("studyPUI")
-  private String studyPUI = null;
-
-  @JsonProperty("studyType")
-  private String studyType = null;
-
-  @JsonProperty("trialDbId")
-  private String trialDbId = null;
-
-  @JsonProperty("trialName")
-  private String trialName = null;
-
-  private final transient Gson gson = new Gson();
-
-  /**
-   * The ID which uniquely identifies a study within the given database server  MIAPPE V1.1 (DM-11) Study unique ID - Unique identifier comprising the name or identifier for the institution/database hosting the submission of the study data, and the identifier of the study in that institution.
-   * @return studyDbId
-   **/
-
-  public String getStudyDbId() {
-    return studyDbId;
-  }
+	@JsonProperty("studyDbId")
+	private String studyDbId = null;
 
-  public void setStudyDbId(String studyDbId) {
-    this.studyDbId = studyDbId;
-  }
+	@JsonProperty("active")
+	private Boolean active = null;
 
-  public BrAPIStudy studyDbId(String studyDbId) {
-    this.studyDbId = studyDbId;
-    return this;
-  }
+	@JsonProperty("additionalInfo")
+	@JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
+	private JsonObject additionalInfo = null;
 
-  public BrAPIStudy active(Boolean active) {
-    this.active = active;
-    return this;
-  }
+	@JsonProperty("commonCropName")
+	private String commonCropName = null;
 
-  /**
-   * Is this study currently active
-   * @return active
-   **/
+	@JsonProperty("contacts")
+	private List<BrAPIContact> contacts = null;
 
+	@JsonProperty("culturalPractices")
+	private String culturalPractices = null;
 
-  public Boolean isActive() {
-    return active;
-  }
+	@JsonProperty("dataLinks")
+	private List<BrAPIDataLink> dataLinks = null;
 
-  public void setActive(Boolean active) {
-    this.active = active;
-  }
+	@JsonProperty("documentationURL")
+	private String documentationURL = null;
 
-  public BrAPIStudy additionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-    return this;
-  }
+	@JsonProperty("endDate")
+	private OffsetDateTime endDate = null;
 
-  public BrAPIStudy putAdditionalInfoItem(String key, Object additionalInfoItem) {
-    if (this.additionalInfo == null) {
-      this.additionalInfo = new JsonObject();
-    }
-    JsonElement newElement = gson.toJsonTree(additionalInfoItem);
-    this.additionalInfo.add(key, newElement);
-    return this;
-  }
-
-  /**
-   * Additional arbitrary info
-   * @return additionalInfo
-   **/
+	@JsonProperty("environmentParameters")
+	private List<BrAPIEnvironmentParameter> environmentParameters = null;
 
+	@JsonProperty("experimentalDesign")
+	private BrAPIStudyExperimentalDesign experimentalDesign = null;
 
-  public JsonObject getAdditionalInfo() {
-    return additionalInfo;
-  }
-
-  public void setAdditionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-  }
-
-  public BrAPIStudy commonCropName(String commonCropName) {
-    this.commonCropName = commonCropName;
-    return this;
-  }
-
-  /**
-   * Common name for the crop associated with this study
-   * @return commonCropName
-   **/
-
-
-  public String getCommonCropName() {
-    return commonCropName;
-  }
-
-  public void setCommonCropName(String commonCropName) {
-    this.commonCropName = commonCropName;
-  }
-
-  public BrAPIStudy contacts(List<BrAPIContact> contacts) {
-    this.contacts = contacts;
-    return this;
-  }
-
-  public BrAPIStudy addContactsItem(BrAPIContact contactsItem) {
-    if (this.contacts == null) {
-      this.contacts = new ArrayList<BrAPIContact>();
-    }
-    this.contacts.add(contactsItem);
-    return this;
-  }
-
-  /**
-   * List of contact entities associated with this study
-   * @return contacts
-   **/
-
-  @Valid
-  public List<BrAPIContact> getContacts() {
-    return contacts;
-  }
-
-  public void setContacts(List<BrAPIContact> contacts) {
-    this.contacts = contacts;
-  }
-
-  public BrAPIStudy culturalPractices(String culturalPractices) {
-    this.culturalPractices = culturalPractices;
-    return this;
-  }
-
-  /**
-   * MIAPPE V1.1 (DM-28) Cultural practices - General description of the cultural practices of the study.
-   * @return culturalPractices
-   **/
-
-
-  public String getCulturalPractices() {
-    return culturalPractices;
-  }
-
-  public void setCulturalPractices(String culturalPractices) {
-    this.culturalPractices = culturalPractices;
-  }
-
-  public BrAPIStudy dataLinks(List<BrAPIDataLink> dataLinks) {
-    this.dataLinks = dataLinks;
-    return this;
-  }
-
-  public BrAPIStudy addDataLinksItem(BrAPIDataLink dataLinksItem) {
-    if (this.dataLinks == null) {
-      this.dataLinks = new ArrayList<BrAPIDataLink>();
-    }
-    this.dataLinks.add(dataLinksItem);
-    return this;
-  }
-
-  /**
-   * List of links to extra data files associated with this study. Extra data could include notes, images, and reference data.
-   * @return dataLinks
-   **/
-
-  @Valid
-  public List<BrAPIDataLink> getDataLinks() {
-    return dataLinks;
-  }
-
-  public void setDataLinks(List<BrAPIDataLink> dataLinks) {
-    this.dataLinks = dataLinks;
-  }
-
-  public BrAPIStudy documentationURL(String documentationURL) {
-    this.documentationURL = documentationURL;
-    return this;
-  }
-
-  /**
-   * A URL to the human readable documentation of this object
-   * @return documentationURL
-   **/
-
-
-  public String getDocumentationURL() {
-    return documentationURL;
-  }
-
-  public void setDocumentationURL(String documentationURL) {
-    this.documentationURL = documentationURL;
-  }
-
-  public BrAPIStudy endDate(OffsetDateTime endDate) {
-    this.endDate = endDate;
-    return this;
-  }
-
-  /**
-   * The date the study ends  MIAPPE V1.1 (DM-15) End date of study - Date and, if relevant, time when the experiment ended
-   * @return endDate
-   **/
-
-
-  @Valid
-  public OffsetDateTime getEndDate() {
-    return endDate;
-  }
-
-  public void setEndDate(OffsetDateTime endDate) {
-    this.endDate = endDate;
-  }
-
-  public BrAPIStudy environmentParameters(List<BrAPIEnvironmentParameter> environmentParameters) {
-    this.environmentParameters = environmentParameters;
-    return this;
-  }
-
-  public BrAPIStudy addEnvironmentParametersItem(BrAPIEnvironmentParameter environmentParametersItem) {
-    if (this.environmentParameters == null) {
-      this.environmentParameters = new ArrayList<BrAPIEnvironmentParameter>();
-    }
-    this.environmentParameters.add(environmentParametersItem);
-    return this;
-  }
-
-  /**
-   * Environmental parameters that were kept constant throughout the study and did not change between observation units.
-   * @return environmentParameters
-   **/
-
-  @Valid
-  public List<BrAPIEnvironmentParameter> getEnvironmentParameters() {
-    return environmentParameters;
-  }
-
-  public void setEnvironmentParameters(List<BrAPIEnvironmentParameter> environmentParameters) {
-    this.environmentParameters = environmentParameters;
-  }
-
-  public BrAPIStudy experimentalDesign(BrAPIStudyExperimentalDesign experimentalDesign) {
-    this.experimentalDesign = experimentalDesign;
-    return this;
-  }
-
-  /**
-   * Get experimentalDesign
-   * @return experimentalDesign
-   **/
-
-
-  @Valid
-  public BrAPIStudyExperimentalDesign getExperimentalDesign() {
-    return experimentalDesign;
-  }
-
-  public void setExperimentalDesign(BrAPIStudyExperimentalDesign experimentalDesign) {
-    this.experimentalDesign = experimentalDesign;
-  }
-
-  public BrAPIStudy externalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-    return this;
-  }
-
-  /**
-   * Get externalReferences
-   * @return externalReferences
-   **/
-
-
-  @Valid
-  public List<BrAPIExternalReference> getExternalReferences() {
-    return externalReferences;
-  }
-
-  public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-  }
-
-  public BrAPIStudy growthFacility(BrAPIStudyGrowthFacility growthFacility) {
-    this.growthFacility = growthFacility;
-    return this;
-  }
-
-  /**
-   * Get growthFacility
-   * @return growthFacility
-   **/
-
-
-  @Valid
-  public BrAPIStudyGrowthFacility getGrowthFacility() {
-    return growthFacility;
-  }
-
-  public void setGrowthFacility(BrAPIStudyGrowthFacility growthFacility) {
-    this.growthFacility = growthFacility;
-  }
-
-  public BrAPIStudy lastUpdate(BrAPIStudyLastUpdate lastUpdate) {
-    this.lastUpdate = lastUpdate;
-    return this;
-  }
-
-  /**
-   * Get lastUpdate
-   * @return lastUpdate
-   **/
-
-
-  @Valid
-  public BrAPIStudyLastUpdate getLastUpdate() {
-    return lastUpdate;
-  }
-
-  public void setLastUpdate(BrAPIStudyLastUpdate lastUpdate) {
-    this.lastUpdate = lastUpdate;
-  }
-
-  public BrAPIStudy license(String license) {
-    this.license = license;
-    return this;
-  }
-
-  /**
-   * The usage license associated with the study data
-   * @return license
-   **/
-
-
-  public String getLicense() {
-    return license;
-  }
-
-  public void setLicense(String license) {
-    this.license = license;
-  }
-
-  public BrAPIStudy locationDbId(String locationDbId) {
-    this.locationDbId = locationDbId;
-    return this;
-  }
-
-  /**
-   * The unique identifier for a Location
-   * @return locationDbId
-   **/
+	@JsonProperty("externalReferences")
+	private List<BrAPIExternalReference> externalReferences = null;
 
+	@JsonProperty("growthFacility")
+	private BrAPIStudyGrowthFacility growthFacility = null;
 
-  public String getLocationDbId() {
-    return locationDbId;
-  }
-
-  public void setLocationDbId(String locationDbId) {
-    this.locationDbId = locationDbId;
-  }
-
-  public BrAPIStudy locationName(String locationName) {
-    this.locationName = locationName;
-    return this;
-  }
-
-  /**
-   * A human readable name for this location  MIAPPE V1.1 (DM-18) Experimental site name - The name of the natural site, experimental field, greenhouse, phenotyping facility, etc. where the experiment took place.
-   * @return locationName
-   **/
-
-
-  public String getLocationName() {
-    return locationName;
-  }
-
-  public void setLocationName(String locationName) {
-    this.locationName = locationName;
-  }
-
-  public BrAPIStudy observationLevels(List<BrAPIObservationUnitHierarchyLevel> observationLevels) {
-    this.observationLevels = observationLevels;
-    return this;
-  }
-
-  public BrAPIStudy addObservationLevelsItem(BrAPIObservationUnitHierarchyLevel observationLevelsItem) {
-    if (this.observationLevels == null) {
-      this.observationLevels = new ArrayList<BrAPIObservationUnitHierarchyLevel>();
-    }
-    this.observationLevels.add(observationLevelsItem);
-    return this;
-  }
+	@JsonProperty("lastUpdate")
+	private BrAPIStudyLastUpdate lastUpdate = null;
 
-  /**
-   * Observation levels indicate the granularity level at which the measurements are taken. `levelName` defines the level, `levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are at the bottom of the hierarchy (ie plant > 6).
-   * @return observationLevels
-   **/
-
-  @Valid
-  public List<BrAPIObservationUnitHierarchyLevel> getObservationLevels() {
-    return observationLevels;
-  }
+	@JsonProperty("license")
+	private String license = null;
 
-  public void setObservationLevels(List<BrAPIObservationUnitHierarchyLevel> observationLevels) {
-    this.observationLevels = observationLevels;
-  }
+	@JsonProperty("locationDbId")
+	private String locationDbId = null;
 
-  public BrAPIStudy observationUnitsDescription(String observationUnitsDescription) {
-    this.observationUnitsDescription = observationUnitsDescription;
-    return this;
-  }
+	@JsonProperty("locationName")
+	private String locationName = null;
 
-  /**
-   * MIAPPE V1.1 (DM-25) Observation unit description - General description of the observation units in the study.
-   * @return observationUnitsDescription
-   **/
-
-
-  public String getObservationUnitsDescription() {
-    return observationUnitsDescription;
-  }
+	@JsonProperty("observationLevels")
+	private List<BrAPIObservationUnitHierarchyLevel> observationLevels = null;
 
-  public void setObservationUnitsDescription(String observationUnitsDescription) {
-    this.observationUnitsDescription = observationUnitsDescription;
-  }
+	@JsonProperty("observationUnitsDescription")
+	private String observationUnitsDescription = null;
 
-  public BrAPIStudy seasons(List<String> seasons) {
-    this.seasons = seasons;
-    return this;
-  }
-
-  public BrAPIStudy addSeasonsItem(String seasonsItem) {
-    if (this.seasons == null) {
-      this.seasons = new ArrayList<String>();
-    }
-    this.seasons.add(seasonsItem);
-    return this;
-  }
-
-  /**
-   * List of seasons over which this study was performed.
-   * @return seasons
-   **/
+	@JsonProperty("observationVariableDbIds")
+	private List<String> observationVariableDbIds = null;
 
+	@JsonProperty("seasons")
+	private List<String> seasons = null;
 
-  public List<String> getSeasons() {
-    return seasons;
-  }
-
-  public void setSeasons(List<String> seasons) {
-    this.seasons = seasons;
-  }
-
-  public BrAPIStudy startDate(OffsetDateTime startDate) {
-    this.startDate = startDate;
-    return this;
-  }
-
-  /**
-   * The date this study started  MIAPPE V1.1 (DM-14) Start date of study - Date and, if relevant, time when the experiment started
-   * @return startDate
-   **/
+	@JsonProperty("startDate")
+	private OffsetDateTime startDate = null;
 
+	@JsonProperty("studyCode")
+	private String studyCode = null;
 
-  @Valid
-  public OffsetDateTime getStartDate() {
-    return startDate;
-  }
+	@JsonProperty("studyDescription")
+	private String studyDescription = null;
 
-  public void setStartDate(OffsetDateTime startDate) {
-    this.startDate = startDate;
-  }
-
-  public BrAPIStudy studyCode(String studyCode) {
-    this.studyCode = studyCode;
-    return this;
-  }
-
-  /**
-   * A short human readable code for a study
-   * @return studyCode
-   **/
+	@JsonProperty("studyName")
+	private String studyName = null;
 
+	@JsonProperty("studyPUI")
+	private String studyPUI = null;
 
-  public String getStudyCode() {
-    return studyCode;
-  }
+	@JsonProperty("studyType")
+	private String studyType = null;
 
-  public void setStudyCode(String studyCode) {
-    this.studyCode = studyCode;
-  }
+	@JsonProperty("trialDbId")
+	private String trialDbId = null;
 
-  public BrAPIStudy studyDescription(String studyDescription) {
-    this.studyDescription = studyDescription;
-    return this;
-  }
+	@JsonProperty("trialName")
+	private String trialName = null;
 
-  /**
-   * The description of this study  MIAPPE V1.1 (DM-13) Study description - Human-readable text describing the study
-   * @return studyDescription
-   **/
+	private final transient Gson gson = new Gson();
 
+	/**
+	 * The ID which uniquely identifies a study within the given database server
+	 * MIAPPE V1.1 (DM-11) Study unique ID - Unique identifier comprising the name
+	 * or identifier for the institution/database hosting the submission of the
+	 * study data, and the identifier of the study in that institution.
+	 * 
+	 * @return studyDbId
+	 **/
 
-  public String getStudyDescription() {
-    return studyDescription;
-  }
+	public String getStudyDbId() {
+		return studyDbId;
+	}
 
-  public void setStudyDescription(String studyDescription) {
-    this.studyDescription = studyDescription;
-  }
+	public void setStudyDbId(String studyDbId) {
+		this.studyDbId = studyDbId;
+	}
 
-  public BrAPIStudy studyName(String studyName) {
-    this.studyName = studyName;
-    return this;
-  }
+	public BrAPIStudy studyDbId(String studyDbId) {
+		this.studyDbId = studyDbId;
+		return this;
+	}
 
-  /**
-   * The human readable name for a study  MIAPPE V1.1 (DM-12) Study title - Human-readable text summarising the study
-   * @return studyName
-   **/
-
-
-  public String getStudyName() {
-    return studyName;
-  }
-
-  public void setStudyName(String studyName) {
-    this.studyName = studyName;
-  }
-
-  public BrAPIStudy studyPUI(String studyPUI) {
-    this.studyPUI = studyPUI;
-    return this;
-  }
-
-  /**
-   * A permanent unique identifier associated with this study data. For example, a URI or DOI
-   * @return studyPUI
-   **/
-
-
-  public String getStudyPUI() {
-    return studyPUI;
-  }
-
-  public void setStudyPUI(String studyPUI) {
-    this.studyPUI = studyPUI;
-  }
-
-  public BrAPIStudy studyType(String studyType) {
-    this.studyType = studyType;
-    return this;
-  }
-
-  /**
-   * The type of study being performed. ex. \"Yield Trial\", etc
-   * @return studyType
-   **/
-
-
-  public String getStudyType() {
-    return studyType;
-  }
-
-  public void setStudyType(String studyType) {
-    this.studyType = studyType;
-  }
-
-  public BrAPIStudy trialDbId(String trialDbId) {
-    this.trialDbId = trialDbId;
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies a trial
-   * @return trialDbId
-   **/
-
-
-  public String getTrialDbId() {
-    return trialDbId;
-  }
-
-  public void setTrialDbId(String trialDbId) {
-    this.trialDbId = trialDbId;
-  }
-
-  public BrAPIStudy trialName(String trialName) {
-    this.trialName = trialName;
-    return this;
-  }
-
-  /**
-   * The human readable name of a trial
-   * @return trialName
-   **/
-
-
-  public String getTrialName() {
-    return trialName;
-  }
-
-  public void setTrialName(String trialName) {
-    this.trialName = trialName;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIStudy study = (BrAPIStudy) o;
-    return Objects.equals(this.studyDbId, study.studyDbId)
-            && Objects.equals(this.active, study.active) &&
-            Objects.equals(this.additionalInfo, study.additionalInfo) &&
-            Objects.equals(this.commonCropName, study.commonCropName) &&
-            Objects.equals(this.contacts, study.contacts) &&
-            Objects.equals(this.culturalPractices, study.culturalPractices) &&
-            Objects.equals(this.dataLinks, study.dataLinks) &&
-            Objects.equals(this.documentationURL, study.documentationURL) &&
-            Objects.equals(this.endDate, study.endDate) &&
-            Objects.equals(this.environmentParameters, study.environmentParameters) &&
-            Objects.equals(this.experimentalDesign, study.experimentalDesign) &&
-            Objects.equals(this.externalReferences, study.externalReferences) &&
-            Objects.equals(this.growthFacility, study.growthFacility) &&
-            Objects.equals(this.lastUpdate, study.lastUpdate) &&
-            Objects.equals(this.license, study.license) &&
-            Objects.equals(this.locationDbId, study.locationDbId) &&
-            Objects.equals(this.locationName, study.locationName) &&
-            Objects.equals(this.observationLevels, study.observationLevels) &&
-            Objects.equals(this.observationUnitsDescription, study.observationUnitsDescription) &&
-            Objects.equals(this.seasons, study.seasons) &&
-            Objects.equals(this.startDate, study.startDate) &&
-            Objects.equals(this.studyCode, study.studyCode) &&
-            Objects.equals(this.studyDescription, study.studyDescription) &&
-            Objects.equals(this.studyName, study.studyName) &&
-            Objects.equals(this.studyPUI, study.studyPUI) &&
-            Objects.equals(this.studyType, study.studyType) &&
-            Objects.equals(this.trialDbId, study.trialDbId) &&
-            Objects.equals(this.trialName, study.trialName);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(studyDbId, active, additionalInfo, commonCropName, contacts, culturalPractices, dataLinks, documentationURL, endDate, environmentParameters, experimentalDesign, externalReferences, growthFacility, lastUpdate, license, locationDbId, locationName, observationLevels, observationUnitsDescription, seasons, startDate, studyCode, studyDescription, studyName, studyPUI, studyType, trialDbId, trialName);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Study{\n");
-    sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-    sb.append("    active: ").append(toIndentedString(active)).append("\n");
-    sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-    sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-    sb.append("    contacts: ").append(toIndentedString(contacts)).append("\n");
-    sb.append("    culturalPractices: ").append(toIndentedString(culturalPractices)).append("\n");
-    sb.append("    dataLinks: ").append(toIndentedString(dataLinks)).append("\n");
-    sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-    sb.append("    endDate: ").append(toIndentedString(endDate)).append("\n");
-    sb.append("    environmentParameters: ").append(toIndentedString(environmentParameters)).append("\n");
-    sb.append("    experimentalDesign: ").append(toIndentedString(experimentalDesign)).append("\n");
-    sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-    sb.append("    growthFacility: ").append(toIndentedString(growthFacility)).append("\n");
-    sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-    sb.append("    license: ").append(toIndentedString(license)).append("\n");
-    sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
-    sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
-    sb.append("    observationLevels: ").append(toIndentedString(observationLevels)).append("\n");
-    sb.append("    observationUnitsDescription: ").append(toIndentedString(observationUnitsDescription)).append("\n");
-    sb.append("    seasons: ").append(toIndentedString(seasons)).append("\n");
-    sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-    sb.append("    studyCode: ").append(toIndentedString(studyCode)).append("\n");
-    sb.append("    studyDescription: ").append(toIndentedString(studyDescription)).append("\n");
-    sb.append("    studyName: ").append(toIndentedString(studyName)).append("\n");
-    sb.append("    studyPUI: ").append(toIndentedString(studyPUI)).append("\n");
-    sb.append("    studyType: ").append(toIndentedString(studyType)).append("\n");
-    sb.append("    trialDbId: ").append(toIndentedString(trialDbId)).append("\n");
-    sb.append("    trialName: ").append(toIndentedString(trialName)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+	public BrAPIStudy active(Boolean active) {
+		this.active = active;
+		return this;
+	}
+
+	/**
+	 * Is this study currently active
+	 * 
+	 * @return active
+	 **/
+
+	public Boolean isActive() {
+		return active;
+	}
+
+	public void setActive(Boolean active) {
+		this.active = active;
+	}
+
+	public BrAPIStudy additionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+		return this;
+	}
+
+	public BrAPIStudy putAdditionalInfoItem(String key, Object additionalInfoItem) {
+		if (this.additionalInfo == null) {
+			this.additionalInfo = new JsonObject();
+		}
+		JsonElement newElement = gson.toJsonTree(additionalInfoItem);
+		this.additionalInfo.add(key, newElement);
+		return this;
+	}
+
+	/**
+	 * Additional arbitrary info
+	 * 
+	 * @return additionalInfo
+	 **/
+
+	public JsonObject getAdditionalInfo() {
+		return additionalInfo;
+	}
+
+	public void setAdditionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+	}
+
+	public BrAPIStudy commonCropName(String commonCropName) {
+		this.commonCropName = commonCropName;
+		return this;
+	}
+
+	/**
+	 * Common name for the crop associated with this study
+	 * 
+	 * @return commonCropName
+	 **/
+
+	public String getCommonCropName() {
+		return commonCropName;
+	}
+
+	public void setCommonCropName(String commonCropName) {
+		this.commonCropName = commonCropName;
+	}
+
+	public BrAPIStudy contacts(List<BrAPIContact> contacts) {
+		this.contacts = contacts;
+		return this;
+	}
+
+	public BrAPIStudy addContactsItem(BrAPIContact contactsItem) {
+		if (this.contacts == null) {
+			this.contacts = new ArrayList<BrAPIContact>();
+		}
+		this.contacts.add(contactsItem);
+		return this;
+	}
+
+	/**
+	 * List of contact entities associated with this study
+	 * 
+	 * @return contacts
+	 **/
+
+	public List<BrAPIContact> getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(List<BrAPIContact> contacts) {
+		this.contacts = contacts;
+	}
+
+	public BrAPIStudy culturalPractices(String culturalPractices) {
+		this.culturalPractices = culturalPractices;
+		return this;
+	}
+
+	/**
+	 * MIAPPE V1.1 (DM-28) Cultural practices - General description of the cultural
+	 * practices of the study.
+	 * 
+	 * @return culturalPractices
+	 **/
+
+	public String getCulturalPractices() {
+		return culturalPractices;
+	}
+
+	public void setCulturalPractices(String culturalPractices) {
+		this.culturalPractices = culturalPractices;
+	}
+
+	public BrAPIStudy dataLinks(List<BrAPIDataLink> dataLinks) {
+		this.dataLinks = dataLinks;
+		return this;
+	}
+
+	public BrAPIStudy addDataLinksItem(BrAPIDataLink dataLinksItem) {
+		if (this.dataLinks == null) {
+			this.dataLinks = new ArrayList<BrAPIDataLink>();
+		}
+		this.dataLinks.add(dataLinksItem);
+		return this;
+	}
+
+	/**
+	 * List of links to extra data files associated with this study. Extra data
+	 * could include notes, images, and reference data.
+	 * 
+	 * @return dataLinks
+	 **/
+
+	public List<BrAPIDataLink> getDataLinks() {
+		return dataLinks;
+	}
+
+	public void setDataLinks(List<BrAPIDataLink> dataLinks) {
+		this.dataLinks = dataLinks;
+	}
+
+	public BrAPIStudy documentationURL(String documentationURL) {
+		this.documentationURL = documentationURL;
+		return this;
+	}
+
+	/**
+	 * A URL to the human readable documentation of this object
+	 * 
+	 * @return documentationURL
+	 **/
+
+	public String getDocumentationURL() {
+		return documentationURL;
+	}
+
+	public void setDocumentationURL(String documentationURL) {
+		this.documentationURL = documentationURL;
+	}
+
+	public BrAPIStudy endDate(OffsetDateTime endDate) {
+		this.endDate = endDate;
+		return this;
+	}
+
+	/**
+	 * The date the study ends MIAPPE V1.1 (DM-15) End date of study - Date and, if
+	 * relevant, time when the experiment ended
+	 * 
+	 * @return endDate
+	 **/
+
+	public OffsetDateTime getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(OffsetDateTime endDate) {
+		this.endDate = endDate;
+	}
+
+	public BrAPIStudy environmentParameters(List<BrAPIEnvironmentParameter> environmentParameters) {
+		this.environmentParameters = environmentParameters;
+		return this;
+	}
+
+	public BrAPIStudy addEnvironmentParametersItem(BrAPIEnvironmentParameter environmentParametersItem) {
+		if (this.environmentParameters == null) {
+			this.environmentParameters = new ArrayList<BrAPIEnvironmentParameter>();
+		}
+		this.environmentParameters.add(environmentParametersItem);
+		return this;
+	}
+
+	/**
+	 * Environmental parameters that were kept constant throughout the study and did
+	 * not change between observation units.
+	 * 
+	 * @return environmentParameters
+	 **/
+
+	public List<BrAPIEnvironmentParameter> getEnvironmentParameters() {
+		return environmentParameters;
+	}
+
+	public void setEnvironmentParameters(List<BrAPIEnvironmentParameter> environmentParameters) {
+		this.environmentParameters = environmentParameters;
+	}
+
+	public BrAPIStudy experimentalDesign(BrAPIStudyExperimentalDesign experimentalDesign) {
+		this.experimentalDesign = experimentalDesign;
+		return this;
+	}
+
+	/**
+	 * Get experimentalDesign
+	 * 
+	 * @return experimentalDesign
+	 **/
+
+	public BrAPIStudyExperimentalDesign getExperimentalDesign() {
+		return experimentalDesign;
+	}
+
+	public void setExperimentalDesign(BrAPIStudyExperimentalDesign experimentalDesign) {
+		this.experimentalDesign = experimentalDesign;
+	}
+
+	public BrAPIStudy externalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+		return this;
+	}
+
+	/**
+	 * Get externalReferences
+	 * 
+	 * @return externalReferences
+	 **/
+
+	public List<BrAPIExternalReference> getExternalReferences() {
+		return externalReferences;
+	}
+
+	public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+	}
+
+	public BrAPIStudy growthFacility(BrAPIStudyGrowthFacility growthFacility) {
+		this.growthFacility = growthFacility;
+		return this;
+	}
+
+	/**
+	 * Get growthFacility
+	 * 
+	 * @return growthFacility
+	 **/
+
+	public BrAPIStudyGrowthFacility getGrowthFacility() {
+		return growthFacility;
+	}
+
+	public void setGrowthFacility(BrAPIStudyGrowthFacility growthFacility) {
+		this.growthFacility = growthFacility;
+	}
+
+	public BrAPIStudy lastUpdate(BrAPIStudyLastUpdate lastUpdate) {
+		this.lastUpdate = lastUpdate;
+		return this;
+	}
+
+	/**
+	 * Get lastUpdate
+	 * 
+	 * @return lastUpdate
+	 **/
+
+	public BrAPIStudyLastUpdate getLastUpdate() {
+		return lastUpdate;
+	}
+
+	public void setLastUpdate(BrAPIStudyLastUpdate lastUpdate) {
+		this.lastUpdate = lastUpdate;
+	}
+
+	public BrAPIStudy license(String license) {
+		this.license = license;
+		return this;
+	}
+
+	/**
+	 * The usage license associated with the study data
+	 * 
+	 * @return license
+	 **/
+
+	public String getLicense() {
+		return license;
+	}
+
+	public void setLicense(String license) {
+		this.license = license;
+	}
+
+	public BrAPIStudy locationDbId(String locationDbId) {
+		this.locationDbId = locationDbId;
+		return this;
+	}
+
+	/**
+	 * The unique identifier for a Location
+	 * 
+	 * @return locationDbId
+	 **/
+
+	public String getLocationDbId() {
+		return locationDbId;
+	}
+
+	public void setLocationDbId(String locationDbId) {
+		this.locationDbId = locationDbId;
+	}
+
+	public BrAPIStudy locationName(String locationName) {
+		this.locationName = locationName;
+		return this;
+	}
+
+	/**
+	 * A human readable name for this location MIAPPE V1.1 (DM-18) Experimental site
+	 * name - The name of the natural site, experimental field, greenhouse,
+	 * phenotyping facility, etc. where the experiment took place.
+	 * 
+	 * @return locationName
+	 **/
+
+	public String getLocationName() {
+		return locationName;
+	}
+
+	public void setLocationName(String locationName) {
+		this.locationName = locationName;
+	}
+
+	public BrAPIStudy observationLevels(List<BrAPIObservationUnitHierarchyLevel> observationLevels) {
+		this.observationLevels = observationLevels;
+		return this;
+	}
+
+	public BrAPIStudy addObservationLevelsItem(BrAPIObservationUnitHierarchyLevel observationLevelsItem) {
+		if (this.observationLevels == null) {
+			this.observationLevels = new ArrayList<BrAPIObservationUnitHierarchyLevel>();
+		}
+		this.observationLevels.add(observationLevelsItem);
+		return this;
+	}
+
+	/**
+	 * Observation levels indicate the granularity level at which the measurements
+	 * are taken. `levelName` defines the level, `levelOrder` defines where that
+	 * level exists in the hierarchy of levels. `levelOrder`s lower numbers are at
+	 * the top of the hierarchy (ie field > 0) and higher numbers are at the bottom
+	 * of the hierarchy (ie plant > 6).
+	 * 
+	 * @return observationLevels
+	 **/
+
+	public List<BrAPIObservationUnitHierarchyLevel> getObservationLevels() {
+		return observationLevels;
+	}
+
+	public void setObservationLevels(List<BrAPIObservationUnitHierarchyLevel> observationLevels) {
+		this.observationLevels = observationLevels;
+	}
+
+	public BrAPIStudy observationUnitsDescription(String observationUnitsDescription) {
+		this.observationUnitsDescription = observationUnitsDescription;
+		return this;
+	}
+
+	/**
+	 * MIAPPE V1.1 (DM-25) Observation unit description - General description of the
+	 * observation units in the study.
+	 * 
+	 * @return observationUnitsDescription
+	 **/
+
+	public String getObservationUnitsDescription() {
+		return observationUnitsDescription;
+	}
+
+	public void setObservationUnitsDescription(String observationUnitsDescription) {
+		this.observationUnitsDescription = observationUnitsDescription;
+	}
+
+	public BrAPIStudy observationVariableDbIds(List<String> observationVariableDbIds) {
+		this.observationVariableDbIds = observationVariableDbIds;
+		return this;
+	}
+
+	public BrAPIStudy addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
+		if (this.observationVariableDbIds == null) {
+			this.observationVariableDbIds = new ArrayList<String>();
+		}
+		this.observationVariableDbIds.add(observationVariableDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of observationVariableDbIds over which this study was performed.
+	 * 
+	 * @return observationVariableDbIds
+	 **/
+
+	public List<String> getObservationVariableDbIds() {
+		return observationVariableDbIds;
+	}
+
+	public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
+		this.observationVariableDbIds = observationVariableDbIds;
+	}
+
+	public BrAPIStudy seasons(List<String> seasons) {
+		this.seasons = seasons;
+		return this;
+	}
+
+	public BrAPIStudy addSeasonsItem(String seasonsItem) {
+		if (this.seasons == null) {
+			this.seasons = new ArrayList<String>();
+		}
+		this.seasons.add(seasonsItem);
+		return this;
+	}
+
+	/**
+	 * List of seasons over which this study was performed.
+	 * 
+	 * @return seasons
+	 **/
+
+	public List<String> getSeasons() {
+		return seasons;
+	}
+
+	public void setSeasons(List<String> seasons) {
+		this.seasons = seasons;
+	}
+
+	public BrAPIStudy startDate(OffsetDateTime startDate) {
+		this.startDate = startDate;
+		return this;
+	}
+
+	/**
+	 * The date this study started MIAPPE V1.1 (DM-14) Start date of study - Date
+	 * and, if relevant, time when the experiment started
+	 * 
+	 * @return startDate
+	 **/
+
+	public OffsetDateTime getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(OffsetDateTime startDate) {
+		this.startDate = startDate;
+	}
+
+	public BrAPIStudy studyCode(String studyCode) {
+		this.studyCode = studyCode;
+		return this;
+	}
+
+	/**
+	 * A short human readable code for a study
+	 * 
+	 * @return studyCode
+	 **/
+
+	public String getStudyCode() {
+		return studyCode;
+	}
+
+	public void setStudyCode(String studyCode) {
+		this.studyCode = studyCode;
+	}
+
+	public BrAPIStudy studyDescription(String studyDescription) {
+		this.studyDescription = studyDescription;
+		return this;
+	}
+
+	/**
+	 * The description of this study MIAPPE V1.1 (DM-13) Study description -
+	 * Human-readable text describing the study
+	 * 
+	 * @return studyDescription
+	 **/
+
+	public String getStudyDescription() {
+		return studyDescription;
+	}
+
+	public void setStudyDescription(String studyDescription) {
+		this.studyDescription = studyDescription;
+	}
+
+	public BrAPIStudy studyName(String studyName) {
+		this.studyName = studyName;
+		return this;
+	}
+
+	/**
+	 * The human readable name for a study MIAPPE V1.1 (DM-12) Study title -
+	 * Human-readable text summarising the study
+	 * 
+	 * @return studyName
+	 **/
+
+	public String getStudyName() {
+		return studyName;
+	}
+
+	public void setStudyName(String studyName) {
+		this.studyName = studyName;
+	}
+
+	public BrAPIStudy studyPUI(String studyPUI) {
+		this.studyPUI = studyPUI;
+		return this;
+	}
+
+	/**
+	 * A permanent unique identifier associated with this study data. For example, a
+	 * URI or DOI
+	 * 
+	 * @return studyPUI
+	 **/
+
+	public String getStudyPUI() {
+		return studyPUI;
+	}
+
+	public void setStudyPUI(String studyPUI) {
+		this.studyPUI = studyPUI;
+	}
+
+	public BrAPIStudy studyType(String studyType) {
+		this.studyType = studyType;
+		return this;
+	}
+
+	/**
+	 * The type of study being performed. ex. \"Yield Trial\", etc
+	 * 
+	 * @return studyType
+	 **/
+
+	public String getStudyType() {
+		return studyType;
+	}
+
+	public void setStudyType(String studyType) {
+		this.studyType = studyType;
+	}
+
+	public BrAPIStudy trialDbId(String trialDbId) {
+		this.trialDbId = trialDbId;
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a trial
+	 * 
+	 * @return trialDbId
+	 **/
+
+	public String getTrialDbId() {
+		return trialDbId;
+	}
+
+	public void setTrialDbId(String trialDbId) {
+		this.trialDbId = trialDbId;
+	}
+
+	public BrAPIStudy trialName(String trialName) {
+		this.trialName = trialName;
+		return this;
+	}
+
+	/**
+	 * The human readable name of a trial
+	 * 
+	 * @return trialName
+	 **/
+
+	public String getTrialName() {
+		return trialName;
+	}
+
+	public void setTrialName(String trialName) {
+		this.trialName = trialName;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIStudy study = (BrAPIStudy) o;
+		return Objects.equals(this.studyDbId, study.studyDbId) && Objects.equals(this.active, study.active)
+				&& Objects.equals(this.additionalInfo, study.additionalInfo)
+				&& Objects.equals(this.commonCropName, study.commonCropName)
+				&& Objects.equals(this.contacts, study.contacts)
+				&& Objects.equals(this.culturalPractices, study.culturalPractices)
+				&& Objects.equals(this.dataLinks, study.dataLinks)
+				&& Objects.equals(this.documentationURL, study.documentationURL)
+				&& Objects.equals(this.endDate, study.endDate)
+				&& Objects.equals(this.environmentParameters, study.environmentParameters)
+				&& Objects.equals(this.experimentalDesign, study.experimentalDesign)
+				&& Objects.equals(this.externalReferences, study.externalReferences)
+				&& Objects.equals(this.growthFacility, study.growthFacility)
+				&& Objects.equals(this.lastUpdate, study.lastUpdate) && Objects.equals(this.license, study.license)
+				&& Objects.equals(this.locationDbId, study.locationDbId)
+				&& Objects.equals(this.locationName, study.locationName)
+				&& Objects.equals(this.observationLevels, study.observationLevels)
+				&& Objects.equals(this.observationUnitsDescription, study.observationUnitsDescription)
+				&& Objects.equals(this.seasons, study.seasons)
+				&& Objects.equals(this.observationVariableDbIds, study.observationVariableDbIds)
+				&& Objects.equals(this.startDate, study.startDate) && Objects.equals(this.studyCode, study.studyCode)
+				&& Objects.equals(this.studyDescription, study.studyDescription)
+				&& Objects.equals(this.studyName, study.studyName) && Objects.equals(this.studyPUI, study.studyPUI)
+				&& Objects.equals(this.studyType, study.studyType) && Objects.equals(this.trialDbId, study.trialDbId)
+				&& Objects.equals(this.trialName, study.trialName);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(studyDbId, active, additionalInfo, commonCropName, contacts, culturalPractices, dataLinks,
+				documentationURL, endDate, environmentParameters, experimentalDesign, externalReferences,
+				growthFacility, lastUpdate, license, locationDbId, locationName, observationLevels,
+				observationUnitsDescription, observationVariableDbIds, seasons, startDate, studyCode, studyDescription,
+				studyName, studyPUI, studyType, trialDbId, trialName);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class Study{\n");
+		sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
+		sb.append("    active: ").append(toIndentedString(active)).append("\n");
+		sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
+		sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
+		sb.append("    contacts: ").append(toIndentedString(contacts)).append("\n");
+		sb.append("    culturalPractices: ").append(toIndentedString(culturalPractices)).append("\n");
+		sb.append("    dataLinks: ").append(toIndentedString(dataLinks)).append("\n");
+		sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
+		sb.append("    endDate: ").append(toIndentedString(endDate)).append("\n");
+		sb.append("    environmentParameters: ").append(toIndentedString(environmentParameters)).append("\n");
+		sb.append("    experimentalDesign: ").append(toIndentedString(experimentalDesign)).append("\n");
+		sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
+		sb.append("    growthFacility: ").append(toIndentedString(growthFacility)).append("\n");
+		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
+		sb.append("    license: ").append(toIndentedString(license)).append("\n");
+		sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
+		sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
+		sb.append("    observationLevels: ").append(toIndentedString(observationLevels)).append("\n");
+		sb.append("    observationUnitsDescription: ").append(toIndentedString(observationUnitsDescription))
+				.append("\n");
+		sb.append("    ObservationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
+		sb.append("    seasons: ").append(toIndentedString(seasons)).append("\n");
+		sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
+		sb.append("    studyCode: ").append(toIndentedString(studyCode)).append("\n");
+		sb.append("    studyDescription: ").append(toIndentedString(studyDescription)).append("\n");
+		sb.append("    studyName: ").append(toIndentedString(studyName)).append("\n");
+		sb.append("    studyPUI: ").append(toIndentedString(studyPUI)).append("\n");
+		sb.append("    studyType: ").append(toIndentedString(studyType)).append("\n");
+		sb.append("    trialDbId: ").append(toIndentedString(trialDbId)).append("\n");
+		sb.append("    trialName: ").append(toIndentedString(trialName)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPIStudySearchRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPIStudySearchRequest.java
index 054721c5..b00076a7 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPIStudySearchRequest.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPIStudySearchRequest.java
@@ -7,8 +7,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-
 import org.brapi.v2.model.BrAPISearchRequestParametersPaging;
 import org.brapi.v2.model.BrAPISortBy;
 import org.brapi.v2.model.BrAPISortOrder;
@@ -17,742 +15,795 @@
  * StudySearchRequest
  */
 
+public class BrAPIStudySearchRequest extends BrAPISearchRequestParametersPaging {
+	@JsonProperty("commonCropNames")
+	private List<String> commonCropNames = null;
+
+	@JsonProperty("programDbIds")
+	private List<String> programDbIds = null;
+
+	@JsonProperty("programNames")
+	private List<String> programNames = null;
+
+	@JsonProperty("trialDbIds")
+	private List<String> trialDbIds = null;
+
+	@JsonProperty("trialNames")
+	private List<String> trialNames = null;
+
+	@JsonProperty("studyDbIds")
+	private List<String> studyDbIds = null;
+
+	@JsonProperty("studyNames")
+	private List<String> studyNames = null;
+
+	@JsonProperty("locationDbIds")
+	private List<String> locationDbIds = null;
+
+	@JsonProperty("locationNames")
+	private List<String> locationNames = null;
+
+	@JsonProperty("germplasmDbIds")
+	private List<String> germplasmDbIds = null;
+
+	@JsonProperty("germplasmNames")
+	private List<String> germplasmNames = null;
+
+	@JsonProperty("observationVariableDbIds")
+	private List<String> observationVariableDbIds = null;
+
+	@JsonProperty("observationVariableNames")
+	private List<String> observationVariableNames = null;
+
+	@JsonProperty("observationVariablePUIs")
+	private List<String> observationVariablePUIs = null;
+
+	@JsonProperty("externalReferenceIds")
+	private List<String> externalReferenceIds = null;
+
+	@Deprecated
+	@JsonProperty("externalReferenceIDs")
+	private List<String> externalReferenceIDs = null;
+
+	@JsonProperty("externalReferenceSources")
+	private List<String> externalReferenceSources = null;
+
+	@JsonProperty("active")
+	private Boolean active = null;
+
+	@JsonProperty("seasonDbIds")
+	private List<String> seasonDbIds = null;
+
+	@JsonProperty("sortBy")
+	private BrAPISortBy sortBy = null;
 
-public class BrAPIStudySearchRequest extends BrAPISearchRequestParametersPaging  {
-  @JsonProperty("commonCropNames")
-  @Valid
-  private List<String> commonCropNames = null;
+	@JsonProperty("sortOrder")
+	private BrAPISortOrder sortOrder = null;
 
-  @JsonProperty("programDbIds")
-  @Valid
-  private List<String> programDbIds = null;
+	@JsonProperty("studyCodes")
+	private List<String> studyCodes = null;
 
-  @JsonProperty("programNames")
-  @Valid
-  private List<String> programNames = null;
+	@JsonProperty("studyPUIs")
+	private List<String> studyPUIs = null;
+
+	@JsonProperty("studyTypes")
+	private List<String> studyTypes = null;
 
-  @JsonProperty("trialDbIds")
-  @Valid
-  private List<String> trialDbIds = null;
-
-  @JsonProperty("trialNames")
-  @Valid
-  private List<String> trialNames = null;
-
-  @JsonProperty("studyDbIds")
-  @Valid
-  private List<String> studyDbIds = null;
-
-  @JsonProperty("studyNames")
-  @Valid
-  private List<String> studyNames = null;
-
-  @JsonProperty("locationDbIds")
-  @Valid
-  private List<String> locationDbIds = null;
-
-  @JsonProperty("locationNames")
-  @Valid
-  private List<String> locationNames = null;
-
-  @JsonProperty("germplasmDbIds")
-  @Valid
-  private List<String> germplasmDbIds = null;
-
-  @JsonProperty("germplasmNames")
-  @Valid
-  private List<String> germplasmNames = null;
-
-  @JsonProperty("observationVariableDbIds")
-  @Valid
-  private List<String> observationVariableDbIds = null;
-
-  @JsonProperty("observationVariableNames")
-  @Valid
-  private List<String> observationVariableNames = null;
-
-  @JsonProperty("externalReferenceIDs")
-  @Valid
-  private List<String> externalReferenceIDs = null;
-
-  @JsonProperty("externalReferenceSources")
-  @Valid
-  private List<String> externalReferenceSources = null;
-
-  @JsonProperty("active")
-  private Boolean active = null;
-
-  @JsonProperty("seasonDbIds")
-  @Valid
-  private List<String> seasonDbIds = null;
-
-  @JsonProperty("sortBy")
-  private BrAPISortBy sortBy = null;
-
-  @JsonProperty("sortOrder")
-  private BrAPISortOrder sortOrder = null;
-
-  @JsonProperty("studyCodes")
-  @Valid
-  private List<String> studyCodes = null;
-
-  @JsonProperty("studyPUIs")
-  @Valid
-  private List<String> studyPUIs = null;
-
-  @JsonProperty("studyTypes")
-  @Valid
-  private List<String> studyTypes = null;
-
-  public BrAPIStudySearchRequest commonCropNames(List<String> commonCropNames) {
-    this.commonCropNames = commonCropNames;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-    if (this.commonCropNames == null) {
-      this.commonCropNames = new ArrayList<String>();
-    }
-    this.commonCropNames.add(commonCropNamesItem);
-    return this;
-  }
-
-  /**
-   * Common name for the crop which this program is for
-   * @return commonCropNames
-  **/
-  
-  
-    public List<String> getCommonCropNames() {
-    return commonCropNames;
-  }
-
-  public void setCommonCropNames(List<String> commonCropNames) {
-    this.commonCropNames = commonCropNames;
-  }
-
-  public BrAPIStudySearchRequest programDbIds(List<String> programDbIds) {
-    this.programDbIds = programDbIds;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-    if (this.programDbIds == null) {
-      this.programDbIds = new ArrayList<String>();
-    }
-    this.programDbIds.add(programDbIdsItem);
-    return this;
-  }
-
-  /**
-   * A program identifier to search for
-   * @return programDbIds
-  **/
-  
-  
-    public List<String> getProgramDbIds() {
-    return programDbIds;
-  }
-
-  public void setProgramDbIds(List<String> programDbIds) {
-    this.programDbIds = programDbIds;
-  }
-
-  public BrAPIStudySearchRequest programNames(List<String> programNames) {
-    this.programNames = programNames;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addProgramNamesItem(String programNamesItem) {
-    if (this.programNames == null) {
-      this.programNames = new ArrayList<String>();
-    }
-    this.programNames.add(programNamesItem);
-    return this;
-  }
-
-  /**
-   * A name of a program to search for
-   * @return programNames
-  **/
-  
-  
-    public List<String> getProgramNames() {
-    return programNames;
-  }
-
-  public void setProgramNames(List<String> programNames) {
-    this.programNames = programNames;
-  }
-
-  public BrAPIStudySearchRequest trialDbIds(List<String> trialDbIds) {
-    this.trialDbIds = trialDbIds;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-    if (this.trialDbIds == null) {
-      this.trialDbIds = new ArrayList<String>();
-    }
-    this.trialDbIds.add(trialDbIdsItem);
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies a trial to search for
-   * @return trialDbIds
-  **/
-  
-  
-    public List<String> getTrialDbIds() {
-    return trialDbIds;
-  }
-
-  public void setTrialDbIds(List<String> trialDbIds) {
-    this.trialDbIds = trialDbIds;
-  }
-
-  public BrAPIStudySearchRequest trialNames(List<String> trialNames) {
-    this.trialNames = trialNames;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addTrialNamesItem(String trialNamesItem) {
-    if (this.trialNames == null) {
-      this.trialNames = new ArrayList<String>();
-    }
-    this.trialNames.add(trialNamesItem);
-    return this;
-  }
-
-  /**
-   * The human readable name of a trial to search for
-   * @return trialNames
-  **/
-  
-  
-    public List<String> getTrialNames() {
-    return trialNames;
-  }
-
-  public void setTrialNames(List<String> trialNames) {
-    this.trialNames = trialNames;
-  }
-
-  public BrAPIStudySearchRequest studyDbIds(List<String> studyDbIds) {
-    this.studyDbIds = studyDbIds;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-    if (this.studyDbIds == null) {
-      this.studyDbIds = new ArrayList<String>();
-    }
-    this.studyDbIds.add(studyDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of study identifiers to search for
-   * @return studyDbIds
-  **/
-  
-  
-    public List<String> getStudyDbIds() {
-    return studyDbIds;
-  }
-
-  public void setStudyDbIds(List<String> studyDbIds) {
-    this.studyDbIds = studyDbIds;
-  }
-
-  public BrAPIStudySearchRequest studyNames(List<String> studyNames) {
-    this.studyNames = studyNames;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addStudyNamesItem(String studyNamesItem) {
-    if (this.studyNames == null) {
-      this.studyNames = new ArrayList<String>();
-    }
-    this.studyNames.add(studyNamesItem);
-    return this;
-  }
-
-  /**
-   * List of study names to filter search results
-   * @return studyNames
-  **/
-  
-  
-    public List<String> getStudyNames() {
-    return studyNames;
-  }
-
-  public void setStudyNames(List<String> studyNames) {
-    this.studyNames = studyNames;
-  }
-
-  public BrAPIStudySearchRequest locationDbIds(List<String> locationDbIds) {
-    this.locationDbIds = locationDbIds;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addLocationDbIdsItem(String locationDbIdsItem) {
-    if (this.locationDbIds == null) {
-      this.locationDbIds = new ArrayList<String>();
-    }
-    this.locationDbIds.add(locationDbIdsItem);
-    return this;
-  }
-
-  /**
-   * The location ids to search for
-   * @return locationDbIds
-  **/
-  
-  
-    public List<String> getLocationDbIds() {
-    return locationDbIds;
-  }
-
-  public void setLocationDbIds(List<String> locationDbIds) {
-    this.locationDbIds = locationDbIds;
-  }
-
-  public BrAPIStudySearchRequest locationNames(List<String> locationNames) {
-    this.locationNames = locationNames;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addLocationNamesItem(String locationNamesItem) {
-    if (this.locationNames == null) {
-      this.locationNames = new ArrayList<String>();
-    }
-    this.locationNames.add(locationNamesItem);
-    return this;
-  }
-
-  /**
-   * A human readable names to search for
-   * @return locationNames
-  **/
-  
-  
-    public List<String> getLocationNames() {
-    return locationNames;
-  }
-
-  public void setLocationNames(List<String> locationNames) {
-    this.locationNames = locationNames;
-  }
-
-  public BrAPIStudySearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-    this.germplasmDbIds = germplasmDbIds;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-    if (this.germplasmDbIds == null) {
-      this.germplasmDbIds = new ArrayList<String>();
-    }
-    this.germplasmDbIds.add(germplasmDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of IDs which uniquely identify germplasm to search for
-   * @return germplasmDbIds
-  **/
-  
-  
-    public List<String> getGermplasmDbIds() {
-    return germplasmDbIds;
-  }
-
-  public void setGermplasmDbIds(List<String> germplasmDbIds) {
-    this.germplasmDbIds = germplasmDbIds;
-  }
-
-  public BrAPIStudySearchRequest germplasmNames(List<String> germplasmNames) {
-    this.germplasmNames = germplasmNames;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-    if (this.germplasmNames == null) {
-      this.germplasmNames = new ArrayList<String>();
-    }
-    this.germplasmNames.add(germplasmNamesItem);
-    return this;
-  }
-
-  /**
-   * List of human readable names to identify germplasm to search for
-   * @return germplasmNames
-  **/
-  
-  
-    public List<String> getGermplasmNames() {
-    return germplasmNames;
-  }
-
-  public void setGermplasmNames(List<String> germplasmNames) {
-    this.germplasmNames = germplasmNames;
-  }
-
-  public BrAPIStudySearchRequest observationVariableDbIds(List<String> observationVariableDbIds) {
-    this.observationVariableDbIds = observationVariableDbIds;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-    if (this.observationVariableDbIds == null) {
-      this.observationVariableDbIds = new ArrayList<String>();
-    }
-    this.observationVariableDbIds.add(observationVariableDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of observation variable IDs to search for
-   * @return observationVariableDbIds
-  **/
-  
-  
-    public List<String> getObservationVariableDbIds() {
-    return observationVariableDbIds;
-  }
-
-  public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-    this.observationVariableDbIds = observationVariableDbIds;
-  }
-
-  public BrAPIStudySearchRequest observationVariableNames(List<String> observationVariableNames) {
-    this.observationVariableNames = observationVariableNames;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addObservationVariableNamesItem(String observationVariableNamesItem) {
-    if (this.observationVariableNames == null) {
-      this.observationVariableNames = new ArrayList<String>();
-    }
-    this.observationVariableNames.add(observationVariableNamesItem);
-    return this;
-  }
-
-  /**
-   * The names of Variables to search for
-   * @return observationVariableNames
-  **/
-  
-  
-    public List<String> getObservationVariableNames() {
-    return observationVariableNames;
-  }
-
-  public void setObservationVariableNames(List<String> observationVariableNames) {
-    this.observationVariableNames = observationVariableNames;
-  }
-
-  public BrAPIStudySearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-    if (this.externalReferenceIDs == null) {
-      this.externalReferenceIDs = new ArrayList<String>();
-    }
-    this.externalReferenceIDs.add(externalReferenceIDsItem);
-    return this;
-  }
-
-  /**
-   * List of external references for the trait to search for
-   * @return externalReferenceIDs
-  **/
-  
-  
-    public List<String> getExternalReferenceIDs() {
-    return externalReferenceIDs;
-  }
-
-  public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-  }
-
-  public BrAPIStudySearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-    if (this.externalReferenceSources == null) {
-      this.externalReferenceSources = new ArrayList<String>();
-    }
-    this.externalReferenceSources.add(externalReferenceSourcesItem);
-    return this;
-  }
-
-  /**
-   * List of external references sources for the trait to search for
-   * @return externalReferenceSources
-  **/
-  
-  
-    public List<String> getExternalReferenceSources() {
-    return externalReferenceSources;
-  }
-
-  public void setExternalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-  }
-
-  public BrAPIStudySearchRequest active(Boolean active) {
-    this.active = active;
-    return this;
-  }
-
-  /**
-   * Is this study currently active
-   * @return active
-  **/
-  
-  
-    public Boolean isActive() {
-    return active;
-  }
-
-  public void setActive(Boolean active) {
-    this.active = active;
-  }
-
-  public BrAPIStudySearchRequest seasonDbIds(List<String> seasonDbIds) {
-    this.seasonDbIds = seasonDbIds;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addSeasonDbIdsItem(String seasonDbIdsItem) {
-    if (this.seasonDbIds == null) {
-      this.seasonDbIds = new ArrayList<String>();
-    }
-    this.seasonDbIds.add(seasonDbIdsItem);
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies a season
-   * @return seasonDbIds
-  **/
-  
-  
-    public List<String> getSeasonDbIds() {
-    return seasonDbIds;
-  }
-
-  public void setSeasonDbIds(List<String> seasonDbIds) {
-    this.seasonDbIds = seasonDbIds;
-  }
-
-  public BrAPIStudySearchRequest sortBy(BrAPISortBy sortBy) {
-    this.sortBy = sortBy;
-    return this;
-  }
-
-  /**
-   * Name of one of the fields within the study object on which results can be sorted
-   * @return sortBy
-  **/
-  
-  
-    public BrAPISortBy getSortBy() {
-    return sortBy;
-  }
-
-  public void setSortBy(BrAPISortBy sortBy) {
-    this.sortBy = sortBy;
-  }
-
-  public BrAPIStudySearchRequest sortOrder(BrAPISortOrder sortOrder) {
-    this.sortOrder = sortOrder;
-    return this;
-  }
-
-  /**
-   * Order results should be sorted. ex. \"ASC\" or \"DESC\"
-   * @return sortOrder
-  **/
-  
-  
-    public BrAPISortOrder getSortOrder() {
-    return sortOrder;
-  }
-
-  public void setSortOrder(BrAPISortOrder sortOrder) {
-    this.sortOrder = sortOrder;
-  }
-
-  public BrAPIStudySearchRequest studyCodes(List<String> studyCodes) {
-    this.studyCodes = studyCodes;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addStudyCodesItem(String studyCodesItem) {
-    if (this.studyCodes == null) {
-      this.studyCodes = new ArrayList<String>();
-    }
-    this.studyCodes.add(studyCodesItem);
-    return this;
-  }
-
-  /**
-   * A short human readable code for a study
-   * @return studyCodes
-  **/
-  
-  
-    public List<String> getStudyCodes() {
-    return studyCodes;
-  }
-
-  public void setStudyCodes(List<String> studyCodes) {
-    this.studyCodes = studyCodes;
-  }
-
-  public BrAPIStudySearchRequest studyPUIs(List<String> studyPUIs) {
-    this.studyPUIs = studyPUIs;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addStudyPUIsItem(String studyPUIsItem) {
-    if (this.studyPUIs == null) {
-      this.studyPUIs = new ArrayList<String>();
-    }
-    this.studyPUIs.add(studyPUIsItem);
-    return this;
-  }
-
-  /**
-   * Permanent unique identifier associated with study data. For example, a URI or DOI
-   * @return studyPUIs
-  **/
-  
-  
-    public List<String> getStudyPUIs() {
-    return studyPUIs;
-  }
-
-  public void setStudyPUIs(List<String> studyPUIs) {
-    this.studyPUIs = studyPUIs;
-  }
-
-  public BrAPIStudySearchRequest studyTypes(List<String> studyTypes) {
-    this.studyTypes = studyTypes;
-    return this;
-  }
-
-  public BrAPIStudySearchRequest addStudyTypesItem(String studyTypesItem) {
-    if (this.studyTypes == null) {
-      this.studyTypes = new ArrayList<String>();
-    }
-    this.studyTypes.add(studyTypesItem);
-    return this;
-  }
-
-  /**
-   * The type of study being performed. ex. \"Yield Trial\", etc
-   * @return studyTypes
-  **/
-  
-  
-    public List<String> getStudyTypes() {
-    return studyTypes;
-  }
-
-  public void setStudyTypes(List<String> studyTypes) {
-    this.studyTypes = studyTypes;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIStudySearchRequest studySearchRequest = (BrAPIStudySearchRequest) o;
-    return Objects.equals(this.commonCropNames, studySearchRequest.commonCropNames) &&
-        Objects.equals(this.programDbIds, studySearchRequest.programDbIds) &&
-        Objects.equals(this.programNames, studySearchRequest.programNames) &&
-        Objects.equals(this.trialDbIds, studySearchRequest.trialDbIds) &&
-        Objects.equals(this.trialNames, studySearchRequest.trialNames) &&
-        Objects.equals(this.studyDbIds, studySearchRequest.studyDbIds) &&
-        Objects.equals(this.studyNames, studySearchRequest.studyNames) &&
-        Objects.equals(this.locationDbIds, studySearchRequest.locationDbIds) &&
-        Objects.equals(this.locationNames, studySearchRequest.locationNames) &&
-        Objects.equals(this.germplasmDbIds, studySearchRequest.germplasmDbIds) &&
-        Objects.equals(this.germplasmNames, studySearchRequest.germplasmNames) &&
-        Objects.equals(this.observationVariableDbIds, studySearchRequest.observationVariableDbIds) &&
-        Objects.equals(this.observationVariableNames, studySearchRequest.observationVariableNames) &&
-        Objects.equals(this.externalReferenceIDs, studySearchRequest.externalReferenceIDs) &&
-        Objects.equals(this.externalReferenceSources, studySearchRequest.externalReferenceSources) &&
-        Objects.equals(this.active, studySearchRequest.active) &&
-        Objects.equals(this.seasonDbIds, studySearchRequest.seasonDbIds) &&
-        Objects.equals(this.sortBy, studySearchRequest.sortBy) &&
-        Objects.equals(this.sortOrder, studySearchRequest.sortOrder) &&
-        Objects.equals(this.studyCodes, studySearchRequest.studyCodes) &&
-        Objects.equals(this.studyPUIs, studySearchRequest.studyPUIs) &&
-        Objects.equals(this.studyTypes, studySearchRequest.studyTypes) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(commonCropNames, programDbIds, programNames, trialDbIds, trialNames, studyDbIds, studyNames, locationDbIds, locationNames, germplasmDbIds, germplasmNames, observationVariableDbIds, observationVariableNames, externalReferenceIDs, externalReferenceSources, active, seasonDbIds, sortBy, sortOrder, studyCodes, studyPUIs, studyTypes, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class StudySearchRequest {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-    sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-    sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-    sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-    sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-    sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-    sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-    sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-    sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-    sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-    sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-    sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-    sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
-    sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-    sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-    sb.append("    active: ").append(toIndentedString(active)).append("\n");
-    sb.append("    seasonDbIds: ").append(toIndentedString(seasonDbIds)).append("\n");
-    sb.append("    sortBy: ").append(toIndentedString(sortBy)).append("\n");
-    sb.append("    sortOrder: ").append(toIndentedString(sortOrder)).append("\n");
-    sb.append("    studyCodes: ").append(toIndentedString(studyCodes)).append("\n");
-    sb.append("    studyPUIs: ").append(toIndentedString(studyPUIs)).append("\n");
-    sb.append("    studyTypes: ").append(toIndentedString(studyTypes)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+	public BrAPIStudySearchRequest commonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
+		if (this.commonCropNames == null) {
+			this.commonCropNames = new ArrayList<String>();
+		}
+		this.commonCropNames.add(commonCropNamesItem);
+		return this;
+	}
+
+	/**
+	 * Common name for the crop which this program is for
+	 * 
+	 * @return commonCropNames
+	 **/
+
+	public List<String> getCommonCropNames() {
+		return commonCropNames;
+	}
+
+	public void setCommonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+	}
+
+	public BrAPIStudySearchRequest programDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addProgramDbIdsItem(String programDbIdsItem) {
+		if (this.programDbIds == null) {
+			this.programDbIds = new ArrayList<String>();
+		}
+		this.programDbIds.add(programDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * A program identifier to search for
+	 * 
+	 * @return programDbIds
+	 **/
+
+	public List<String> getProgramDbIds() {
+		return programDbIds;
+	}
+
+	public void setProgramDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+	}
+
+	public BrAPIStudySearchRequest programNames(List<String> programNames) {
+		this.programNames = programNames;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addProgramNamesItem(String programNamesItem) {
+		if (this.programNames == null) {
+			this.programNames = new ArrayList<String>();
+		}
+		this.programNames.add(programNamesItem);
+		return this;
+	}
+
+	/**
+	 * A name of a program to search for
+	 * 
+	 * @return programNames
+	 **/
+
+	public List<String> getProgramNames() {
+		return programNames;
+	}
+
+	public void setProgramNames(List<String> programNames) {
+		this.programNames = programNames;
+	}
+
+	public BrAPIStudySearchRequest trialDbIds(List<String> trialDbIds) {
+		this.trialDbIds = trialDbIds;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
+		if (this.trialDbIds == null) {
+			this.trialDbIds = new ArrayList<String>();
+		}
+		this.trialDbIds.add(trialDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a trial to search for
+	 * 
+	 * @return trialDbIds
+	 **/
+
+	public List<String> getTrialDbIds() {
+		return trialDbIds;
+	}
+
+	public void setTrialDbIds(List<String> trialDbIds) {
+		this.trialDbIds = trialDbIds;
+	}
+
+	public BrAPIStudySearchRequest trialNames(List<String> trialNames) {
+		this.trialNames = trialNames;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addTrialNamesItem(String trialNamesItem) {
+		if (this.trialNames == null) {
+			this.trialNames = new ArrayList<String>();
+		}
+		this.trialNames.add(trialNamesItem);
+		return this;
+	}
+
+	/**
+	 * The human readable name of a trial to search for
+	 * 
+	 * @return trialNames
+	 **/
+
+	public List<String> getTrialNames() {
+		return trialNames;
+	}
+
+	public void setTrialNames(List<String> trialNames) {
+		this.trialNames = trialNames;
+	}
+
+	public BrAPIStudySearchRequest studyDbIds(List<String> studyDbIds) {
+		this.studyDbIds = studyDbIds;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
+		if (this.studyDbIds == null) {
+			this.studyDbIds = new ArrayList<String>();
+		}
+		this.studyDbIds.add(studyDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of study identifiers to search for
+	 * 
+	 * @return studyDbIds
+	 **/
+
+	public List<String> getStudyDbIds() {
+		return studyDbIds;
+	}
+
+	public void setStudyDbIds(List<String> studyDbIds) {
+		this.studyDbIds = studyDbIds;
+	}
+
+	public BrAPIStudySearchRequest studyNames(List<String> studyNames) {
+		this.studyNames = studyNames;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addStudyNamesItem(String studyNamesItem) {
+		if (this.studyNames == null) {
+			this.studyNames = new ArrayList<String>();
+		}
+		this.studyNames.add(studyNamesItem);
+		return this;
+	}
+
+	/**
+	 * List of study names to filter search results
+	 * 
+	 * @return studyNames
+	 **/
+
+	public List<String> getStudyNames() {
+		return studyNames;
+	}
+
+	public void setStudyNames(List<String> studyNames) {
+		this.studyNames = studyNames;
+	}
+
+	public BrAPIStudySearchRequest locationDbIds(List<String> locationDbIds) {
+		this.locationDbIds = locationDbIds;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addLocationDbIdsItem(String locationDbIdsItem) {
+		if (this.locationDbIds == null) {
+			this.locationDbIds = new ArrayList<String>();
+		}
+		this.locationDbIds.add(locationDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The location ids to search for
+	 * 
+	 * @return locationDbIds
+	 **/
+
+	public List<String> getLocationDbIds() {
+		return locationDbIds;
+	}
+
+	public void setLocationDbIds(List<String> locationDbIds) {
+		this.locationDbIds = locationDbIds;
+	}
+
+	public BrAPIStudySearchRequest locationNames(List<String> locationNames) {
+		this.locationNames = locationNames;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addLocationNamesItem(String locationNamesItem) {
+		if (this.locationNames == null) {
+			this.locationNames = new ArrayList<String>();
+		}
+		this.locationNames.add(locationNamesItem);
+		return this;
+	}
+
+	/**
+	 * A human readable names to search for
+	 * 
+	 * @return locationNames
+	 **/
+
+	public List<String> getLocationNames() {
+		return locationNames;
+	}
+
+	public void setLocationNames(List<String> locationNames) {
+		this.locationNames = locationNames;
+	}
+
+	public BrAPIStudySearchRequest germplasmDbIds(List<String> germplasmDbIds) {
+		this.germplasmDbIds = germplasmDbIds;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
+		if (this.germplasmDbIds == null) {
+			this.germplasmDbIds = new ArrayList<String>();
+		}
+		this.germplasmDbIds.add(germplasmDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of IDs which uniquely identify germplasm to search for
+	 * 
+	 * @return germplasmDbIds
+	 **/
+
+	public List<String> getGermplasmDbIds() {
+		return germplasmDbIds;
+	}
+
+	public void setGermplasmDbIds(List<String> germplasmDbIds) {
+		this.germplasmDbIds = germplasmDbIds;
+	}
+
+	public BrAPIStudySearchRequest germplasmNames(List<String> germplasmNames) {
+		this.germplasmNames = germplasmNames;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
+		if (this.germplasmNames == null) {
+			this.germplasmNames = new ArrayList<String>();
+		}
+		this.germplasmNames.add(germplasmNamesItem);
+		return this;
+	}
+
+	/**
+	 * List of human readable names to identify germplasm to search for
+	 * 
+	 * @return germplasmNames
+	 **/
+
+	public List<String> getGermplasmNames() {
+		return germplasmNames;
+	}
+
+	public void setGermplasmNames(List<String> germplasmNames) {
+		this.germplasmNames = germplasmNames;
+	}
+
+	public BrAPIStudySearchRequest observationVariableDbIds(List<String> observationVariableDbIds) {
+		this.observationVariableDbIds = observationVariableDbIds;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
+		if (this.observationVariableDbIds == null) {
+			this.observationVariableDbIds = new ArrayList<String>();
+		}
+		this.observationVariableDbIds.add(observationVariableDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of observation variable IDs to search for
+	 * 
+	 * @return observationVariableDbIds
+	 **/
+
+	public List<String> getObservationVariableDbIds() {
+		return observationVariableDbIds;
+	}
+
+	public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
+		this.observationVariableDbIds = observationVariableDbIds;
+	}
+
+	public BrAPIStudySearchRequest observationVariablePUIs(List<String> observationVariablePUIs) {
+		this.observationVariablePUIs = observationVariablePUIs;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addObservationVariablePUIsItem(String observationVariablePUIsItem) {
+		if (this.observationVariablePUIs == null) {
+			this.observationVariablePUIs = new ArrayList<String>();
+		}
+		this.observationVariablePUIs.add(observationVariablePUIsItem);
+		return this;
+	}
+
+	/**
+	 * The names of Variables to search for
+	 * 
+	 * @return observationVariablePUIs
+	 **/
+
+	public List<String> getObservationVariablePUIs() {
+		return observationVariablePUIs;
+	}
+
+	public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
+		this.observationVariablePUIs = observationVariablePUIs;
+	}
+
+	public BrAPIStudySearchRequest observationVariableNames(List<String> observationVariableNames) {
+		this.observationVariableNames = observationVariableNames;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addObservationVariableNamesItem(String observationVariableNamesItem) {
+		if (this.observationVariableNames == null) {
+			this.observationVariableNames = new ArrayList<String>();
+		}
+		this.observationVariableNames.add(observationVariableNamesItem);
+		return this;
+	}
+
+	/**
+	 * The names of Variables to search for
+	 * 
+	 * @return observationVariableNames
+	 **/
+
+	public List<String> getObservationVariableNames() {
+		return observationVariableNames;
+	}
+
+	public void setObservationVariableNames(List<String> observationVariableNames) {
+		this.observationVariableNames = observationVariableNames;
+	}
+
+	public BrAPIStudySearchRequest externalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
+		if (this.externalReferenceIds == null) {
+			this.externalReferenceIds = new ArrayList<String>();
+		}
+		this.externalReferenceIds.add(externalReferenceIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of external references for the trait to search for
+	 * 
+	 * @return externalReferenceIds
+	 **/
+
+	public List<String> getExternalReferenceIds() {
+		return externalReferenceIds;
+	}
+
+	public void setExternalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+	}
+
+	@Deprecated
+	public BrAPIStudySearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+		return this;
+	}
+
+	@Deprecated
+	public BrAPIStudySearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
+		if (this.externalReferenceIDs == null) {
+			this.externalReferenceIDs = new ArrayList<String>();
+		}
+		this.externalReferenceIDs.add(externalReferenceIDsItem);
+		return this;
+	}
+
+	/**
+	 * List of external references for the trait to search for
+	 * 
+	 * @return externalReferenceIDs
+	 **/
+
+	@Deprecated
+	public List<String> getExternalReferenceIDs() {
+		return externalReferenceIDs;
+	}
+
+	@Deprecated
+	public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+	}
+
+	public BrAPIStudySearchRequest externalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
+		if (this.externalReferenceSources == null) {
+			this.externalReferenceSources = new ArrayList<String>();
+		}
+		this.externalReferenceSources.add(externalReferenceSourcesItem);
+		return this;
+	}
+
+	/**
+	 * List of external references sources for the trait to search for
+	 * 
+	 * @return externalReferenceSources
+	 **/
+
+	public List<String> getExternalReferenceSources() {
+		return externalReferenceSources;
+	}
+
+	public void setExternalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+	}
+
+	public BrAPIStudySearchRequest active(Boolean active) {
+		this.active = active;
+		return this;
+	}
+
+	/**
+	 * Is this study currently active
+	 * 
+	 * @return active
+	 **/
+
+	public Boolean isActive() {
+		return active;
+	}
+
+	public void setActive(Boolean active) {
+		this.active = active;
+	}
+
+	public BrAPIStudySearchRequest seasonDbIds(List<String> seasonDbIds) {
+		this.seasonDbIds = seasonDbIds;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addSeasonDbIdsItem(String seasonDbIdsItem) {
+		if (this.seasonDbIds == null) {
+			this.seasonDbIds = new ArrayList<String>();
+		}
+		this.seasonDbIds.add(seasonDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a season
+	 * 
+	 * @return seasonDbIds
+	 **/
+
+	public List<String> getSeasonDbIds() {
+		return seasonDbIds;
+	}
+
+	public void setSeasonDbIds(List<String> seasonDbIds) {
+		this.seasonDbIds = seasonDbIds;
+	}
+
+	public BrAPIStudySearchRequest sortBy(BrAPISortBy sortBy) {
+		this.sortBy = sortBy;
+		return this;
+	}
+
+	/**
+	 * Name of one of the fields within the study object on which results can be
+	 * sorted
+	 * 
+	 * @return sortBy
+	 **/
+
+	public BrAPISortBy getSortBy() {
+		return sortBy;
+	}
+
+	public void setSortBy(BrAPISortBy sortBy) {
+		this.sortBy = sortBy;
+	}
+
+	public BrAPIStudySearchRequest sortOrder(BrAPISortOrder sortOrder) {
+		this.sortOrder = sortOrder;
+		return this;
+	}
+
+	/**
+	 * Order results should be sorted. ex. \"ASC\" or \"DESC\"
+	 * 
+	 * @return sortOrder
+	 **/
+
+	public BrAPISortOrder getSortOrder() {
+		return sortOrder;
+	}
+
+	public void setSortOrder(BrAPISortOrder sortOrder) {
+		this.sortOrder = sortOrder;
+	}
+
+	public BrAPIStudySearchRequest studyCodes(List<String> studyCodes) {
+		this.studyCodes = studyCodes;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addStudyCodesItem(String studyCodesItem) {
+		if (this.studyCodes == null) {
+			this.studyCodes = new ArrayList<String>();
+		}
+		this.studyCodes.add(studyCodesItem);
+		return this;
+	}
+
+	/**
+	 * A short human readable code for a study
+	 * 
+	 * @return studyCodes
+	 **/
+
+	public List<String> getStudyCodes() {
+		return studyCodes;
+	}
+
+	public void setStudyCodes(List<String> studyCodes) {
+		this.studyCodes = studyCodes;
+	}
+
+	public BrAPIStudySearchRequest studyPUIs(List<String> studyPUIs) {
+		this.studyPUIs = studyPUIs;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addStudyPUIsItem(String studyPUIsItem) {
+		if (this.studyPUIs == null) {
+			this.studyPUIs = new ArrayList<String>();
+		}
+		this.studyPUIs.add(studyPUIsItem);
+		return this;
+	}
+
+	/**
+	 * Permanent unique identifier associated with study data. For example, a URI or
+	 * DOI
+	 * 
+	 * @return studyPUIs
+	 **/
+
+	public List<String> getStudyPUIs() {
+		return studyPUIs;
+	}
+
+	public void setStudyPUIs(List<String> studyPUIs) {
+		this.studyPUIs = studyPUIs;
+	}
+
+	public BrAPIStudySearchRequest studyTypes(List<String> studyTypes) {
+		this.studyTypes = studyTypes;
+		return this;
+	}
+
+	public BrAPIStudySearchRequest addStudyTypesItem(String studyTypesItem) {
+		if (this.studyTypes == null) {
+			this.studyTypes = new ArrayList<String>();
+		}
+		this.studyTypes.add(studyTypesItem);
+		return this;
+	}
+
+	/**
+	 * The type of study being performed. ex. \"Yield Trial\", etc
+	 * 
+	 * @return studyTypes
+	 **/
+
+	public List<String> getStudyTypes() {
+		return studyTypes;
+	}
+
+	public void setStudyTypes(List<String> studyTypes) {
+		this.studyTypes = studyTypes;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIStudySearchRequest studySearchRequest = (BrAPIStudySearchRequest) o;
+		return Objects.equals(this.commonCropNames, studySearchRequest.commonCropNames)
+				&& Objects.equals(this.programDbIds, studySearchRequest.programDbIds)
+				&& Objects.equals(this.programNames, studySearchRequest.programNames)
+				&& Objects.equals(this.trialDbIds, studySearchRequest.trialDbIds)
+				&& Objects.equals(this.trialNames, studySearchRequest.trialNames)
+				&& Objects.equals(this.studyDbIds, studySearchRequest.studyDbIds)
+				&& Objects.equals(this.studyNames, studySearchRequest.studyNames)
+				&& Objects.equals(this.locationDbIds, studySearchRequest.locationDbIds)
+				&& Objects.equals(this.locationNames, studySearchRequest.locationNames)
+				&& Objects.equals(this.germplasmDbIds, studySearchRequest.germplasmDbIds)
+				&& Objects.equals(this.germplasmNames, studySearchRequest.germplasmNames)
+				&& Objects.equals(this.observationVariableDbIds, studySearchRequest.observationVariableDbIds)
+				&& Objects.equals(this.observationVariableNames, studySearchRequest.observationVariableNames)
+				&& Objects.equals(this.observationVariablePUIs, studySearchRequest.observationVariablePUIs)
+				&& Objects.equals(this.externalReferenceIds, studySearchRequest.externalReferenceIds)
+				&& Objects.equals(this.externalReferenceIDs, studySearchRequest.externalReferenceIDs)
+				&& Objects.equals(this.externalReferenceSources, studySearchRequest.externalReferenceSources)
+				&& Objects.equals(this.active, studySearchRequest.active)
+				&& Objects.equals(this.seasonDbIds, studySearchRequest.seasonDbIds)
+				&& Objects.equals(this.sortBy, studySearchRequest.sortBy)
+				&& Objects.equals(this.sortOrder, studySearchRequest.sortOrder)
+				&& Objects.equals(this.studyCodes, studySearchRequest.studyCodes)
+				&& Objects.equals(this.studyPUIs, studySearchRequest.studyPUIs)
+				&& Objects.equals(this.studyTypes, studySearchRequest.studyTypes) && super.equals(o);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(commonCropNames, programDbIds, programNames, trialDbIds, trialNames, studyDbIds, studyNames,
+				locationDbIds, locationNames, germplasmDbIds, germplasmNames, observationVariableDbIds,
+				observationVariableNames, observationVariablePUIs, externalReferenceIds, externalReferenceIDs,
+				externalReferenceSources, active, seasonDbIds, sortBy, sortOrder, studyCodes, studyPUIs, studyTypes,
+				super.hashCode());
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class StudySearchRequest {\n");
+		sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+		sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
+		sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
+		sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
+		sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
+		sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
+		sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
+		sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
+		sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
+		sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
+		sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
+		sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
+		sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
+		sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
+		sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
+		sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
+		sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
+		sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
+		sb.append("    active: ").append(toIndentedString(active)).append("\n");
+		sb.append("    seasonDbIds: ").append(toIndentedString(seasonDbIds)).append("\n");
+		sb.append("    sortBy: ").append(toIndentedString(sortBy)).append("\n");
+		sb.append("    sortOrder: ").append(toIndentedString(sortOrder)).append("\n");
+		sb.append("    studyCodes: ").append(toIndentedString(studyCodes)).append("\n");
+		sb.append("    studyPUIs: ").append(toIndentedString(studyPUIs)).append("\n");
+		sb.append("    studyTypes: ").append(toIndentedString(studyTypes)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 }

From e89e9631ff3cb5339675c64a41b4c5702a0b0afc Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Fri, 18 Aug 2023 15:55:54 -0400
Subject: [PATCH 15/28] fixes #184, #185, #186, #187, #155, #156, #159, #160,
 #129, #130, #131, #132. Dependent on #199

---
 .../client/v2/modules/core/TrialsApiTest.java |  272 ++--
 .../org/brapi/v2/model/core/BrAPIProgram.java |  626 ++++-----
 .../request/BrAPIProgramSearchRequest.java    |  733 ++++++-----
 .../core/request/BrAPITrialSearchRequest.java | 1132 +++++++++--------
 4 files changed, 1456 insertions(+), 1307 deletions(-)

diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/TrialsApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/TrialsApiTest.java
index a41497fe..cf8bdb40 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/TrialsApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/TrialsApiTest.java
@@ -25,12 +25,14 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
-import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * API tests for TrialsApi
@@ -38,129 +40,145 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TrialsApiTest extends BrAPIClientTest {
 
-    private final TrialsApi api = new TrialsApi(this.apiClient);
-
-    /**
-     * Submit a search request for Trials
-     *
-     * Advanced searching for the programs resource. See Search Services for additional implementation details.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void searchTrialsPostTest() throws ApiException {
-        BrAPITrialSearchRequest body = new BrAPITrialSearchRequest();
-
-        ApiResponse<Pair<Optional<BrAPITrialListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api.searchTrialsPost(body);
-
-        // TODO: test validations
-    }
-    /**
-     * Get the results of a Trials search request
-     *
-     * Advanced searching for the trials resource. See Search Services for additional implementation details.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void searchTrialsSearchResultsDbIdGetTest() throws ApiException {
-        String searchResultsDbId = null;
-        Integer page = null;
-        Integer pageSize = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-            ApiResponse<Pair<Optional<BrAPITrialListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response =
-                    api.searchTrialsSearchResultsDbIdGet(searchResultsDbId, page, pageSize);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Get a filtered list of Trials
-     *
-     * Retrieve a filtered list of breeding Trials. A Trial is a collection of Studies
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void trialsGetTest() throws ApiException {
-        Boolean active = null;
-        String commonCropName = null;
-        String contactDbId = null;
-        String programDbId = null;
-        String locationDbId = null;
-        LocalDate searchDateRangeStart = null;
-        LocalDate searchDateRangeEnd = null;
-        String studyDbId = null;
-        String trialDbId = null;
-        String trialName = null;
-        String trialPUI = null;
-        String sortBy = null;
-        String sortOrder = null;
-        String externalReferenceID = null;
-        String externalReferenceSource = null;
-        Integer page = null;
-        Integer pageSize = null;
-        
-        TrialQueryParams queryParams = new TrialQueryParams();
-        ApiResponse<BrAPITrialListResponse> response = api.trialsGet(queryParams);
-
-        // TODO: test validations
-    }
-    /**
-     * Create new trials
-     *
-     * Create new breeding Trials. A Trial represents a collection of related Studies. &#x60;trialDbId&#x60; is generated by the server.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void trialsPostTest() throws ApiException {
-        List<BrAPITrial> body = Arrays.asList(new BrAPITrial());
-        
-        ApiResponse<BrAPITrialListResponse> response = api.trialsPost(body);
-
-        // TODO: test validations
-    }
-    /**
-     * Get the details of a specific Trial
-     *
-     * Get the details of a specific Trial
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void trialsTrialDbIdGetTest() throws ApiException {
-        String trialDbId = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPITrialSingleResponse> response = api.trialsTrialDbIdGet(trialDbId);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Update the details of an existing Trial
-     *
-     * Update the details of an existing Trial
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void trialsTrialDbIdPutTest() throws ApiException {
-        String trialDbId = null;
-        BrAPITrial body = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPITrialSingleResponse> response = api.trialsTrialDbIdPut(trialDbId, body);
-		});
-
-        // TODO: test validations
-    }
+	private final TrialsApi api = new TrialsApi(this.apiClient);
+
+	/**
+	 * Submit a search request for Trials
+	 *
+	 * Advanced searching for the programs resource. See Search Services for
+	 * additional implementation details.
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void searchTrialsPostTest() throws ApiException {
+		BrAPITrialSearchRequest body = new BrAPITrialSearchRequest()
+				.addTrialDbIdsItem("trial1")
+				.addTrialDbIdsItem("trial2");
+
+		ApiResponse<Pair<Optional<BrAPITrialListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api
+				.searchTrialsPost(body);
+
+		Optional<BrAPITrialListResponse> listResponse = response.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+		// only results are returned
+		assertTrue(listResponse.isPresent());
+		assertFalse(searchIdResponse.isPresent());
+
+		assertEquals(2, listResponse.get().getResult().getData().size(),
+				"unexpected number of pedigree nodes returned");
+	}
+
+	/**
+	 * Get the results of a Trials search request
+	 *
+	 * Advanced searching for the trials resource. See Search Services for
+	 * additional implementation details.
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void searchTrialsSearchResultsDbIdGetTest() throws ApiException {
+		BrAPITrialSearchRequest body = new BrAPITrialSearchRequest()
+				.addTrialDbIdsItem("trial1")
+				.addTrialDbIdsItem("trial2")
+				.addTrialDbIdsItem("trial3")
+				.addTrialDbIdsItem("trial2")
+				.addTrialDbIdsItem("trial1");
+
+		ApiResponse<Pair<Optional<BrAPITrialListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api
+				.searchTrialsPost(body);
+
+		Optional<BrAPITrialListResponse> listResponse = response.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+		// only search ID is returned
+		assertFalse(listResponse.isPresent());
+		assertTrue(searchIdResponse.isPresent());
+
+		// Get results from search ID
+		ApiResponse<Pair<Optional<BrAPITrialListResponse>, Optional<BrAPIAcceptedSearchResponse>>> searchResponse = this.api
+				.searchTrialsSearchResultsDbIdGet(searchIdResponse.get().getResult().getSearchResultsDbId(), 0, 10);
+		Optional<BrAPITrialListResponse> listResponse2 = searchResponse.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse2 = searchResponse.getBody().getRight();
+		// only results are returned
+		assertTrue(listResponse2.isPresent());
+		assertFalse(searchIdResponse2.isPresent());
+
+		assertEquals(3, listResponse2.get().getResult().getData().size(),
+				"unexpected number of pedigree nodes returned");
+	}
+
+	/**
+	 * Get a filtered list of Trials
+	 *
+	 * Retrieve a filtered list of breeding Trials. A Trial is a collection of
+	 * Studies
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void trialsGetTest() throws ApiException {
+		String trialDbId = "trial1";
+
+		TrialQueryParams queryParams = new TrialQueryParams().trialDbId(trialDbId);
+		ApiResponse<BrAPITrialListResponse> response = api.trialsGet(queryParams);
+
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(trialDbId, response.getBody().getResult().getData().get(0).getTrialDbId());
+	}
+
+	/**
+	 * Create new trials
+	 *
+	 * Create new breeding Trials. A Trial represents a collection of related
+	 * Studies. &#x60;trialDbId&#x60; is generated by the server.
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void trialsPostTest() throws ApiException {
+		BrAPITrial trial = new BrAPITrial()
+				.trialName("New Trial Name");
+		List<BrAPITrial> body = Arrays.asList(trial);
+
+		ApiResponse<BrAPITrialListResponse> response = api.trialsPost(body);
+		
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(trial.getTrialName(), response.getBody().getResult().getData().get(0).getTrialName());
+		assertNotNull(response.getBody().getResult().getData().get(0).getTrialDbId());
+	}
+
+	/**
+	 * Get the details of a specific Trial
+	 *
+	 * Get the details of a specific Trial
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void trialsTrialDbIdGetTest() throws ApiException {
+		String trialDbId = "trial1";
+
+		ApiResponse<BrAPITrialSingleResponse> response = api.trialsTrialDbIdGet(trialDbId);
+
+		assertEquals(trialDbId, response.getBody().getResult().getTrialDbId());
+	}
+
+	/**
+	 * Update the details of an existing Trial
+	 *
+	 * Update the details of an existing Trial
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void trialsTrialDbIdPutTest() throws ApiException {
+		String trialDbId = "trial1";
+		BrAPITrial body = new BrAPITrial().trialName("New Trial Name");
+
+		ApiResponse<BrAPITrialSingleResponse> response = api.trialsTrialDbIdPut(trialDbId, body);
+
+		assertEquals(trialDbId, response.getBody().getResult().getTrialDbId());
+		assertEquals(body.getTrialName(), response.getBody().getResult().getTrialName());
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPIProgram.java b/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPIProgram.java
index 82d58012..6eafe27f 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPIProgram.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPIProgram.java
@@ -1,8 +1,6 @@
 package org.brapi.v2.model.core;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.Gson;
@@ -12,304 +10,346 @@
 import org.brapi.v2.model.BrAPIExternalReference;
 import org.brapi.v2.model.NullableJsonElementTypeAdapterFactory;
 
-import javax.validation.Valid;
-
-
 /**
  * Program
  */
 
-
 public class BrAPIProgram {
-  @JsonProperty("programDbId")
-  private String programDbId = null;
-
-  @JsonProperty("abbreviation")
-  private String abbreviation = null;
-
-  @JsonProperty("additionalInfo")
-  @Valid
-  @JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
-  private JsonObject additionalInfo = null;
-
-  @JsonProperty("commonCropName")
-  private String commonCropName = null;
-
-  @JsonProperty("documentationURL")
-  private String documentationURL = null;
-
-  @JsonProperty("externalReferences")
-  private List<BrAPIExternalReference> externalReferences = null;
-
-  @JsonProperty("leadPersonDbId")
-  private String leadPersonDbId = null;
-
-  @JsonProperty("leadPersonName")
-  private String leadPersonName = null;
-
-  @JsonProperty("objective")
-  private String objective = null;
-
-  @JsonProperty("programName")
-  private String programName = null;
-
-  private final transient Gson gson = new Gson();
-
-  public BrAPIProgram programDbId(String programDbId) {
-    this.programDbId = programDbId;
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies the program
-   * @return programDbId
-   **/
-
-
-
-  public String getProgramDbId() {
-    return programDbId;
-  }
-
-  public void setProgramDbId(String programDbId) {
-    this.programDbId = programDbId;
-  }
-
-  public BrAPIProgram abbreviation(String abbreviation) {
-    this.abbreviation = abbreviation;
-    return this;
-  }
-
-  /**
-   * An abbreviation which represents this program
-   * @return abbreviation
-   **/
-
-
-  public String getAbbreviation() {
-    return abbreviation;
-  }
-
-  public void setAbbreviation(String abbreviation) {
-    this.abbreviation = abbreviation;
-  }
-
-  public BrAPIProgram additionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-    return this;
-  }
-
-  public BrAPIProgram putAdditionalInfoItem(String key, Object additionalInfoItem) {
-    if (this.additionalInfo == null) {
-      this.additionalInfo = new JsonObject();
-    }
-    JsonElement newElement = gson.toJsonTree(additionalInfoItem);
-    this.additionalInfo.add(key, newElement);
-    return this;
-  }
-
-  /**
-   * Additional arbitrary info
-   * @return additionalInfo
-   **/
-
-
-  public JsonObject getAdditionalInfo() {
-    return additionalInfo;
-  }
-
-  public void setAdditionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-  }
-
-  public BrAPIProgram commonCropName(String commonCropName) {
-    this.commonCropName = commonCropName;
-    return this;
-  }
-
-  /**
-   * Common name for the crop which this program is for
-   * @return commonCropName
-   **/
-
-
-  public String getCommonCropName() {
-    return commonCropName;
-  }
-
-  public void setCommonCropName(String commonCropName) {
-    this.commonCropName = commonCropName;
-  }
-
-  public BrAPIProgram documentationURL(String documentationURL) {
-    this.documentationURL = documentationURL;
-    return this;
-  }
-
-  /**
-   * A URL to the human readable documentation of this object
-   * @return documentationURL
-   **/
-
-
-  public String getDocumentationURL() {
-    return documentationURL;
-  }
+	@JsonProperty("programDbId")
+	private String programDbId = null;
 
-  public void setDocumentationURL(String documentationURL) {
-    this.documentationURL = documentationURL;
-  }
+	@JsonProperty("abbreviation")
+	private String abbreviation = null;
 
-  public BrAPIProgram externalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-    return this;
-  }
+	@JsonProperty("additionalInfo")
+	@JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
+	private JsonObject additionalInfo = null;
 
-  /**
-   * Get externalReferences
-   * @return externalReferences
-   **/
-
-
-  @Valid
-  public List<BrAPIExternalReference> getExternalReferences() {
-    return externalReferences;
-  }
-
-  public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-  }
-
-  public BrAPIProgram leadPersonDbId(String leadPersonDbId) {
-    this.leadPersonDbId = leadPersonDbId;
-    return this;
-  }
-
-  /**
-   * The unique identifier of the program leader
-   * @return leadPersonDbId
-   **/
-
-
-  public String getLeadPersonDbId() {
-    return leadPersonDbId;
-  }
-
-  public void setLeadPersonDbId(String leadPersonDbId) {
-    this.leadPersonDbId = leadPersonDbId;
-  }
-
-  public BrAPIProgram leadPersonName(String leadPersonName) {
-    this.leadPersonName = leadPersonName;
-    return this;
-  }
-
-  /**
-   * The name of the program leader
-   * @return leadPersonName
-   **/
-
-
-  public String getLeadPersonName() {
-    return leadPersonName;
-  }
-
-  public void setLeadPersonName(String leadPersonName) {
-    this.leadPersonName = leadPersonName;
-  }
-
-  public BrAPIProgram objective(String objective) {
-    this.objective = objective;
-    return this;
-  }
-
-  /**
-   * The primary objective of the program
-   * @return objective
-   **/
-
-
-  public String getObjective() {
-    return objective;
-  }
-
-  public void setObjective(String objective) {
-    this.objective = objective;
-  }
-
-  public BrAPIProgram programName(String programName) {
-    this.programName = programName;
-    return this;
-  }
-
-  /**
-   * Human readable name of the program
-   * @return programName
-   **/
-
-
-  public String getProgramName() {
-    return programName;
-  }
-
-  public void setProgramName(String programName) {
-    this.programName = programName;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIProgram program = (BrAPIProgram) o;
-    return Objects.equals(this.programDbId, program.programDbId)
-            && Objects.equals(this.abbreviation, program.abbreviation) &&
-            Objects.equals(this.additionalInfo, program.additionalInfo) &&
-            Objects.equals(this.commonCropName, program.commonCropName) &&
-            Objects.equals(this.documentationURL, program.documentationURL) &&
-            Objects.equals(this.externalReferences, program.externalReferences) &&
-            Objects.equals(this.leadPersonDbId, program.leadPersonDbId) &&
-            Objects.equals(this.leadPersonName, program.leadPersonName) &&
-            Objects.equals(this.objective, program.objective) &&
-            Objects.equals(this.programName, program.programName);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(programDbId, abbreviation, additionalInfo, commonCropName, documentationURL, externalReferences, leadPersonDbId, leadPersonName, objective, programName);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Program {\n");
-    sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-    sb.append("    abbreviation: ").append(toIndentedString(abbreviation)).append("\n");
-    sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-    sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-    sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-    sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-    sb.append("    leadPersonDbId: ").append(toIndentedString(leadPersonDbId)).append("\n");
-    sb.append("    leadPersonName: ").append(toIndentedString(leadPersonName)).append("\n");
-    sb.append("    objective: ").append(toIndentedString(objective)).append("\n");
-    sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+	@JsonProperty("commonCropName")
+	private String commonCropName = null;
+
+	@JsonProperty("documentationURL")
+	private String documentationURL = null;
+
+	@JsonProperty("externalReferences")
+	private List<BrAPIExternalReference> externalReferences = null;
+
+	@JsonProperty("leadPersonDbId")
+	private String leadPersonDbId = null;
+
+	@JsonProperty("leadPersonName")
+	private String leadPersonName = null;
+
+	@JsonProperty("objective")
+	private String objective = null;
+
+	@JsonProperty("programName")
+	private String programName = null;
+
+	@JsonProperty("programType")
+	private String programType = null;
+
+	@JsonProperty("fundingInformation")
+	private String fundingInformation = null;
+
+	private final transient Gson gson = new Gson();
+
+	public BrAPIProgram programDbId(String programDbId) {
+		this.programDbId = programDbId;
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies the program
+	 * 
+	 * @return programDbId
+	 **/
+
+	public String getProgramDbId() {
+		return programDbId;
+	}
+
+	public void setProgramDbId(String programDbId) {
+		this.programDbId = programDbId;
+	}
+
+	public BrAPIProgram abbreviation(String abbreviation) {
+		this.abbreviation = abbreviation;
+		return this;
+	}
+
+	/**
+	 * An abbreviation which represents this program
+	 * 
+	 * @return abbreviation
+	 **/
+
+	public String getAbbreviation() {
+		return abbreviation;
+	}
+
+	public void setAbbreviation(String abbreviation) {
+		this.abbreviation = abbreviation;
+	}
+
+	public BrAPIProgram additionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+		return this;
+	}
+
+	public BrAPIProgram putAdditionalInfoItem(String key, Object additionalInfoItem) {
+		if (this.additionalInfo == null) {
+			this.additionalInfo = new JsonObject();
+		}
+		JsonElement newElement = gson.toJsonTree(additionalInfoItem);
+		this.additionalInfo.add(key, newElement);
+		return this;
+	}
+
+	/**
+	 * Additional arbitrary info
+	 * 
+	 * @return additionalInfo
+	 **/
+
+	public JsonObject getAdditionalInfo() {
+		return additionalInfo;
+	}
+
+	public void setAdditionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+	}
+
+	public BrAPIProgram commonCropName(String commonCropName) {
+		this.commonCropName = commonCropName;
+		return this;
+	}
+
+	/**
+	 * Common name for the crop which this program is for
+	 * 
+	 * @return commonCropName
+	 **/
+
+	public String getCommonCropName() {
+		return commonCropName;
+	}
+
+	public void setCommonCropName(String commonCropName) {
+		this.commonCropName = commonCropName;
+	}
+
+	public BrAPIProgram documentationURL(String documentationURL) {
+		this.documentationURL = documentationURL;
+		return this;
+	}
+
+	/**
+	 * A URL to the human readable documentation of this object
+	 * 
+	 * @return documentationURL
+	 **/
+
+	public String getDocumentationURL() {
+		return documentationURL;
+	}
+
+	public void setDocumentationURL(String documentationURL) {
+		this.documentationURL = documentationURL;
+	}
+
+	public BrAPIProgram externalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+		return this;
+	}
+
+	/**
+	 * Get externalReferences
+	 * 
+	 * @return externalReferences
+	 **/
+
+	public List<BrAPIExternalReference> getExternalReferences() {
+		return externalReferences;
+	}
+
+	public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+	}
+
+	public BrAPIProgram leadPersonDbId(String leadPersonDbId) {
+		this.leadPersonDbId = leadPersonDbId;
+		return this;
+	}
+
+	/**
+	 * The unique identifier of the program leader
+	 * 
+	 * @return leadPersonDbId
+	 **/
+
+	public String getLeadPersonDbId() {
+		return leadPersonDbId;
+	}
+
+	public void setLeadPersonDbId(String leadPersonDbId) {
+		this.leadPersonDbId = leadPersonDbId;
+	}
+
+	public BrAPIProgram leadPersonName(String leadPersonName) {
+		this.leadPersonName = leadPersonName;
+		return this;
+	}
+
+	/**
+	 * The name of the program leader
+	 * 
+	 * @return leadPersonName
+	 **/
+
+	public String getLeadPersonName() {
+		return leadPersonName;
+	}
+
+	public void setLeadPersonName(String leadPersonName) {
+		this.leadPersonName = leadPersonName;
+	}
+
+	public BrAPIProgram objective(String objective) {
+		this.objective = objective;
+		return this;
+	}
+
+	/**
+	 * The primary objective of the program
+	 * 
+	 * @return objective
+	 **/
+
+	public String getObjective() {
+		return objective;
+	}
+
+	public void setObjective(String objective) {
+		this.objective = objective;
+	}
+
+	public BrAPIProgram programName(String programName) {
+		this.programName = programName;
+		return this;
+	}
+
+	/**
+	 * Human readable name of the program
+	 * 
+	 * @return programName
+	 **/
+
+	public String getProgramName() {
+		return programName;
+	}
+
+	public void setProgramName(String programName) {
+		this.programName = programName;
+	}
+
+	public BrAPIProgram programType(String programType) {
+		this.programType = programType;
+		return this;
+	}
+
+	/**
+	 * Human readable name of the program
+	 * 
+	 * @return programType
+	 **/
+
+	public String getProgramType() {
+		return programType;
+	}
+
+	public void setProgramType(String programType) {
+		this.programType = programType;
+	}
+
+	public BrAPIProgram fundingInformation(String fundingInformation) {
+		this.fundingInformation = fundingInformation;
+		return this;
+	}
+
+	/**
+	 * Human readable name of the program
+	 * 
+	 * @return fundingInformation
+	 **/
+
+	public String getFundingInformation() {
+		return fundingInformation;
+	}
+
+	public void setFundingInformation(String fundingInformation) {
+		this.fundingInformation = fundingInformation;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIProgram program = (BrAPIProgram) o;
+		return Objects.equals(this.programDbId, program.programDbId)
+				&& Objects.equals(this.abbreviation, program.abbreviation)
+				&& Objects.equals(this.additionalInfo, program.additionalInfo)
+				&& Objects.equals(this.commonCropName, program.commonCropName)
+				&& Objects.equals(this.documentationURL, program.documentationURL)
+				&& Objects.equals(this.externalReferences, program.externalReferences)
+				&& Objects.equals(this.leadPersonDbId, program.leadPersonDbId)
+				&& Objects.equals(this.leadPersonName, program.leadPersonName)
+				&& Objects.equals(this.objective, program.objective)
+				&& Objects.equals(this.programName, program.programName)
+				&& Objects.equals(this.programType, program.programType)
+				&& Objects.equals(this.fundingInformation, program.fundingInformation);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(programDbId, abbreviation, additionalInfo, commonCropName, documentationURL,
+				externalReferences, leadPersonDbId, leadPersonName, objective, programName, programType,
+				fundingInformation);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class Program {\n");
+		sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
+		sb.append("    abbreviation: ").append(toIndentedString(abbreviation)).append("\n");
+		sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
+		sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
+		sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
+		sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
+		sb.append("    leadPersonDbId: ").append(toIndentedString(leadPersonDbId)).append("\n");
+		sb.append("    leadPersonName: ").append(toIndentedString(leadPersonName)).append("\n");
+		sb.append("    objective: ").append(toIndentedString(objective)).append("\n");
+		sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
+		sb.append("    programType: ").append(toIndentedString(programType)).append("\n");
+		sb.append("    fundingInformation: ").append(toIndentedString(fundingInformation)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPIProgramSearchRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPIProgramSearchRequest.java
index c9b46a60..e075a965 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPIProgramSearchRequest.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPIProgramSearchRequest.java
@@ -6,348 +6,405 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-
 import org.brapi.v2.model.BrAPISearchRequestParametersPaging;
 
 /**
  * ProgramSearchRequest
  */
 
-
-public class BrAPIProgramSearchRequest extends BrAPISearchRequestParametersPaging  {
-  @JsonProperty("commonCropNames")
-  @Valid
-  private List<String> commonCropNames = null;
-
-  @JsonProperty("programDbIds")
-  @Valid
-  private List<String> programDbIds = null;
-
-  @JsonProperty("programNames")
-  @Valid
-  private List<String> programNames = null;
-
-  @JsonProperty("externalReferenceIDs")
-  @Valid
-  private List<String> externalReferenceIDs = null;
-
-  @JsonProperty("externalReferenceSources")
-  @Valid
-  private List<String> externalReferenceSources = null;
-
-  @JsonProperty("abbreviations")
-  @Valid
-  private List<String> abbreviations = null;
-
-  @JsonProperty("leadPersonDbIds")
-  @Valid
-  private List<String> leadPersonDbIds = null;
-
-  @JsonProperty("leadPersonNames")
-  @Valid
-  private List<String> leadPersonNames = null;
-
-  @JsonProperty("objectives")
-  @Valid
-  private List<String> objectives = null;
-
-  public BrAPIProgramSearchRequest commonCropNames(List<String> commonCropNames) {
-    this.commonCropNames = commonCropNames;
-    return this;
-  }
-
-  public BrAPIProgramSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-    if (this.commonCropNames == null) {
-      this.commonCropNames = new ArrayList<String>();
-    }
-    this.commonCropNames.add(commonCropNamesItem);
-    return this;
-  }
-
-  /**
-   * Common name for the crop which this program is for
-   * @return commonCropNames
-  **/
-  
-  
-    public List<String> getCommonCropNames() {
-    return commonCropNames;
-  }
-
-  public void setCommonCropNames(List<String> commonCropNames) {
-    this.commonCropNames = commonCropNames;
-  }
-
-  public BrAPIProgramSearchRequest programDbIds(List<String> programDbIds) {
-    this.programDbIds = programDbIds;
-    return this;
-  }
-
-  public BrAPIProgramSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-    if (this.programDbIds == null) {
-      this.programDbIds = new ArrayList<String>();
-    }
-    this.programDbIds.add(programDbIdsItem);
-    return this;
-  }
-
-  /**
-   * A program identifier to search for
-   * @return programDbIds
-  **/
-  
-  
-    public List<String> getProgramDbIds() {
-    return programDbIds;
-  }
-
-  public void setProgramDbIds(List<String> programDbIds) {
-    this.programDbIds = programDbIds;
-  }
-
-  public BrAPIProgramSearchRequest programNames(List<String> programNames) {
-    this.programNames = programNames;
-    return this;
-  }
-
-  public BrAPIProgramSearchRequest addProgramNamesItem(String programNamesItem) {
-    if (this.programNames == null) {
-      this.programNames = new ArrayList<String>();
-    }
-    this.programNames.add(programNamesItem);
-    return this;
-  }
-
-  /**
-   * A name of a program to search for
-   * @return programNames
-  **/
-  
-  
-    public List<String> getProgramNames() {
-    return programNames;
-  }
-
-  public void setProgramNames(List<String> programNames) {
-    this.programNames = programNames;
-  }
-
-  public BrAPIProgramSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-    return this;
-  }
-
-  public BrAPIProgramSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-    if (this.externalReferenceIDs == null) {
-      this.externalReferenceIDs = new ArrayList<String>();
-    }
-    this.externalReferenceIDs.add(externalReferenceIDsItem);
-    return this;
-  }
-
-  /**
-   * List of external references for the trait to search for
-   * @return externalReferenceIDs
-  **/
-  
-  
-    public List<String> getExternalReferenceIDs() {
-    return externalReferenceIDs;
-  }
-
-  public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-  }
-
-  public BrAPIProgramSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-    return this;
-  }
-
-  public BrAPIProgramSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-    if (this.externalReferenceSources == null) {
-      this.externalReferenceSources = new ArrayList<String>();
-    }
-    this.externalReferenceSources.add(externalReferenceSourcesItem);
-    return this;
-  }
-
-  /**
-   * List of external references sources for the trait to search for
-   * @return externalReferenceSources
-  **/
-  
-  
-    public List<String> getExternalReferenceSources() {
-    return externalReferenceSources;
-  }
-
-  public void setExternalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-  }
-
-  public BrAPIProgramSearchRequest abbreviations(List<String> abbreviations) {
-    this.abbreviations = abbreviations;
-    return this;
-  }
-
-  public BrAPIProgramSearchRequest addAbbreviationsItem(String abbreviationsItem) {
-    if (this.abbreviations == null) {
-      this.abbreviations = new ArrayList<String>();
-    }
-    this.abbreviations.add(abbreviationsItem);
-    return this;
-  }
-
-  /**
-   * An abbreviation of a program to search for
-   * @return abbreviations
-  **/
-  
-  
-    public List<String> getAbbreviations() {
-    return abbreviations;
-  }
-
-  public void setAbbreviations(List<String> abbreviations) {
-    this.abbreviations = abbreviations;
-  }
-
-  public BrAPIProgramSearchRequest leadPersonDbIds(List<String> leadPersonDbIds) {
-    this.leadPersonDbIds = leadPersonDbIds;
-    return this;
-  }
-
-  public BrAPIProgramSearchRequest addLeadPersonDbIdsItem(String leadPersonDbIdsItem) {
-    if (this.leadPersonDbIds == null) {
-      this.leadPersonDbIds = new ArrayList<String>();
-    }
-    this.leadPersonDbIds.add(leadPersonDbIdsItem);
-    return this;
-  }
-
-  /**
-   * The person DbIds of the program leader to search for
-   * @return leadPersonDbIds
-  **/
-  
-  
-    public List<String> getLeadPersonDbIds() {
-    return leadPersonDbIds;
-  }
-
-  public void setLeadPersonDbIds(List<String> leadPersonDbIds) {
-    this.leadPersonDbIds = leadPersonDbIds;
-  }
-
-  public BrAPIProgramSearchRequest leadPersonNames(List<String> leadPersonNames) {
-    this.leadPersonNames = leadPersonNames;
-    return this;
-  }
-
-  public BrAPIProgramSearchRequest addLeadPersonNamesItem(String leadPersonNamesItem) {
-    if (this.leadPersonNames == null) {
-      this.leadPersonNames = new ArrayList<String>();
-    }
-    this.leadPersonNames.add(leadPersonNamesItem);
-    return this;
-  }
-
-  /**
-   * The names of the program leader to search for
-   * @return leadPersonNames
-  **/
-  
-  
-    public List<String> getLeadPersonNames() {
-    return leadPersonNames;
-  }
-
-  public void setLeadPersonNames(List<String> leadPersonNames) {
-    this.leadPersonNames = leadPersonNames;
-  }
-
-  public BrAPIProgramSearchRequest objectives(List<String> objectives) {
-    this.objectives = objectives;
-    return this;
-  }
-
-  public BrAPIProgramSearchRequest addObjectivesItem(String objectivesItem) {
-    if (this.objectives == null) {
-      this.objectives = new ArrayList<String>();
-    }
-    this.objectives.add(objectivesItem);
-    return this;
-  }
-
-  /**
-   * A program objective to search for
-   * @return objectives
-  **/
-  
-  
-    public List<String> getObjectives() {
-    return objectives;
-  }
-
-  public void setObjectives(List<String> objectives) {
-    this.objectives = objectives;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIProgramSearchRequest programSearchRequest = (BrAPIProgramSearchRequest) o;
-    return Objects.equals(this.commonCropNames, programSearchRequest.commonCropNames) &&
-        Objects.equals(this.programDbIds, programSearchRequest.programDbIds) &&
-        Objects.equals(this.programNames, programSearchRequest.programNames) &&
-        Objects.equals(this.externalReferenceIDs, programSearchRequest.externalReferenceIDs) &&
-        Objects.equals(this.externalReferenceSources, programSearchRequest.externalReferenceSources) &&
-        Objects.equals(this.abbreviations, programSearchRequest.abbreviations) &&
-        Objects.equals(this.leadPersonDbIds, programSearchRequest.leadPersonDbIds) &&
-        Objects.equals(this.leadPersonNames, programSearchRequest.leadPersonNames) &&
-        Objects.equals(this.objectives, programSearchRequest.objectives) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(commonCropNames, programDbIds, programNames, externalReferenceIDs, externalReferenceSources, abbreviations, leadPersonDbIds, leadPersonNames, objectives, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProgramSearchRequest {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-    sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-    sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-    sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-    sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-    sb.append("    abbreviations: ").append(toIndentedString(abbreviations)).append("\n");
-    sb.append("    leadPersonDbIds: ").append(toIndentedString(leadPersonDbIds)).append("\n");
-    sb.append("    leadPersonNames: ").append(toIndentedString(leadPersonNames)).append("\n");
-    sb.append("    objectives: ").append(toIndentedString(objectives)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+public class BrAPIProgramSearchRequest extends BrAPISearchRequestParametersPaging {
+	@JsonProperty("commonCropNames")
+	private List<String> commonCropNames = null;
+
+	@JsonProperty("programDbIds")
+	private List<String> programDbIds = null;
+
+	@JsonProperty("programNames")
+	private List<String> programNames = null;
+
+	@JsonProperty("programTypes")
+	private List<String> programTypes = null;
+
+	@JsonProperty("externalReferenceIds")
+	private List<String> externalReferenceIds = null;
+
+	@Deprecated
+	@JsonProperty("externalReferenceIDs")
+	private List<String> externalReferenceIDs = null;
+
+	@JsonProperty("externalReferenceSources")
+	private List<String> externalReferenceSources = null;
+
+	@JsonProperty("abbreviations")
+	private List<String> abbreviations = null;
+
+	@JsonProperty("leadPersonDbIds")
+	private List<String> leadPersonDbIds = null;
+
+	@JsonProperty("leadPersonNames")
+	private List<String> leadPersonNames = null;
+
+	@JsonProperty("objectives")
+	private List<String> objectives = null;
+
+	public BrAPIProgramSearchRequest commonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+		return this;
+	}
+
+	public BrAPIProgramSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
+		if (this.commonCropNames == null) {
+			this.commonCropNames = new ArrayList<String>();
+		}
+		this.commonCropNames.add(commonCropNamesItem);
+		return this;
+	}
+
+	/**
+	 * Common name for the crop which this program is for
+	 * 
+	 * @return commonCropNames
+	 **/
+
+	public List<String> getCommonCropNames() {
+		return commonCropNames;
+	}
+
+	public void setCommonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+	}
+
+	public BrAPIProgramSearchRequest programDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+		return this;
+	}
+
+	public BrAPIProgramSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
+		if (this.programDbIds == null) {
+			this.programDbIds = new ArrayList<String>();
+		}
+		this.programDbIds.add(programDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * A program identifier to search for
+	 * 
+	 * @return programDbIds
+	 **/
+
+	public List<String> getProgramDbIds() {
+		return programDbIds;
+	}
+
+	public void setProgramDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+	}
+
+	public BrAPIProgramSearchRequest programNames(List<String> programNames) {
+		this.programNames = programNames;
+		return this;
+	}
+
+	public BrAPIProgramSearchRequest addProgramNamesItem(String programNamesItem) {
+		if (this.programNames == null) {
+			this.programNames = new ArrayList<String>();
+		}
+		this.programNames.add(programNamesItem);
+		return this;
+	}
+
+	/**
+	 * A name of a program to search for
+	 * 
+	 * @return programNames
+	 **/
+
+	public List<String> getProgramNames() {
+		return programNames;
+	}
+
+	public void setProgramNames(List<String> programNames) {
+		this.programNames = programNames;
+	}
+
+	public BrAPIProgramSearchRequest programTypes(List<String> programTypes) {
+		this.programTypes = programTypes;
+		return this;
+	}
+
+	public BrAPIProgramSearchRequest addProgramTypesItem(String programTypesItem) {
+		if (this.programTypes == null) {
+			this.programTypes = new ArrayList<String>();
+		}
+		this.programTypes.add(programTypesItem);
+		return this;
+	}
+
+	/**
+	 * A name of a program to search for
+	 * 
+	 * @return programTypes
+	 **/
+
+	public List<String> getProgramTypes() {
+		return programTypes;
+	}
+
+	public void setProgramTypes(List<String> programTypes) {
+		this.programTypes = programTypes;
+	}
+
+	public BrAPIProgramSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+		return this;
+	}
+
+	public BrAPIProgramSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
+		if (this.externalReferenceIds == null) {
+			this.externalReferenceIds = new ArrayList<String>();
+		}
+		this.externalReferenceIds.add(externalReferenceIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of external references for the trait to search for
+	 * 
+	 * @return externalReferenceIds
+	 **/
+
+	public List<String> getExternalReferenceIds() {
+		return externalReferenceIds;
+	}
+
+	public void setExternalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+	}
+
+	@Deprecated
+	public BrAPIProgramSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+		return this;
+	}
+
+	@Deprecated
+	public BrAPIProgramSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
+		if (this.externalReferenceIDs == null) {
+			this.externalReferenceIDs = new ArrayList<String>();
+		}
+		this.externalReferenceIDs.add(externalReferenceIDsItem);
+		return this;
+	}
+
+	/**
+	 * List of external references for the trait to search for
+	 * 
+	 * @return externalReferenceIDs
+	 **/
+
+	@Deprecated
+	public List<String> getExternalReferenceIDs() {
+		return externalReferenceIDs;
+	}
+
+	@Deprecated
+	public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+	}
+
+	public BrAPIProgramSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+		return this;
+	}
+
+	public BrAPIProgramSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
+		if (this.externalReferenceSources == null) {
+			this.externalReferenceSources = new ArrayList<String>();
+		}
+		this.externalReferenceSources.add(externalReferenceSourcesItem);
+		return this;
+	}
+
+	/**
+	 * List of external references sources for the trait to search for
+	 * 
+	 * @return externalReferenceSources
+	 **/
+
+	public List<String> getExternalReferenceSources() {
+		return externalReferenceSources;
+	}
+
+	public void setExternalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+	}
+
+	public BrAPIProgramSearchRequest abbreviations(List<String> abbreviations) {
+		this.abbreviations = abbreviations;
+		return this;
+	}
+
+	public BrAPIProgramSearchRequest addAbbreviationsItem(String abbreviationsItem) {
+		if (this.abbreviations == null) {
+			this.abbreviations = new ArrayList<String>();
+		}
+		this.abbreviations.add(abbreviationsItem);
+		return this;
+	}
+
+	/**
+	 * An abbreviation of a program to search for
+	 * 
+	 * @return abbreviations
+	 **/
+
+	public List<String> getAbbreviations() {
+		return abbreviations;
+	}
+
+	public void setAbbreviations(List<String> abbreviations) {
+		this.abbreviations = abbreviations;
+	}
+
+	public BrAPIProgramSearchRequest leadPersonDbIds(List<String> leadPersonDbIds) {
+		this.leadPersonDbIds = leadPersonDbIds;
+		return this;
+	}
+
+	public BrAPIProgramSearchRequest addLeadPersonDbIdsItem(String leadPersonDbIdsItem) {
+		if (this.leadPersonDbIds == null) {
+			this.leadPersonDbIds = new ArrayList<String>();
+		}
+		this.leadPersonDbIds.add(leadPersonDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The person DbIds of the program leader to search for
+	 * 
+	 * @return leadPersonDbIds
+	 **/
+
+	public List<String> getLeadPersonDbIds() {
+		return leadPersonDbIds;
+	}
+
+	public void setLeadPersonDbIds(List<String> leadPersonDbIds) {
+		this.leadPersonDbIds = leadPersonDbIds;
+	}
+
+	public BrAPIProgramSearchRequest leadPersonNames(List<String> leadPersonNames) {
+		this.leadPersonNames = leadPersonNames;
+		return this;
+	}
+
+	public BrAPIProgramSearchRequest addLeadPersonNamesItem(String leadPersonNamesItem) {
+		if (this.leadPersonNames == null) {
+			this.leadPersonNames = new ArrayList<String>();
+		}
+		this.leadPersonNames.add(leadPersonNamesItem);
+		return this;
+	}
+
+	/**
+	 * The names of the program leader to search for
+	 * 
+	 * @return leadPersonNames
+	 **/
+
+	public List<String> getLeadPersonNames() {
+		return leadPersonNames;
+	}
+
+	public void setLeadPersonNames(List<String> leadPersonNames) {
+		this.leadPersonNames = leadPersonNames;
+	}
+
+	public BrAPIProgramSearchRequest objectives(List<String> objectives) {
+		this.objectives = objectives;
+		return this;
+	}
+
+	public BrAPIProgramSearchRequest addObjectivesItem(String objectivesItem) {
+		if (this.objectives == null) {
+			this.objectives = new ArrayList<String>();
+		}
+		this.objectives.add(objectivesItem);
+		return this;
+	}
+
+	/**
+	 * A program objective to search for
+	 * 
+	 * @return objectives
+	 **/
+
+	public List<String> getObjectives() {
+		return objectives;
+	}
+
+	public void setObjectives(List<String> objectives) {
+		this.objectives = objectives;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIProgramSearchRequest programSearchRequest = (BrAPIProgramSearchRequest) o;
+		return Objects.equals(this.commonCropNames, programSearchRequest.commonCropNames)
+				&& Objects.equals(this.programDbIds, programSearchRequest.programDbIds)
+				&& Objects.equals(this.programNames, programSearchRequest.programNames)
+				&& Objects.equals(this.programTypes, programSearchRequest.programTypes)
+				&& Objects.equals(this.externalReferenceIds, programSearchRequest.externalReferenceIds)
+				&& Objects.equals(this.externalReferenceIDs, programSearchRequest.externalReferenceIDs)
+				&& Objects.equals(this.externalReferenceSources, programSearchRequest.externalReferenceSources)
+				&& Objects.equals(this.abbreviations, programSearchRequest.abbreviations)
+				&& Objects.equals(this.leadPersonDbIds, programSearchRequest.leadPersonDbIds)
+				&& Objects.equals(this.leadPersonNames, programSearchRequest.leadPersonNames)
+				&& Objects.equals(this.objectives, programSearchRequest.objectives) && super.equals(o);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(commonCropNames, programDbIds, programNames, programTypes, externalReferenceIds,
+				externalReferenceIDs, externalReferenceSources, abbreviations, leadPersonDbIds, leadPersonNames,
+				objectives, super.hashCode());
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class ProgramSearchRequest {\n");
+		sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+		sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
+		sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
+		sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
+		sb.append("    programTypes: ").append(toIndentedString(programTypes)).append("\n");
+		sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
+		sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
+		sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
+		sb.append("    abbreviations: ").append(toIndentedString(abbreviations)).append("\n");
+		sb.append("    leadPersonDbIds: ").append(toIndentedString(leadPersonDbIds)).append("\n");
+		sb.append("    leadPersonNames: ").append(toIndentedString(leadPersonNames)).append("\n");
+		sb.append("    objectives: ").append(toIndentedString(objectives)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPITrialSearchRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPITrialSearchRequest.java
index 9187741a..c58b5624 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPITrialSearchRequest.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPITrialSearchRequest.java
@@ -7,8 +7,6 @@
 import java.util.List;
 import java.time.LocalDate;
 
-import javax.validation.Valid;
-
 import org.brapi.v2.model.BrAPISearchRequestParametersPaging;
 import org.brapi.v2.model.BrAPISortBy;
 import org.brapi.v2.model.BrAPISortOrder;
@@ -17,568 +15,604 @@
  * TrialSearchRequest
  */
 
+public class BrAPITrialSearchRequest extends BrAPISearchRequestParametersPaging {
+	@JsonProperty("commonCropNames")
+	private List<String> commonCropNames = null;
 
-public class BrAPITrialSearchRequest extends BrAPISearchRequestParametersPaging  {
-  @JsonProperty("commonCropNames")
-  @Valid
-  private List<String> commonCropNames = null;
-
-  @JsonProperty("programDbIds")
-  @Valid
-  private List<String> programDbIds = null;
-
-  @JsonProperty("programNames")
-  @Valid
-  private List<String> programNames = null;
+	@JsonProperty("programDbIds")
+	private List<String> programDbIds = null;
 
-  @JsonProperty("trialDbIds")
-  @Valid
-  private List<String> trialDbIds = null;
+	@JsonProperty("programNames")
+	private List<String> programNames = null;
 
-  @JsonProperty("trialNames")
-  @Valid
-  private List<String> trialNames = null;
+	@JsonProperty("trialDbIds")
+	private List<String> trialDbIds = null;
 
-  @JsonProperty("studyDbIds")
-  @Valid
-  private List<String> studyDbIds = null;
+	@JsonProperty("trialNames")
+	private List<String> trialNames = null;
 
-  @JsonProperty("studyNames")
-  @Valid
-  private List<String> studyNames = null;
+	@JsonProperty("studyDbIds")
+	private List<String> studyDbIds = null;
 
-  @JsonProperty("locationDbIds")
-  @Valid
-  private List<String> locationDbIds = null;
+	@JsonProperty("studyNames")
+	private List<String> studyNames = null;
 
-  @JsonProperty("locationNames")
-  @Valid
-  private List<String> locationNames = null;
+	@JsonProperty("locationDbIds")
+	private List<String> locationDbIds = null;
 
-  @JsonProperty("externalReferenceIDs")
-  @Valid
-  private List<String> externalReferenceIDs = null;
+	@JsonProperty("locationNames")
+	private List<String> locationNames = null;
 
-  @JsonProperty("externalReferenceSources")
-  @Valid
-  private List<String> externalReferenceSources = null;
+	@JsonProperty("externalReferenceIds")
+	private List<String> externalReferenceIds = null;
 
-  @JsonProperty("active")
-  private Boolean active = null;
+	@Deprecated
+	@JsonProperty("externalReferenceIDs")
+	private List<String> externalReferenceIDs = null;
 
-  @JsonProperty("contactDbIds")
-  @Valid
-  private List<String> contactDbIds = null;
+	@JsonProperty("externalReferenceSources")
+	private List<String> externalReferenceSources = null;
 
-  @JsonProperty("searchDateRangeEnd")
-  private LocalDate searchDateRangeEnd = null;
+	@JsonProperty("active")
+	private Boolean active = null;
 
-  @JsonProperty("searchDateRangeStart")
-  private LocalDate searchDateRangeStart = null;
+	@JsonProperty("contactDbIds")
+	private List<String> contactDbIds = null;
 
-  @JsonProperty("trialPUIs")
-  @Valid
-  private List<String> trialPUIs = null;
+	@JsonProperty("searchDateRangeEnd")
+	private LocalDate searchDateRangeEnd = null;
+
+	@JsonProperty("searchDateRangeStart")
+	private LocalDate searchDateRangeStart = null;
 
-  @JsonProperty("sortBy")
-  private BrAPISortBy sortBy = null;
-
-  @JsonProperty("sortOrder")
-  private BrAPISortOrder sortOrder = null;
-
-  public BrAPISortBy getSortBy() {
-	return sortBy;
-}
+	@JsonProperty("trialPUIs")
+	private List<String> trialPUIs = null;
 
-public void setSortBy(BrAPISortBy sortBy) {
-	this.sortBy = sortBy;
-}
-
-public BrAPISortOrder getSortOrder() {
-	return sortOrder;
-}
-
-public void setSortOrder(BrAPISortOrder sortOrder) {
-	this.sortOrder = sortOrder;
-}
+	@JsonProperty("sortBy")
+	private BrAPISortBy sortBy = null;
 
-public BrAPITrialSearchRequest commonCropNames(List<String> commonCropNames) {
-    this.commonCropNames = commonCropNames;
-    return this;
-  }
-
-  public BrAPITrialSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-    if (this.commonCropNames == null) {
-      this.commonCropNames = new ArrayList<String>();
-    }
-    this.commonCropNames.add(commonCropNamesItem);
-    return this;
-  }
-
-  /**
-   * Common name for the crop which this program is for
-   * @return commonCropNames
-  **/
-  
-  
-    public List<String> getCommonCropNames() {
-    return commonCropNames;
-  }
-
-  public void setCommonCropNames(List<String> commonCropNames) {
-    this.commonCropNames = commonCropNames;
-  }
-
-  public BrAPITrialSearchRequest programDbIds(List<String> programDbIds) {
-    this.programDbIds = programDbIds;
-    return this;
-  }
-
-  public BrAPITrialSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-    if (this.programDbIds == null) {
-      this.programDbIds = new ArrayList<String>();
-    }
-    this.programDbIds.add(programDbIdsItem);
-    return this;
-  }
-
-  /**
-   * A program identifier to search for
-   * @return programDbIds
-  **/
-  
-  
-    public List<String> getProgramDbIds() {
-    return programDbIds;
-  }
-
-  public void setProgramDbIds(List<String> programDbIds) {
-    this.programDbIds = programDbIds;
-  }
-
-  public BrAPITrialSearchRequest programNames(List<String> programNames) {
-    this.programNames = programNames;
-    return this;
-  }
-
-  public BrAPITrialSearchRequest addProgramNamesItem(String programNamesItem) {
-    if (this.programNames == null) {
-      this.programNames = new ArrayList<String>();
-    }
-    this.programNames.add(programNamesItem);
-    return this;
-  }
-
-  /**
-   * A name of a program to search for
-   * @return programNames
-  **/
-  
-  
-    public List<String> getProgramNames() {
-    return programNames;
-  }
-
-  public void setProgramNames(List<String> programNames) {
-    this.programNames = programNames;
-  }
-
-  public BrAPITrialSearchRequest trialDbIds(List<String> trialDbIds) {
-    this.trialDbIds = trialDbIds;
-    return this;
-  }
-
-  public BrAPITrialSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-    if (this.trialDbIds == null) {
-      this.trialDbIds = new ArrayList<String>();
-    }
-    this.trialDbIds.add(trialDbIdsItem);
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies a trial to search for
-   * @return trialDbIds
-  **/
-  
-  
-    public List<String> getTrialDbIds() {
-    return trialDbIds;
-  }
-
-  public void setTrialDbIds(List<String> trialDbIds) {
-    this.trialDbIds = trialDbIds;
-  }
-
-  public BrAPITrialSearchRequest trialNames(List<String> trialNames) {
-    this.trialNames = trialNames;
-    return this;
-  }
-
-  public BrAPITrialSearchRequest addTrialNamesItem(String trialNamesItem) {
-    if (this.trialNames == null) {
-      this.trialNames = new ArrayList<String>();
-    }
-    this.trialNames.add(trialNamesItem);
-    return this;
-  }
-
-  /**
-   * The human readable name of a trial to search for
-   * @return trialNames
-  **/
-  
-  
-    public List<String> getTrialNames() {
-    return trialNames;
-  }
-
-  public void setTrialNames(List<String> trialNames) {
-    this.trialNames = trialNames;
-  }
-
-  public BrAPITrialSearchRequest studyDbIds(List<String> studyDbIds) {
-    this.studyDbIds = studyDbIds;
-    return this;
-  }
-
-  public BrAPITrialSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-    if (this.studyDbIds == null) {
-      this.studyDbIds = new ArrayList<String>();
-    }
-    this.studyDbIds.add(studyDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of study identifiers to search for
-   * @return studyDbIds
-  **/
-  
-  
-    public List<String> getStudyDbIds() {
-    return studyDbIds;
-  }
-
-  public void setStudyDbIds(List<String> studyDbIds) {
-    this.studyDbIds = studyDbIds;
-  }
-
-  public BrAPITrialSearchRequest studyNames(List<String> studyNames) {
-    this.studyNames = studyNames;
-    return this;
-  }
-
-  public BrAPITrialSearchRequest addStudyNamesItem(String studyNamesItem) {
-    if (this.studyNames == null) {
-      this.studyNames = new ArrayList<String>();
-    }
-    this.studyNames.add(studyNamesItem);
-    return this;
-  }
-
-  /**
-   * List of study names to filter search results
-   * @return studyNames
-  **/
-  
-  
-    public List<String> getStudyNames() {
-    return studyNames;
-  }
-
-  public void setStudyNames(List<String> studyNames) {
-    this.studyNames = studyNames;
-  }
-
-  public BrAPITrialSearchRequest locationDbIds(List<String> locationDbIds) {
-    this.locationDbIds = locationDbIds;
-    return this;
-  }
-
-  public BrAPITrialSearchRequest addLocationDbIdsItem(String locationDbIdsItem) {
-    if (this.locationDbIds == null) {
-      this.locationDbIds = new ArrayList<String>();
-    }
-    this.locationDbIds.add(locationDbIdsItem);
-    return this;
-  }
-
-  /**
-   * The location ids to search for
-   * @return locationDbIds
-  **/
-  
-  
-    public List<String> getLocationDbIds() {
-    return locationDbIds;
-  }
-
-  public void setLocationDbIds(List<String> locationDbIds) {
-    this.locationDbIds = locationDbIds;
-  }
-
-  public BrAPITrialSearchRequest locationNames(List<String> locationNames) {
-    this.locationNames = locationNames;
-    return this;
-  }
-
-  public BrAPITrialSearchRequest addLocationNamesItem(String locationNamesItem) {
-    if (this.locationNames == null) {
-      this.locationNames = new ArrayList<String>();
-    }
-    this.locationNames.add(locationNamesItem);
-    return this;
-  }
-
-  /**
-   * A human readable names to search for
-   * @return locationNames
-  **/
-  
-  
-    public List<String> getLocationNames() {
-    return locationNames;
-  }
-
-  public void setLocationNames(List<String> locationNames) {
-    this.locationNames = locationNames;
-  }
-
-  public BrAPITrialSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-    return this;
-  }
-
-  public BrAPITrialSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-    if (this.externalReferenceIDs == null) {
-      this.externalReferenceIDs = new ArrayList<String>();
-    }
-    this.externalReferenceIDs.add(externalReferenceIDsItem);
-    return this;
-  }
-
-  /**
-   * List of external references for the trait to search for
-   * @return externalReferenceIDs
-  **/
-  
-  
-    public List<String> getExternalReferenceIDs() {
-    return externalReferenceIDs;
-  }
-
-  public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-  }
-
-  public BrAPITrialSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-    return this;
-  }
-
-  public BrAPITrialSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-    if (this.externalReferenceSources == null) {
-      this.externalReferenceSources = new ArrayList<String>();
-    }
-    this.externalReferenceSources.add(externalReferenceSourcesItem);
-    return this;
-  }
-
-  /**
-   * List of external references sources for the trait to search for
-   * @return externalReferenceSources
-  **/
-  
-  
-    public List<String> getExternalReferenceSources() {
-    return externalReferenceSources;
-  }
-
-  public void setExternalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-  }
-
-  public BrAPITrialSearchRequest active(Boolean active) {
-    this.active = active;
-    return this;
-  }
-
-  /**
-   * Is this trail currently active
-   * @return active
-  **/
-  
-  
-    public Boolean isActive() {
-    return active;
-  }
-
-  public void setActive(Boolean active) {
-    this.active = active;
-  }
-
-  public BrAPITrialSearchRequest contactDbIds(List<String> contactDbIds) {
-    this.contactDbIds = contactDbIds;
-    return this;
-  }
-
-  public BrAPITrialSearchRequest addContactDbIdsItem(String contactDbIdsItem) {
-    if (this.contactDbIds == null) {
-      this.contactDbIds = new ArrayList<String>();
-    }
-    this.contactDbIds.add(contactDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of contact entities associated with this trial
-   * @return contactDbIds
-  **/
-  
-  
-    public List<String> getContactDbIds() {
-    return contactDbIds;
-  }
-
-  public void setContactDbIds(List<String> contactDbIds) {
-    this.contactDbIds = contactDbIds;
-  }
-
-  public BrAPITrialSearchRequest searchDateRangeEnd(LocalDate searchDateRangeEnd) {
-    this.searchDateRangeEnd = searchDateRangeEnd;
-    return this;
-  }
-
-  /**
-   * The end of the overlapping search date range. `searchDateRangeStart` must be before `searchDateRangeEnd`.  Return a Trial entity if any of the following cases are true  - `searchDateRangeStart` is before `trial.endDate` AND `searchDateRangeEnd` is null   - `searchDateRangeStart` is before `trial.endDate` AND `searchDateRangeEnd` is after `trial.startDate`  - `searchDateRangeEnd` is after `trial.startDate` AND `searchDateRangeStart` is null  - `searchDateRangeEnd` is after `trial.startDate` AND `searchDateRangeStart` is before `trial.endDate`
-   * @return searchDateRangeEnd
-  **/
-  
-  
-    @Valid
-    public LocalDate getSearchDateRangeEnd() {
-    return searchDateRangeEnd;
-  }
-
-  public void setSearchDateRangeEnd(LocalDate searchDateRangeEnd) {
-    this.searchDateRangeEnd = searchDateRangeEnd;
-  }
-
-  public BrAPITrialSearchRequest searchDateRangeStart(LocalDate searchDateRangeStart) {
-    this.searchDateRangeStart = searchDateRangeStart;
-    return this;
-  }
-
-  /**
-   * The start of the overlapping search date range. `searchDateRangeStart` must be before `searchDateRangeEnd`.  Return a Trial entity if any of the following cases are true  - `searchDateRangeStart` is before `trial.endDate` AND `searchDateRangeEnd` is null   - `searchDateRangeStart` is before `trial.endDate` AND `searchDateRangeEnd` is after `trial.startDate`  - `searchDateRangeEnd` is after `trial.startDate` AND `searchDateRangeStart` is null  - `searchDateRangeEnd` is after `trial.startDate` AND `searchDateRangeStart` is before `trial.endDate`
-   * @return searchDateRangeStart
-  **/
-  
-  
-    @Valid
-    public LocalDate getSearchDateRangeStart() {
-    return searchDateRangeStart;
-  }
-
-  public void setSearchDateRangeStart(LocalDate searchDateRangeStart) {
-    this.searchDateRangeStart = searchDateRangeStart;
-  }
-
-  public BrAPITrialSearchRequest trialPUIs(List<String> trialPUIs) {
-    this.trialPUIs = trialPUIs;
-    return this;
-  }
-
-  public BrAPITrialSearchRequest addTrialPUIsItem(String trialPUIsItem) {
-    if (this.trialPUIs == null) {
-      this.trialPUIs = new ArrayList<String>();
-    }
-    this.trialPUIs.add(trialPUIsItem);
-    return this;
-  }
-
-  /**
-   * A permanent identifier for a trial. Could be DOI or other URI formatted identifier.
-   * @return trialPUIs
-  **/
-  
-  
-    public List<String> getTrialPUIs() {
-    return trialPUIs;
-  }
-
-  public void setTrialPUIs(List<String> trialPUIs) {
-    this.trialPUIs = trialPUIs;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPITrialSearchRequest trialSearchRequest = (BrAPITrialSearchRequest) o;
-    return Objects.equals(this.commonCropNames, trialSearchRequest.commonCropNames) &&
-        Objects.equals(this.programDbIds, trialSearchRequest.programDbIds) &&
-        Objects.equals(this.programNames, trialSearchRequest.programNames) &&
-        Objects.equals(this.trialDbIds, trialSearchRequest.trialDbIds) &&
-        Objects.equals(this.trialNames, trialSearchRequest.trialNames) &&
-        Objects.equals(this.studyDbIds, trialSearchRequest.studyDbIds) &&
-        Objects.equals(this.studyNames, trialSearchRequest.studyNames) &&
-        Objects.equals(this.locationDbIds, trialSearchRequest.locationDbIds) &&
-        Objects.equals(this.locationNames, trialSearchRequest.locationNames) &&
-        Objects.equals(this.externalReferenceIDs, trialSearchRequest.externalReferenceIDs) &&
-        Objects.equals(this.externalReferenceSources, trialSearchRequest.externalReferenceSources) &&
-        Objects.equals(this.active, trialSearchRequest.active) &&
-        Objects.equals(this.contactDbIds, trialSearchRequest.contactDbIds) &&
-        Objects.equals(this.searchDateRangeEnd, trialSearchRequest.searchDateRangeEnd) &&
-        Objects.equals(this.searchDateRangeStart, trialSearchRequest.searchDateRangeStart) &&
-        Objects.equals(this.trialPUIs, trialSearchRequest.trialPUIs) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(commonCropNames, programDbIds, programNames, trialDbIds, trialNames, studyDbIds, studyNames, locationDbIds, locationNames, externalReferenceIDs, externalReferenceSources, active, contactDbIds, searchDateRangeEnd, searchDateRangeStart, trialPUIs, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TrialSearchRequest {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-    sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-    sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-    sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-    sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-    sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-    sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-    sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-    sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-    sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-    sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-    sb.append("    active: ").append(toIndentedString(active)).append("\n");
-    sb.append("    contactDbIds: ").append(toIndentedString(contactDbIds)).append("\n");
-    sb.append("    searchDateRangeEnd: ").append(toIndentedString(searchDateRangeEnd)).append("\n");
-    sb.append("    searchDateRangeStart: ").append(toIndentedString(searchDateRangeStart)).append("\n");
-    sb.append("    trialPUIs: ").append(toIndentedString(trialPUIs)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+	@JsonProperty("sortOrder")
+	private BrAPISortOrder sortOrder = null;
+
+	public BrAPISortBy getSortBy() {
+		return sortBy;
+	}
+
+	public void setSortBy(BrAPISortBy sortBy) {
+		this.sortBy = sortBy;
+	}
+
+	public BrAPISortOrder getSortOrder() {
+		return sortOrder;
+	}
+
+	public void setSortOrder(BrAPISortOrder sortOrder) {
+		this.sortOrder = sortOrder;
+	}
+
+	public BrAPITrialSearchRequest commonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+		return this;
+	}
+
+	public BrAPITrialSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
+		if (this.commonCropNames == null) {
+			this.commonCropNames = new ArrayList<String>();
+		}
+		this.commonCropNames.add(commonCropNamesItem);
+		return this;
+	}
+
+	/**
+	 * Common name for the crop which this program is for
+	 * 
+	 * @return commonCropNames
+	 **/
+
+	public List<String> getCommonCropNames() {
+		return commonCropNames;
+	}
+
+	public void setCommonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+	}
+
+	public BrAPITrialSearchRequest programDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+		return this;
+	}
+
+	public BrAPITrialSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
+		if (this.programDbIds == null) {
+			this.programDbIds = new ArrayList<String>();
+		}
+		this.programDbIds.add(programDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * A program identifier to search for
+	 * 
+	 * @return programDbIds
+	 **/
+
+	public List<String> getProgramDbIds() {
+		return programDbIds;
+	}
+
+	public void setProgramDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+	}
+
+	public BrAPITrialSearchRequest programNames(List<String> programNames) {
+		this.programNames = programNames;
+		return this;
+	}
+
+	public BrAPITrialSearchRequest addProgramNamesItem(String programNamesItem) {
+		if (this.programNames == null) {
+			this.programNames = new ArrayList<String>();
+		}
+		this.programNames.add(programNamesItem);
+		return this;
+	}
+
+	/**
+	 * A name of a program to search for
+	 * 
+	 * @return programNames
+	 **/
+
+	public List<String> getProgramNames() {
+		return programNames;
+	}
+
+	public void setProgramNames(List<String> programNames) {
+		this.programNames = programNames;
+	}
+
+	public BrAPITrialSearchRequest trialDbIds(List<String> trialDbIds) {
+		this.trialDbIds = trialDbIds;
+		return this;
+	}
+
+	public BrAPITrialSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
+		if (this.trialDbIds == null) {
+			this.trialDbIds = new ArrayList<String>();
+		}
+		this.trialDbIds.add(trialDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a trial to search for
+	 * 
+	 * @return trialDbIds
+	 **/
+
+	public List<String> getTrialDbIds() {
+		return trialDbIds;
+	}
+
+	public void setTrialDbIds(List<String> trialDbIds) {
+		this.trialDbIds = trialDbIds;
+	}
+
+	public BrAPITrialSearchRequest trialNames(List<String> trialNames) {
+		this.trialNames = trialNames;
+		return this;
+	}
+
+	public BrAPITrialSearchRequest addTrialNamesItem(String trialNamesItem) {
+		if (this.trialNames == null) {
+			this.trialNames = new ArrayList<String>();
+		}
+		this.trialNames.add(trialNamesItem);
+		return this;
+	}
+
+	/**
+	 * The human readable name of a trial to search for
+	 * 
+	 * @return trialNames
+	 **/
+
+	public List<String> getTrialNames() {
+		return trialNames;
+	}
+
+	public void setTrialNames(List<String> trialNames) {
+		this.trialNames = trialNames;
+	}
+
+	public BrAPITrialSearchRequest studyDbIds(List<String> studyDbIds) {
+		this.studyDbIds = studyDbIds;
+		return this;
+	}
+
+	public BrAPITrialSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
+		if (this.studyDbIds == null) {
+			this.studyDbIds = new ArrayList<String>();
+		}
+		this.studyDbIds.add(studyDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of study identifiers to search for
+	 * 
+	 * @return studyDbIds
+	 **/
+
+	public List<String> getStudyDbIds() {
+		return studyDbIds;
+	}
+
+	public void setStudyDbIds(List<String> studyDbIds) {
+		this.studyDbIds = studyDbIds;
+	}
+
+	public BrAPITrialSearchRequest studyNames(List<String> studyNames) {
+		this.studyNames = studyNames;
+		return this;
+	}
+
+	public BrAPITrialSearchRequest addStudyNamesItem(String studyNamesItem) {
+		if (this.studyNames == null) {
+			this.studyNames = new ArrayList<String>();
+		}
+		this.studyNames.add(studyNamesItem);
+		return this;
+	}
+
+	/**
+	 * List of study names to filter search results
+	 * 
+	 * @return studyNames
+	 **/
+
+	public List<String> getStudyNames() {
+		return studyNames;
+	}
+
+	public void setStudyNames(List<String> studyNames) {
+		this.studyNames = studyNames;
+	}
+
+	public BrAPITrialSearchRequest locationDbIds(List<String> locationDbIds) {
+		this.locationDbIds = locationDbIds;
+		return this;
+	}
+
+	public BrAPITrialSearchRequest addLocationDbIdsItem(String locationDbIdsItem) {
+		if (this.locationDbIds == null) {
+			this.locationDbIds = new ArrayList<String>();
+		}
+		this.locationDbIds.add(locationDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The location ids to search for
+	 * 
+	 * @return locationDbIds
+	 **/
+
+	public List<String> getLocationDbIds() {
+		return locationDbIds;
+	}
+
+	public void setLocationDbIds(List<String> locationDbIds) {
+		this.locationDbIds = locationDbIds;
+	}
+
+	public BrAPITrialSearchRequest locationNames(List<String> locationNames) {
+		this.locationNames = locationNames;
+		return this;
+	}
+
+	public BrAPITrialSearchRequest addLocationNamesItem(String locationNamesItem) {
+		if (this.locationNames == null) {
+			this.locationNames = new ArrayList<String>();
+		}
+		this.locationNames.add(locationNamesItem);
+		return this;
+	}
+
+	/**
+	 * A human readable names to search for
+	 * 
+	 * @return locationNames
+	 **/
+
+	public List<String> getLocationNames() {
+		return locationNames;
+	}
+
+	public void setLocationNames(List<String> locationNames) {
+		this.locationNames = locationNames;
+	}
+
+	public BrAPITrialSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+		return this;
+	}
+
+	public BrAPITrialSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
+		if (this.externalReferenceIds == null) {
+			this.externalReferenceIds = new ArrayList<String>();
+		}
+		this.externalReferenceIds.add(externalReferenceIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of external references for the trait to search for
+	 * 
+	 * @return externalReferenceIds
+	 **/
+
+	public List<String> getExternalReferenceIds() {
+		return externalReferenceIds;
+	}
+
+	public void setExternalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+	}
+
+	@Deprecated
+	public BrAPITrialSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+		return this;
+	}
+
+	@Deprecated
+	public BrAPITrialSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
+		if (this.externalReferenceIDs == null) {
+			this.externalReferenceIDs = new ArrayList<String>();
+		}
+		this.externalReferenceIDs.add(externalReferenceIDsItem);
+		return this;
+	}
+
+	/**
+	 * List of external references for the trait to search for
+	 * 
+	 * @return externalReferenceIDs
+	 **/
+
+	@Deprecated
+	public List<String> getExternalReferenceIDs() {
+		return externalReferenceIDs;
+	}
+
+	@Deprecated
+	public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+	}
+
+	public BrAPITrialSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+		return this;
+	}
+
+	public BrAPITrialSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
+		if (this.externalReferenceSources == null) {
+			this.externalReferenceSources = new ArrayList<String>();
+		}
+		this.externalReferenceSources.add(externalReferenceSourcesItem);
+		return this;
+	}
+
+	/**
+	 * List of external references sources for the trait to search for
+	 * 
+	 * @return externalReferenceSources
+	 **/
+
+	public List<String> getExternalReferenceSources() {
+		return externalReferenceSources;
+	}
+
+	public void setExternalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+	}
+
+	public BrAPITrialSearchRequest active(Boolean active) {
+		this.active = active;
+		return this;
+	}
+
+	/**
+	 * Is this trail currently active
+	 * 
+	 * @return active
+	 **/
+
+	public Boolean isActive() {
+		return active;
+	}
+
+	public void setActive(Boolean active) {
+		this.active = active;
+	}
+
+	public BrAPITrialSearchRequest contactDbIds(List<String> contactDbIds) {
+		this.contactDbIds = contactDbIds;
+		return this;
+	}
+
+	public BrAPITrialSearchRequest addContactDbIdsItem(String contactDbIdsItem) {
+		if (this.contactDbIds == null) {
+			this.contactDbIds = new ArrayList<String>();
+		}
+		this.contactDbIds.add(contactDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of contact entities associated with this trial
+	 * 
+	 * @return contactDbIds
+	 **/
+
+	public List<String> getContactDbIds() {
+		return contactDbIds;
+	}
+
+	public void setContactDbIds(List<String> contactDbIds) {
+		this.contactDbIds = contactDbIds;
+	}
+
+	public BrAPITrialSearchRequest searchDateRangeEnd(LocalDate searchDateRangeEnd) {
+		this.searchDateRangeEnd = searchDateRangeEnd;
+		return this;
+	}
+
+	/**
+	 * The end of the overlapping search date range. `searchDateRangeStart` must be
+	 * before `searchDateRangeEnd`. Return a Trial entity if any of the following
+	 * cases are true - `searchDateRangeStart` is before `trial.endDate` AND
+	 * `searchDateRangeEnd` is null - `searchDateRangeStart` is before
+	 * `trial.endDate` AND `searchDateRangeEnd` is after `trial.startDate` -
+	 * `searchDateRangeEnd` is after `trial.startDate` AND `searchDateRangeStart` is
+	 * null - `searchDateRangeEnd` is after `trial.startDate` AND
+	 * `searchDateRangeStart` is before `trial.endDate`
+	 * 
+	 * @return searchDateRangeEnd
+	 **/
+
+	public LocalDate getSearchDateRangeEnd() {
+		return searchDateRangeEnd;
+	}
+
+	public void setSearchDateRangeEnd(LocalDate searchDateRangeEnd) {
+		this.searchDateRangeEnd = searchDateRangeEnd;
+	}
+
+	public BrAPITrialSearchRequest searchDateRangeStart(LocalDate searchDateRangeStart) {
+		this.searchDateRangeStart = searchDateRangeStart;
+		return this;
+	}
+
+	/**
+	 * The start of the overlapping search date range. `searchDateRangeStart` must
+	 * be before `searchDateRangeEnd`. Return a Trial entity if any of the following
+	 * cases are true - `searchDateRangeStart` is before `trial.endDate` AND
+	 * `searchDateRangeEnd` is null - `searchDateRangeStart` is before
+	 * `trial.endDate` AND `searchDateRangeEnd` is after `trial.startDate` -
+	 * `searchDateRangeEnd` is after `trial.startDate` AND `searchDateRangeStart` is
+	 * null - `searchDateRangeEnd` is after `trial.startDate` AND
+	 * `searchDateRangeStart` is before `trial.endDate`
+	 * 
+	 * @return searchDateRangeStart
+	 **/
+
+	public LocalDate getSearchDateRangeStart() {
+		return searchDateRangeStart;
+	}
+
+	public void setSearchDateRangeStart(LocalDate searchDateRangeStart) {
+		this.searchDateRangeStart = searchDateRangeStart;
+	}
+
+	public BrAPITrialSearchRequest trialPUIs(List<String> trialPUIs) {
+		this.trialPUIs = trialPUIs;
+		return this;
+	}
+
+	public BrAPITrialSearchRequest addTrialPUIsItem(String trialPUIsItem) {
+		if (this.trialPUIs == null) {
+			this.trialPUIs = new ArrayList<String>();
+		}
+		this.trialPUIs.add(trialPUIsItem);
+		return this;
+	}
+
+	/**
+	 * A permanent identifier for a trial. Could be DOI or other URI formatted
+	 * identifier.
+	 * 
+	 * @return trialPUIs
+	 **/
+
+	public List<String> getTrialPUIs() {
+		return trialPUIs;
+	}
+
+	public void setTrialPUIs(List<String> trialPUIs) {
+		this.trialPUIs = trialPUIs;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPITrialSearchRequest trialSearchRequest = (BrAPITrialSearchRequest) o;
+		return Objects.equals(this.commonCropNames, trialSearchRequest.commonCropNames)
+				&& Objects.equals(this.programDbIds, trialSearchRequest.programDbIds)
+				&& Objects.equals(this.programNames, trialSearchRequest.programNames)
+				&& Objects.equals(this.trialDbIds, trialSearchRequest.trialDbIds)
+				&& Objects.equals(this.trialNames, trialSearchRequest.trialNames)
+				&& Objects.equals(this.studyDbIds, trialSearchRequest.studyDbIds)
+				&& Objects.equals(this.studyNames, trialSearchRequest.studyNames)
+				&& Objects.equals(this.locationDbIds, trialSearchRequest.locationDbIds)
+				&& Objects.equals(this.locationNames, trialSearchRequest.locationNames)
+				&& Objects.equals(this.externalReferenceIds, trialSearchRequest.externalReferenceIds)
+				&& Objects.equals(this.externalReferenceIDs, trialSearchRequest.externalReferenceIDs)
+				&& Objects.equals(this.externalReferenceSources, trialSearchRequest.externalReferenceSources)
+				&& Objects.equals(this.active, trialSearchRequest.active)
+				&& Objects.equals(this.contactDbIds, trialSearchRequest.contactDbIds)
+				&& Objects.equals(this.searchDateRangeEnd, trialSearchRequest.searchDateRangeEnd)
+				&& Objects.equals(this.searchDateRangeStart, trialSearchRequest.searchDateRangeStart)
+				&& Objects.equals(this.trialPUIs, trialSearchRequest.trialPUIs) && super.equals(o);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(commonCropNames, programDbIds, programNames, trialDbIds, trialNames, studyDbIds, studyNames,
+				locationDbIds, locationNames, externalReferenceIds, externalReferenceIDs, externalReferenceSources,
+				active, contactDbIds, searchDateRangeEnd, searchDateRangeStart, trialPUIs, super.hashCode());
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class TrialSearchRequest {\n");
+		sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+		sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
+		sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
+		sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
+		sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
+		sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
+		sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
+		sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
+		sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
+		sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
+		sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
+		sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
+		sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
+		sb.append("    active: ").append(toIndentedString(active)).append("\n");
+		sb.append("    contactDbIds: ").append(toIndentedString(contactDbIds)).append("\n");
+		sb.append("    searchDateRangeEnd: ").append(toIndentedString(searchDateRangeEnd)).append("\n");
+		sb.append("    searchDateRangeStart: ").append(toIndentedString(searchDateRangeStart)).append("\n");
+		sb.append("    trialPUIs: ").append(toIndentedString(trialPUIs)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 }

From 5b4427ee9d161c97204faa21fbe7b843c63b8262 Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Fri, 18 Aug 2023 16:46:37 -0400
Subject: [PATCH 16/28] fixes #145, #146, #163, #164, #165, #166, #96, #97,
 #98, #99. Dependent on #199

---
 .../queryParams/core/ListQueryParams.java     |   2 +
 .../queryParams/core/SeasonQueryParams.java   |   1 +
 .../client/v2/modules/core/ListsApiTest.java  | 180 ++--
 .../v2/modules/core/SeasonsApiTest.java       | 122 +--
 .../org/brapi/v2/model/core/BrAPISeason.java  | 221 ++---
 .../core/request/BrAPIListSearchRequest.java  | 921 ++++++++++--------
 6 files changed, 789 insertions(+), 658 deletions(-)

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ListQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ListQueryParams.java
index 84fa90ba..cf6b9a5a 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ListQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ListQueryParams.java
@@ -35,6 +35,8 @@
 public class ListQueryParams extends BrAPIQueryParams {
 
     private BrAPIListTypes listType;
+    private String commonCropName;
+    private String programDbId;
     private String listName;
     private String listDbId;
     private String listSource;
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/SeasonQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/SeasonQueryParams.java
index 11e900fe..5ffa40b5 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/SeasonQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/SeasonQueryParams.java
@@ -34,6 +34,7 @@ public class SeasonQueryParams extends BrAPIQueryParams {
 
     private String seasonDbId;
     private String season;
+    private String seasonName;
     private String year;
 
 }
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/ListsApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/ListsApiTest.java
index 71d6efe2..4ec4a44c 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/ListsApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/ListsApiTest.java
@@ -26,6 +26,11 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -36,76 +41,107 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class ListsApiTest extends BrAPIClientTest {
 
-    private final ListsApi api = new ListsApi(this.apiClient);
-    private String listDbId = "list1";
-
-    @Test
-    public void listsGetTest() throws ApiException {        
-        ListQueryParams queryParams = new ListQueryParams();
-        ApiResponse<BrAPIListsListResponse> response = api.listsGet(queryParams);
-
-        // TODO: test validations
-    }
-
-    @Test
-    public void listsPostTest() throws ApiException {
-        List<BrAPIListNewRequest> body = Arrays.asList(new BrAPIListNewRequest());
-        
-        ApiResponse<BrAPIListsListResponse> response = api.listsPost(body);
-
-        this.listDbId = response.getBody().getResult().getData().get(0).getListDbId();
-        // TODO: test validations
-    }
-
-    @Test
-    public void listsListDbIdGetTest() throws ApiException {
-        String listDbId = this.listDbId;
-        
-        ApiResponse<BrAPIListsSingleResponse> response = api.listsListDbIdGet(listDbId);
-
-        // TODO: test validations
-    }
-
-    @Test
-    public void listsListDbIdItemsPostTest() throws ApiException {
-        String listDbId = this.listDbId;
-        List<String> body = Arrays.asList("one", "two", "three");
-        
-        ApiResponse<BrAPIListResponse> response = api.listsListDbIdItemsPost(listDbId, body);
-
-        // TODO: test validations
-    }
-
-    @Test
-    public void listsListDbIdPutTest() throws ApiException {
-        String listDbId = this.listDbId;
-        BrAPIListNewRequest body = new BrAPIListNewRequest();
-        body.setListName("JUnit test");
-        
-        ApiResponse<BrAPIListsSingleResponse> response = api.listsListDbIdPut(listDbId, body);
-
-        // TODO: test validations
-    }
-
-    @Test
-    public void searchListsPostTest() throws ApiException {
-        BrAPIListSearchRequest body = new BrAPIListSearchRequest();
-
-        ApiResponse<Pair<Optional<BrAPIListsListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api.searchListsPost(body);
-
-        // TODO: test validations
-    }
-
-    //@Test
-    //This test is currently unsupported by the BrAPI Test Server
-    public void searchListsSearchResultsDbIdGetTest() throws ApiException {
-        String searchResultsDbId = "test";
-        Integer page = null;
-        Integer pageSize = null;
-
-        ApiResponse<Pair<Optional<BrAPIListsListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response =
-                api.searchListsSearchResultsDbIdGet(searchResultsDbId, page, pageSize);
-
-        // TODO: test validations
-    }
+	private final ListsApi api = new ListsApi(this.apiClient);
+
+	@Test
+	public void listsGetTest() throws ApiException {
+		String listDbId = "list1";
+		ListQueryParams queryParams = new ListQueryParams()
+				.listDbId(listDbId);
+		ApiResponse<BrAPIListsListResponse> response = api.listsGet(queryParams);
+
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(listDbId, response.getBody().getResult().getData().get(0).getListDbId());
+	}
+
+	@Test
+	public void listsPostTest() throws ApiException {
+		BrAPIListNewRequest list = new BrAPIListNewRequest();
+		list.listName("new list name");
+		List<BrAPIListNewRequest> body = Arrays.asList(list);
+
+		ApiResponse<BrAPIListsListResponse> response = api.listsPost(body);
+
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(list.getListName(), response.getBody().getResult().getData().get(0).getListName());
+		assertNotNull(response.getBody().getResult().getData().get(0).getListDbId());
+	}
+
+	@Test
+	public void listsListDbIdGetTest() throws ApiException {
+		String listDbId = "list1";
+
+		ApiResponse<BrAPIListsSingleResponse> response = api.listsListDbIdGet(listDbId);
+
+		assertEquals(listDbId, response.getBody().getResult().getListDbId());
+	}
+
+	@Test
+	public void listsListDbIdItemsPostTest() throws ApiException {
+		String listDbId = "list1";
+		List<String> body = Arrays.asList("one", "two", "three");
+
+		ApiResponse<BrAPIListResponse> response = api.listsListDbIdItemsPost(listDbId, body);
+		
+		// 3 add here, plus 3 from loaded SQL, expecting 6 items total
+		assertEquals(6, response.getBody().getResult().getData().size());
+		assertEquals(6, response.getBody().getResult().getListSize());
+	}
+
+	@Test
+	public void listsListDbIdPutTest() throws ApiException {
+		String listDbId = "list1";
+		BrAPIListNewRequest body = new BrAPIListNewRequest();
+		body.setListName("JUnit test");
+
+		ApiResponse<BrAPIListsSingleResponse> response = api.listsListDbIdPut(listDbId, body);
+
+		assertEquals(listDbId, response.getBody().getResult().getListDbId());
+		assertEquals(body.getListName(), response.getBody().getResult().getListName());
+	}
+
+	@Test
+	public void searchListsPostTest() throws ApiException {
+		BrAPIListSearchRequest baseRequest = new BrAPIListSearchRequest()
+				.addListDbIdsItem("list1")
+				.addListDbIdsItem("list2");
+
+		ApiResponse<Pair<Optional<BrAPIListsListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = this.api
+				.searchListsPost(baseRequest);
+		Optional<BrAPIListsListResponse> listResponse = response.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+		// only results are returned
+		assertTrue(listResponse.isPresent());
+		assertFalse(searchIdResponse.isPresent());
+
+		assertEquals(2, listResponse.get().getResult().getData().size(),
+				"unexpected number of pedigree nodes returned");
+	}
+
+	@Test
+	public void searchListsSearchResultsDbIdGetTest() throws ApiException {
+		BrAPIListSearchRequest baseRequest = new BrAPIListSearchRequest().addListDbIdsItem("list1")
+				.addListDbIdsItem("list1").addListDbIdsItem("list1").addListDbIdsItem("list2")
+				.addListDbIdsItem("list2");
+
+		ApiResponse<Pair<Optional<BrAPIListsListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = this.api
+				.searchListsPost(baseRequest);
+		Optional<BrAPIListsListResponse> listResponse = response.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+		// only search ID is returned
+		assertFalse(listResponse.isPresent());
+		assertTrue(searchIdResponse.isPresent());
+
+		// Get results from search ID
+		ApiResponse<Pair<Optional<BrAPIListsListResponse>, Optional<BrAPIAcceptedSearchResponse>>> searchResponse = this.api
+				.searchListsSearchResultsDbIdGet(searchIdResponse.get().getResult().getSearchResultsDbId(), 0, 10);
+		Optional<BrAPIListsListResponse> listResponse2 = searchResponse.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse2 = searchResponse.getBody().getRight();
+		// only results are returned
+		assertTrue(listResponse2.isPresent());
+		assertFalse(searchIdResponse2.isPresent());
+
+		assertEquals(2, listResponse2.get().getResult().getData().size(),
+				"unexpected number of pedigree nodes returned");
+	}
 }
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/SeasonsApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/SeasonsApiTest.java
index e2ad46d4..0103e2f9 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/SeasonsApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/SeasonsApiTest.java
@@ -22,8 +22,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.Arrays;
 import java.util.List;
 
@@ -35,78 +35,48 @@ public class SeasonsApiTest extends BrAPIClientTest {
 
     private final SeasonsApi api = new SeasonsApi(this.apiClient);
 
-    /**
-     * Get the Seasons
-     *
-     * Call to retrieve all seasons in the database.  A season is made of 2 parts; the primary year and a term which defines a segment of the year.  This could be a traditional season, like \&quot;Spring\&quot; or \&quot;Summer\&quot; or this could be a month, like  \&quot;May\&quot; or \&quot;June\&quot; or this could be an arbitrary season name which is meaningful to the breeding  program like \&quot;PlantingTime_3\&quot; or \&quot;Season E\&quot;
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void seasonsGetTest() throws ApiException {
-        String seasonDbId = null;
-        String season = null;
-        Integer year = null;
-        Integer page = null;
-        Integer pageSize = null;
-        
-        SeasonQueryParams queryParams = new SeasonQueryParams();
-        ApiResponse<BrAPISeasonListResponse> response = api.seasonsGet(queryParams);
-
-        // TODO: test validations
-    }
-    /**
-     * POST new Seasons
-     *
-     * Add new season entries to the database
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void seasonsPostTest() throws ApiException {
-        List<BrAPISeason> body = Arrays.asList(new BrAPISeason());
-        
-        ApiResponse<BrAPISeasonListResponse> response = api.seasonsPost(body);
-
-        // TODO: test validations
-    }
-    /**
-     * Get the a single Season
-     *
-     * Get the a single Season
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void seasonsSeasonDbIdGetTest() throws ApiException {
-        String seasonDbId = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPISeasonSingleResponse> response = api.seasonsSeasonDbIdGet(seasonDbId);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Update existing Seasons
-     *
-     * Update existing Seasons
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void seasonsSeasonDbIdPutTest() throws ApiException {
-        String seasonDbId = null;
-        BrAPISeason body = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPISeasonSingleResponse> response = api.seasonsSeasonDbIdPut(seasonDbId, body);
-		});
-
-        // TODO: test validations
-    }
+	@Test
+	public void seasonsGetTest() throws ApiException {
+		String seasonDbId = "fall_2011";
+		SeasonQueryParams queryParams = new SeasonQueryParams()
+				.seasonDbId(seasonDbId);
+		ApiResponse<BrAPISeasonListResponse> response = api.seasonsGet(queryParams);
+
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(seasonDbId, response.getBody().getResult().getData().get(0).getSeasonDbId());
+	}
+
+	@Test
+	public void seasonsPostTest() throws ApiException {
+		BrAPISeason season = new BrAPISeason();
+		season.seasonName("new season name");
+		List<BrAPISeason> body = Arrays.asList(season);
+
+		ApiResponse<BrAPISeasonListResponse> response = api.seasonsPost(body);
+
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(season.getSeasonName(), response.getBody().getResult().getData().get(0).getSeasonName());
+		assertNotNull(response.getBody().getResult().getData().get(0).getSeasonDbId());
+	}
+
+	@Test
+	public void seasonsSeasonDbIdGetTest() throws ApiException {
+		String seasonDbId = "fall_2011";
+
+		ApiResponse<BrAPISeasonSingleResponse> response = api.seasonsSeasonDbIdGet(seasonDbId);
+
+		assertEquals(seasonDbId, response.getBody().getResult().getSeasonDbId());
+	}
+
+	@Test
+	public void seasonsSeasonDbIdPutTest() throws ApiException {
+		String seasonDbId = "fall_2011";
+		BrAPISeason body = new BrAPISeason();
+		body.setSeasonName("JUnit test");
+
+		ApiResponse<BrAPISeasonSingleResponse> response = api.seasonsSeasonDbIdPut(seasonDbId, body);
+
+		assertEquals(seasonDbId, response.getBody().getResult().getSeasonDbId());
+		assertEquals(body.getSeasonName(), response.getBody().getResult().getSeasonName());
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPISeason.java b/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPISeason.java
index 4a39be12..c226519f 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPISeason.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPISeason.java
@@ -3,121 +3,116 @@
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
-
-
-
 /**
  * Season
  */
 
-
-public class BrAPISeason   {
-  @JsonProperty("seasonDbId")
-  private String seasonDbId = null;
-
-  @JsonProperty("seasonName")
-  private String seasonName = null;
-
-  @JsonProperty("year")
-  private Integer year = null;
-
-  public BrAPISeason seasonDbId(String seasonDbId) {
-    this.seasonDbId = seasonDbId;
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies a season. For backward compatibility it can be a string like '2012', '1957-2004'
-   * @return seasonDbId
-  **/
-  
-    public String getSeasonDbId() {
-    return seasonDbId;
-  }
-
-  public void setSeasonDbId(String seasonDbId) {
-    this.seasonDbId = seasonDbId;
-  }
-
-  public BrAPISeason seasonName(String seasonName) {
-    this.seasonName = seasonName;
-    return this;
-  }
-
-  /**
-   * Name of the season. ex. 'Spring', 'Q2', 'Season A', etc.
-   * @return seasonName
-  **/
-  
-  
-    public String getSeasonName() {
-    return seasonName;
-  }
-
-  public void setSeasonName(String seasonName) {
-    this.seasonName = seasonName;
-  }
-
-  public BrAPISeason year(Integer year) {
-    this.year = year;
-    return this;
-  }
-
-  /**
-   * The 4 digit year of the season.
-   * @return year
-  **/
-  
-  
-    public Integer getYear() {
-    return year;
-  }
-
-  public void setYear(Integer year) {
-    this.year = year;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPISeason season = (BrAPISeason) o;
-    return Objects.equals(this.seasonDbId, season.seasonDbId) &&
-        Objects.equals(this.seasonName, season.seasonName) &&
-        Objects.equals(this.year, season.year);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(seasonDbId, seasonName, year);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Season {\n");
-    
-    sb.append("    seasonDbId: ").append(toIndentedString(seasonDbId)).append("\n");
-    sb.append("    seasonName: ").append(toIndentedString(seasonName)).append("\n");
-    sb.append("    year: ").append(toIndentedString(year)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+public class BrAPISeason {
+	@JsonProperty("seasonDbId")
+	private String seasonDbId = null;
+
+	@JsonProperty("seasonName")
+	private String seasonName = null;
+
+	@JsonProperty("year")
+	private Integer year = null;
+
+	public BrAPISeason seasonDbId(String seasonDbId) {
+		this.seasonDbId = seasonDbId;
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a season. For backward compatibility it can
+	 * be a string like '2012', '1957-2004'
+	 * 
+	 * @return seasonDbId
+	 **/
+
+	public String getSeasonDbId() {
+		return seasonDbId;
+	}
+
+	public void setSeasonDbId(String seasonDbId) {
+		this.seasonDbId = seasonDbId;
+	}
+
+	public BrAPISeason seasonName(String seasonName) {
+		this.seasonName = seasonName;
+		return this;
+	}
+
+	/**
+	 * Name of the season. ex. 'Spring', 'Q2', 'Season A', etc.
+	 * 
+	 * @return seasonName
+	 **/
+
+	public String getSeasonName() {
+		return seasonName;
+	}
+
+	public void setSeasonName(String seasonName) {
+		this.seasonName = seasonName;
+	}
+
+	public BrAPISeason year(Integer year) {
+		this.year = year;
+		return this;
+	}
+
+	/**
+	 * The 4 digit year of the season.
+	 * 
+	 * @return year
+	 **/
+
+	public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPISeason season = (BrAPISeason) o;
+		return Objects.equals(this.seasonDbId, season.seasonDbId) && Objects.equals(this.seasonName, season.seasonName)
+				&& Objects.equals(this.year, season.year);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(seasonDbId, seasonName, year);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class Season {\n");
+
+		sb.append("    seasonDbId: ").append(toIndentedString(seasonDbId)).append("\n");
+		sb.append("    seasonName: ").append(toIndentedString(seasonName)).append("\n");
+		sb.append("    year: ").append(toIndentedString(year)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPIListSearchRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPIListSearchRequest.java
index d28b46ea..d3ea7b01 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPIListSearchRequest.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPIListSearchRequest.java
@@ -7,8 +7,6 @@
 import java.util.List;
 import java.time.OffsetDateTime;
 
-import javax.validation.Valid;
-
 import org.brapi.v2.model.BrAPISearchRequestParametersPaging;
 import org.brapi.v2.model.core.BrAPIListTypes;
 
@@ -16,399 +14,528 @@
  * ListSearchRequest
  */
 
-
-public class BrAPIListSearchRequest extends BrAPISearchRequestParametersPaging  {
-  @JsonProperty("externalReferenceIDs")
-  @Valid
-  private List<String> externalReferenceIDs = null;
-
-  @JsonProperty("externalReferenceSources")
-  @Valid
-  private List<String> externalReferenceSources = null;
-
-  @JsonProperty("dateCreatedRangeEnd")
-  private OffsetDateTime dateCreatedRangeEnd = null;
-
-  @JsonProperty("dateCreatedRangeStart")
-  private OffsetDateTime dateCreatedRangeStart = null;
-
-  @JsonProperty("dateModifiedRangeEnd")
-  private OffsetDateTime dateModifiedRangeEnd = null;
-
-  @JsonProperty("dateModifiedRangeStart")
-  private OffsetDateTime dateModifiedRangeStart = null;
-
-  @JsonProperty("listDbIds")
-  @Valid
-  private List<String> listDbIds = null;
-
-  @JsonProperty("listNames")
-  @Valid
-  private List<String> listNames = null;
-
-  @JsonProperty("listOwnerNames")
-  @Valid
-  private List<String> listOwnerNames = null;
-
-  @JsonProperty("listOwnerPersonDbIds")
-  @Valid
-  private List<String> listOwnerPersonDbIds = null;
-
-  @JsonProperty("listSources")
-  @Valid
-  private List<String> listSources = null;
-
-  @JsonProperty("listType")
-  private BrAPIListTypes listType = null;
-
-  public BrAPIListSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-    return this;
-  }
-
-  public BrAPIListSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-    if (this.externalReferenceIDs == null) {
-      this.externalReferenceIDs = new ArrayList<String>();
-    }
-    this.externalReferenceIDs.add(externalReferenceIDsItem);
-    return this;
-  }
-
-  /**
-   * List of external references for the trait to search for
-   * @return externalReferenceIDs
-  **/
-  
-  
-    public List<String> getExternalReferenceIDs() {
-    return externalReferenceIDs;
-  }
-
-  public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-  }
-
-  public BrAPIListSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-    return this;
-  }
-
-  public BrAPIListSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-    if (this.externalReferenceSources == null) {
-      this.externalReferenceSources = new ArrayList<String>();
-    }
-    this.externalReferenceSources.add(externalReferenceSourcesItem);
-    return this;
-  }
-
-  /**
-   * List of external references sources for the trait to search for
-   * @return externalReferenceSources
-  **/
-  
-  
-    public List<String> getExternalReferenceSources() {
-    return externalReferenceSources;
-  }
-
-  public void setExternalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-  }
-
-  public BrAPIListSearchRequest dateCreatedRangeEnd(OffsetDateTime dateCreatedRangeEnd) {
-    this.dateCreatedRangeEnd = dateCreatedRangeEnd;
-    return this;
-  }
-
-  /**
-   * Get dateCreatedRangeEnd
-   * @return dateCreatedRangeEnd
-  **/
-  
-  
-    @Valid
-    public OffsetDateTime getDateCreatedRangeEnd() {
-    return dateCreatedRangeEnd;
-  }
-
-  public void setDateCreatedRangeEnd(OffsetDateTime dateCreatedRangeEnd) {
-    this.dateCreatedRangeEnd = dateCreatedRangeEnd;
-  }
-
-  public BrAPIListSearchRequest dateCreatedRangeStart(OffsetDateTime dateCreatedRangeStart) {
-    this.dateCreatedRangeStart = dateCreatedRangeStart;
-    return this;
-  }
-
-  /**
-   * Get dateCreatedRangeStart
-   * @return dateCreatedRangeStart
-  **/
-  
-  
-    @Valid
-    public OffsetDateTime getDateCreatedRangeStart() {
-    return dateCreatedRangeStart;
-  }
-
-  public void setDateCreatedRangeStart(OffsetDateTime dateCreatedRangeStart) {
-    this.dateCreatedRangeStart = dateCreatedRangeStart;
-  }
-
-  public BrAPIListSearchRequest dateModifiedRangeEnd(OffsetDateTime dateModifiedRangeEnd) {
-    this.dateModifiedRangeEnd = dateModifiedRangeEnd;
-    return this;
-  }
-
-  /**
-   * Get dateModifiedRangeEnd
-   * @return dateModifiedRangeEnd
-  **/
-  
-  
-    @Valid
-    public OffsetDateTime getDateModifiedRangeEnd() {
-    return dateModifiedRangeEnd;
-  }
-
-  public void setDateModifiedRangeEnd(OffsetDateTime dateModifiedRangeEnd) {
-    this.dateModifiedRangeEnd = dateModifiedRangeEnd;
-  }
-
-  public BrAPIListSearchRequest dateModifiedRangeStart(OffsetDateTime dateModifiedRangeStart) {
-    this.dateModifiedRangeStart = dateModifiedRangeStart;
-    return this;
-  }
-
-  /**
-   * Get dateModifiedRangeStart
-   * @return dateModifiedRangeStart
-  **/
-  
-  
-    @Valid
-    public OffsetDateTime getDateModifiedRangeStart() {
-    return dateModifiedRangeStart;
-  }
-
-  public void setDateModifiedRangeStart(OffsetDateTime dateModifiedRangeStart) {
-    this.dateModifiedRangeStart = dateModifiedRangeStart;
-  }
-
-  public BrAPIListSearchRequest listDbIds(List<String> listDbIds) {
-    this.listDbIds = listDbIds;
-    return this;
-  }
-
-  public BrAPIListSearchRequest addListDbIdsItem(String listDbIdsItem) {
-    if (this.listDbIds == null) {
-      this.listDbIds = new ArrayList<String>();
-    }
-    this.listDbIds.add(listDbIdsItem);
-    return this;
-  }
-
-  /**
-   * Get listDbIds
-   * @return listDbIds
-  **/
-  
-  
-    public List<String> getListDbIds() {
-    return listDbIds;
-  }
-
-  public void setListDbIds(List<String> listDbIds) {
-    this.listDbIds = listDbIds;
-  }
-
-  public BrAPIListSearchRequest listNames(List<String> listNames) {
-    this.listNames = listNames;
-    return this;
-  }
-
-  public BrAPIListSearchRequest addListNamesItem(String listNamesItem) {
-    if (this.listNames == null) {
-      this.listNames = new ArrayList<String>();
-    }
-    this.listNames.add(listNamesItem);
-    return this;
-  }
-
-  /**
-   * Get listNames
-   * @return listNames
-  **/
-  
-  
-    public List<String> getListNames() {
-    return listNames;
-  }
-
-  public void setListNames(List<String> listNames) {
-    this.listNames = listNames;
-  }
-
-  public BrAPIListSearchRequest listOwnerNames(List<String> listOwnerNames) {
-    this.listOwnerNames = listOwnerNames;
-    return this;
-  }
-
-  public BrAPIListSearchRequest addListOwnerNamesItem(String listOwnerNamesItem) {
-    if (this.listOwnerNames == null) {
-      this.listOwnerNames = new ArrayList<String>();
-    }
-    this.listOwnerNames.add(listOwnerNamesItem);
-    return this;
-  }
-
-  /**
-   * Get listOwnerNames
-   * @return listOwnerNames
-  **/
-  
-  
-    public List<String> getListOwnerNames() {
-    return listOwnerNames;
-  }
-
-  public void setListOwnerNames(List<String> listOwnerNames) {
-    this.listOwnerNames = listOwnerNames;
-  }
-
-  public BrAPIListSearchRequest listOwnerPersonDbIds(List<String> listOwnerPersonDbIds) {
-    this.listOwnerPersonDbIds = listOwnerPersonDbIds;
-    return this;
-  }
-
-  public BrAPIListSearchRequest addListOwnerPersonDbIdsItem(String listOwnerPersonDbIdsItem) {
-    if (this.listOwnerPersonDbIds == null) {
-      this.listOwnerPersonDbIds = new ArrayList<String>();
-    }
-    this.listOwnerPersonDbIds.add(listOwnerPersonDbIdsItem);
-    return this;
-  }
-
-  /**
-   * Get listOwnerPersonDbIds
-   * @return listOwnerPersonDbIds
-  **/
-  
-  
-    public List<String> getListOwnerPersonDbIds() {
-    return listOwnerPersonDbIds;
-  }
-
-  public void setListOwnerPersonDbIds(List<String> listOwnerPersonDbIds) {
-    this.listOwnerPersonDbIds = listOwnerPersonDbIds;
-  }
-
-  public BrAPIListSearchRequest listSources(List<String> listSources) {
-    this.listSources = listSources;
-    return this;
-  }
-
-  public BrAPIListSearchRequest addListSourcesItem(String listSourcesItem) {
-    if (this.listSources == null) {
-      this.listSources = new ArrayList<String>();
-    }
-    this.listSources.add(listSourcesItem);
-    return this;
-  }
-
-  /**
-   * Get listSources
-   * @return listSources
-  **/
-  
-  
-    public List<String> getListSources() {
-    return listSources;
-  }
-
-  public void setListSources(List<String> listSources) {
-    this.listSources = listSources;
-  }
-
-  public BrAPIListSearchRequest listType(BrAPIListTypes listType) {
-    this.listType = listType;
-    return this;
-  }
-
-  /**
-   * Get listType
-   * @return listType
-  **/
-  
-  
-    @Valid
-    public BrAPIListTypes getListType() {
-    return listType;
-  }
-
-  public void setListType(BrAPIListTypes listType) {
-    this.listType = listType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIListSearchRequest listSearchRequest = (BrAPIListSearchRequest) o;
-    return Objects.equals(this.externalReferenceIDs, listSearchRequest.externalReferenceIDs) &&
-        Objects.equals(this.externalReferenceSources, listSearchRequest.externalReferenceSources) &&
-        Objects.equals(this.dateCreatedRangeEnd, listSearchRequest.dateCreatedRangeEnd) &&
-        Objects.equals(this.dateCreatedRangeStart, listSearchRequest.dateCreatedRangeStart) &&
-        Objects.equals(this.dateModifiedRangeEnd, listSearchRequest.dateModifiedRangeEnd) &&
-        Objects.equals(this.dateModifiedRangeStart, listSearchRequest.dateModifiedRangeStart) &&
-        Objects.equals(this.listDbIds, listSearchRequest.listDbIds) &&
-        Objects.equals(this.listNames, listSearchRequest.listNames) &&
-        Objects.equals(this.listOwnerNames, listSearchRequest.listOwnerNames) &&
-        Objects.equals(this.listOwnerPersonDbIds, listSearchRequest.listOwnerPersonDbIds) &&
-        Objects.equals(this.listSources, listSearchRequest.listSources) &&
-        Objects.equals(this.listType, listSearchRequest.listType) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(externalReferenceIDs, externalReferenceSources, dateCreatedRangeEnd, dateCreatedRangeStart, dateModifiedRangeEnd, dateModifiedRangeStart, listDbIds, listNames, listOwnerNames, listOwnerPersonDbIds, listSources, listType, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ListSearchRequest {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-    sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-    sb.append("    dateCreatedRangeEnd: ").append(toIndentedString(dateCreatedRangeEnd)).append("\n");
-    sb.append("    dateCreatedRangeStart: ").append(toIndentedString(dateCreatedRangeStart)).append("\n");
-    sb.append("    dateModifiedRangeEnd: ").append(toIndentedString(dateModifiedRangeEnd)).append("\n");
-    sb.append("    dateModifiedRangeStart: ").append(toIndentedString(dateModifiedRangeStart)).append("\n");
-    sb.append("    listDbIds: ").append(toIndentedString(listDbIds)).append("\n");
-    sb.append("    listNames: ").append(toIndentedString(listNames)).append("\n");
-    sb.append("    listOwnerNames: ").append(toIndentedString(listOwnerNames)).append("\n");
-    sb.append("    listOwnerPersonDbIds: ").append(toIndentedString(listOwnerPersonDbIds)).append("\n");
-    sb.append("    listSources: ").append(toIndentedString(listSources)).append("\n");
-    sb.append("    listType: ").append(toIndentedString(listType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+public class BrAPIListSearchRequest extends BrAPISearchRequestParametersPaging {
+	@JsonProperty("commonCropNames")
+	private List<String> commonCropNames = null;
+
+	@JsonProperty("externalReferenceIds")
+	private List<String> externalReferenceIds = null;
+
+	@Deprecated
+	@JsonProperty("externalReferenceIDs")
+	private List<String> externalReferenceIDs = null;
+
+	@JsonProperty("externalReferenceSources")
+	private List<String> externalReferenceSources = null;
+
+	@JsonProperty("dateCreatedRangeEnd")
+	private OffsetDateTime dateCreatedRangeEnd = null;
+
+	@JsonProperty("dateCreatedRangeStart")
+	private OffsetDateTime dateCreatedRangeStart = null;
+
+	@JsonProperty("dateModifiedRangeEnd")
+	private OffsetDateTime dateModifiedRangeEnd = null;
+
+	@JsonProperty("dateModifiedRangeStart")
+	private OffsetDateTime dateModifiedRangeStart = null;
+
+	@JsonProperty("listDbIds")
+	private List<String> listDbIds = null;
+
+	@JsonProperty("listNames")
+	private List<String> listNames = null;
+
+	@JsonProperty("listOwnerNames")
+	private List<String> listOwnerNames = null;
+
+	@JsonProperty("listOwnerPersonDbIds")
+	private List<String> listOwnerPersonDbIds = null;
+
+	@JsonProperty("listSources")
+	private List<String> listSources = null;
+
+	@JsonProperty("listType")
+	private BrAPIListTypes listType = null;
+
+	@JsonProperty("programDbIds")
+	private List<String> programDbIds = null;
+
+	@JsonProperty("programNames")
+	private List<String> programNames = null;
+
+	public BrAPIListSearchRequest commonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+		return this;
+	}
+
+	public BrAPIListSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
+		if (this.commonCropNames == null) {
+			this.commonCropNames = new ArrayList<String>();
+		}
+		this.commonCropNames.add(commonCropNamesItem);
+		return this;
+	}
+
+	/**
+	 * The BrAPI Common Crop Name is the simple, generalized, widely accepted name
+	 * of the organism being researched. It is most often used in multi-crop systems
+	 * where digital resources need to be divided at a high level. Things like
+	 * &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of
+	 * common crop names. Use this parameter to only return results associated with
+	 * the given crops. Use &#x60;GET /commoncropnames&#x60; to find the list of
+	 * available crops on a server.
+	 *
+	 * @return commonCropNames
+	 **/
+	public List<String> getCommonCropNames() {
+		return commonCropNames;
+	}
+
+	public void setCommonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+	}
+
+	public BrAPIListSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+		return this;
+	}
+
+	public BrAPIListSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
+		if (this.externalReferenceIds == null) {
+			this.externalReferenceIds = new ArrayList<String>();
+		}
+		this.externalReferenceIds.add(externalReferenceIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of external references for the trait to search for
+	 * 
+	 * @return externalReferenceIds
+	 **/
+
+	public List<String> getExternalReferenceIds() {
+		return externalReferenceIds;
+	}
+
+	public void setExternalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+	}
+
+	@Deprecated
+	public BrAPIListSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+		return this;
+	}
+
+	@Deprecated
+	public BrAPIListSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
+		if (this.externalReferenceIDs == null) {
+			this.externalReferenceIDs = new ArrayList<String>();
+		}
+		this.externalReferenceIDs.add(externalReferenceIDsItem);
+		return this;
+	}
+
+	/**
+	 * List of external references for the trait to search for
+	 * 
+	 * @return externalReferenceIDs
+	 **/
+
+	@Deprecated
+	public List<String> getExternalReferenceIDs() {
+		return externalReferenceIDs;
+	}
+
+	@Deprecated
+	public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+	}
+
+	public BrAPIListSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+		return this;
+	}
+
+	public BrAPIListSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
+		if (this.externalReferenceSources == null) {
+			this.externalReferenceSources = new ArrayList<String>();
+		}
+		this.externalReferenceSources.add(externalReferenceSourcesItem);
+		return this;
+	}
+
+	/**
+	 * List of external references sources for the trait to search for
+	 * 
+	 * @return externalReferenceSources
+	 **/
+
+	public List<String> getExternalReferenceSources() {
+		return externalReferenceSources;
+	}
+
+	public void setExternalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+	}
+
+	public BrAPIListSearchRequest dateCreatedRangeEnd(OffsetDateTime dateCreatedRangeEnd) {
+		this.dateCreatedRangeEnd = dateCreatedRangeEnd;
+		return this;
+	}
+
+	/**
+	 * Get dateCreatedRangeEnd
+	 * 
+	 * @return dateCreatedRangeEnd
+	 **/
+
+	public OffsetDateTime getDateCreatedRangeEnd() {
+		return dateCreatedRangeEnd;
+	}
+
+	public void setDateCreatedRangeEnd(OffsetDateTime dateCreatedRangeEnd) {
+		this.dateCreatedRangeEnd = dateCreatedRangeEnd;
+	}
+
+	public BrAPIListSearchRequest dateCreatedRangeStart(OffsetDateTime dateCreatedRangeStart) {
+		this.dateCreatedRangeStart = dateCreatedRangeStart;
+		return this;
+	}
+
+	/**
+	 * Get dateCreatedRangeStart
+	 * 
+	 * @return dateCreatedRangeStart
+	 **/
+
+	public OffsetDateTime getDateCreatedRangeStart() {
+		return dateCreatedRangeStart;
+	}
+
+	public void setDateCreatedRangeStart(OffsetDateTime dateCreatedRangeStart) {
+		this.dateCreatedRangeStart = dateCreatedRangeStart;
+	}
+
+	public BrAPIListSearchRequest dateModifiedRangeEnd(OffsetDateTime dateModifiedRangeEnd) {
+		this.dateModifiedRangeEnd = dateModifiedRangeEnd;
+		return this;
+	}
+
+	/**
+	 * Get dateModifiedRangeEnd
+	 * 
+	 * @return dateModifiedRangeEnd
+	 **/
+
+	public OffsetDateTime getDateModifiedRangeEnd() {
+		return dateModifiedRangeEnd;
+	}
+
+	public void setDateModifiedRangeEnd(OffsetDateTime dateModifiedRangeEnd) {
+		this.dateModifiedRangeEnd = dateModifiedRangeEnd;
+	}
+
+	public BrAPIListSearchRequest dateModifiedRangeStart(OffsetDateTime dateModifiedRangeStart) {
+		this.dateModifiedRangeStart = dateModifiedRangeStart;
+		return this;
+	}
+
+	/**
+	 * Get dateModifiedRangeStart
+	 * 
+	 * @return dateModifiedRangeStart
+	 **/
+
+	public OffsetDateTime getDateModifiedRangeStart() {
+		return dateModifiedRangeStart;
+	}
+
+	public void setDateModifiedRangeStart(OffsetDateTime dateModifiedRangeStart) {
+		this.dateModifiedRangeStart = dateModifiedRangeStart;
+	}
+
+	public BrAPIListSearchRequest listDbIds(List<String> listDbIds) {
+		this.listDbIds = listDbIds;
+		return this;
+	}
+
+	public BrAPIListSearchRequest addListDbIdsItem(String listDbIdsItem) {
+		if (this.listDbIds == null) {
+			this.listDbIds = new ArrayList<String>();
+		}
+		this.listDbIds.add(listDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * Get listDbIds
+	 * 
+	 * @return listDbIds
+	 **/
+
+	public List<String> getListDbIds() {
+		return listDbIds;
+	}
+
+	public void setListDbIds(List<String> listDbIds) {
+		this.listDbIds = listDbIds;
+	}
+
+	public BrAPIListSearchRequest listNames(List<String> listNames) {
+		this.listNames = listNames;
+		return this;
+	}
+
+	public BrAPIListSearchRequest addListNamesItem(String listNamesItem) {
+		if (this.listNames == null) {
+			this.listNames = new ArrayList<String>();
+		}
+		this.listNames.add(listNamesItem);
+		return this;
+	}
+
+	/**
+	 * Get listNames
+	 * 
+	 * @return listNames
+	 **/
+
+	public List<String> getListNames() {
+		return listNames;
+	}
+
+	public void setListNames(List<String> listNames) {
+		this.listNames = listNames;
+	}
+
+	public BrAPIListSearchRequest listOwnerNames(List<String> listOwnerNames) {
+		this.listOwnerNames = listOwnerNames;
+		return this;
+	}
+
+	public BrAPIListSearchRequest addListOwnerNamesItem(String listOwnerNamesItem) {
+		if (this.listOwnerNames == null) {
+			this.listOwnerNames = new ArrayList<String>();
+		}
+		this.listOwnerNames.add(listOwnerNamesItem);
+		return this;
+	}
+
+	/**
+	 * Get listOwnerNames
+	 * 
+	 * @return listOwnerNames
+	 **/
+
+	public List<String> getListOwnerNames() {
+		return listOwnerNames;
+	}
+
+	public void setListOwnerNames(List<String> listOwnerNames) {
+		this.listOwnerNames = listOwnerNames;
+	}
+
+	public BrAPIListSearchRequest listOwnerPersonDbIds(List<String> listOwnerPersonDbIds) {
+		this.listOwnerPersonDbIds = listOwnerPersonDbIds;
+		return this;
+	}
+
+	public BrAPIListSearchRequest addListOwnerPersonDbIdsItem(String listOwnerPersonDbIdsItem) {
+		if (this.listOwnerPersonDbIds == null) {
+			this.listOwnerPersonDbIds = new ArrayList<String>();
+		}
+		this.listOwnerPersonDbIds.add(listOwnerPersonDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * Get listOwnerPersonDbIds
+	 * 
+	 * @return listOwnerPersonDbIds
+	 **/
+
+	public List<String> getListOwnerPersonDbIds() {
+		return listOwnerPersonDbIds;
+	}
+
+	public void setListOwnerPersonDbIds(List<String> listOwnerPersonDbIds) {
+		this.listOwnerPersonDbIds = listOwnerPersonDbIds;
+	}
+
+	public BrAPIListSearchRequest listSources(List<String> listSources) {
+		this.listSources = listSources;
+		return this;
+	}
+
+	public BrAPIListSearchRequest addListSourcesItem(String listSourcesItem) {
+		if (this.listSources == null) {
+			this.listSources = new ArrayList<String>();
+		}
+		this.listSources.add(listSourcesItem);
+		return this;
+	}
+
+	/**
+	 * Get listSources
+	 * 
+	 * @return listSources
+	 **/
+
+	public List<String> getListSources() {
+		return listSources;
+	}
+
+	public void setListSources(List<String> listSources) {
+		this.listSources = listSources;
+	}
+
+	public BrAPIListSearchRequest listType(BrAPIListTypes listType) {
+		this.listType = listType;
+		return this;
+	}
+
+	/**
+	 * Get listType
+	 * 
+	 * @return listType
+	 **/
+
+	public BrAPIListTypes getListType() {
+		return listType;
+	}
+
+	public void setListType(BrAPIListTypes listType) {
+		this.listType = listType;
+	}
+
+	public BrAPIListSearchRequest programDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+		return this;
+	}
+
+	public BrAPIListSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
+		if (this.programDbIds == null) {
+			this.programDbIds = new ArrayList<String>();
+		}
+		this.programDbIds.add(programDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * A BrAPI Program represents the high level organization or group who is
+	 * responsible for conducting trials and studies. Things like Breeding Programs
+	 * and Funded Projects are considered BrAPI Programs. Use this parameter to only
+	 * return results associated with the given programs. Use &#x60;GET
+	 * /programs&#x60; to find the list of available programs on a server.
+	 *
+	 * @return programDbIds
+	 **/
+	public List<String> getProgramDbIds() {
+		return programDbIds;
+	}
+
+	public void setProgramDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+	}
+
+	public BrAPIListSearchRequest programNames(List<String> programNames) {
+		this.programNames = programNames;
+		return this;
+	}
+
+	public BrAPIListSearchRequest addProgramNamesItem(String programNamesItem) {
+		if (this.programNames == null) {
+			this.programNames = new ArrayList<String>();
+		}
+		this.programNames.add(programNamesItem);
+		return this;
+	}
+
+	/**
+	 * Use this parameter to only return results associated with the given program
+	 * names. Program names are not required to be unique. Use &#x60;GET
+	 * /programs&#x60; to find the list of available programs on a server.
+	 *
+	 * @return programNames
+	 **/
+	public List<String> getProgramNames() {
+		return programNames;
+	}
+
+	public void setProgramNames(List<String> programNames) {
+		this.programNames = programNames;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIListSearchRequest listSearchRequest = (BrAPIListSearchRequest) o;
+		return Objects.equals(this.commonCropNames, listSearchRequest.commonCropNames)
+				&& Objects.equals(this.dateCreatedRangeEnd, listSearchRequest.dateCreatedRangeEnd)
+				&& Objects.equals(this.dateCreatedRangeStart, listSearchRequest.dateCreatedRangeStart)
+				&& Objects.equals(this.dateModifiedRangeEnd, listSearchRequest.dateModifiedRangeEnd)
+				&& Objects.equals(this.dateModifiedRangeStart, listSearchRequest.dateModifiedRangeStart)
+				&& Objects.equals(this.externalReferenceIDs, listSearchRequest.externalReferenceIDs)
+				&& Objects.equals(this.externalReferenceIds, listSearchRequest.externalReferenceIds)
+				&& Objects.equals(this.externalReferenceSources, listSearchRequest.externalReferenceSources)
+				&& Objects.equals(this.listDbIds, listSearchRequest.listDbIds)
+				&& Objects.equals(this.listNames, listSearchRequest.listNames)
+				&& Objects.equals(this.listOwnerNames, listSearchRequest.listOwnerNames)
+				&& Objects.equals(this.listOwnerPersonDbIds, listSearchRequest.listOwnerPersonDbIds)
+				&& Objects.equals(this.listSources, listSearchRequest.listSources)
+				&& Objects.equals(this.listType, listSearchRequest.listType)
+				&& Objects.equals(this.programDbIds, listSearchRequest.programDbIds)
+				&& Objects.equals(this.programNames, listSearchRequest.programNames);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(commonCropNames, dateCreatedRangeEnd, dateCreatedRangeStart, dateModifiedRangeEnd,
+				dateModifiedRangeStart, externalReferenceIDs, externalReferenceIds, externalReferenceSources, listDbIds,
+				listNames, listOwnerNames, listOwnerPersonDbIds, listSources, listType, programDbIds, programNames);
+
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class ListSearchRequest {\n");
+		sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
+		sb.append("    dateCreatedRangeEnd: ").append(toIndentedString(dateCreatedRangeEnd)).append("\n");
+		sb.append("    dateCreatedRangeStart: ").append(toIndentedString(dateCreatedRangeStart)).append("\n");
+		sb.append("    dateModifiedRangeEnd: ").append(toIndentedString(dateModifiedRangeEnd)).append("\n");
+		sb.append("    dateModifiedRangeStart: ").append(toIndentedString(dateModifiedRangeStart)).append("\n");
+		sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
+		sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
+		sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
+		sb.append("    listDbIds: ").append(toIndentedString(listDbIds)).append("\n");
+		sb.append("    listNames: ").append(toIndentedString(listNames)).append("\n");
+		sb.append("    listOwnerNames: ").append(toIndentedString(listOwnerNames)).append("\n");
+		sb.append("    listOwnerPersonDbIds: ").append(toIndentedString(listOwnerPersonDbIds)).append("\n");
+		sb.append("    listSources: ").append(toIndentedString(listSources)).append("\n");
+		sb.append("    listType: ").append(toIndentedString(listType)).append("\n");
+		sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
+		sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 }

From 04a93401da8025fd9becb5b3c9b5a1ecba688fd0 Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Mon, 21 Aug 2023 11:31:49 -0400
Subject: [PATCH 17/28] fixes #147, #148, #100, #101, #102, #103. Dependent on
 #199

---
 .../queryParams/core/LocationQueryParams.java |   29 +-
 .../v2/modules/core/LocationsAPITests.java    |  593 +++++----
 .../v2/model/BrAPIExternalReference.java      |    8 +-
 .../brapi/v2/model/core/BrAPILocation.java    | 1035 ++++++++--------
 .../request/BrAPILocationSearchRequest.java   | 1079 ++++++++++-------
 5 files changed, 1498 insertions(+), 1246 deletions(-)

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/LocationQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/LocationQueryParams.java
index 6985e934..39a8c98a 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/LocationQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/LocationQueryParams.java
@@ -29,22 +29,29 @@
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(fluent=true)
+@Accessors(fluent = true)
 public class LocationQueryParams extends BrAPIQueryParams {
 
-    private String locationType;
-    private String locationDbId;
-    private String externalReferenceSource;
-    private String externalReferenceId;
-    @Deprecated
-    private String externalReferenceID;
-    
-    public String getExternalReferenceId() {
+	private String locationType;
+	private String locationDbId;
+	private String externalReferenceSource;
+	private String externalReferenceId;
+	@Deprecated
+	private String externalReferenceID;
+	private String commonCropName;
+	private String parentLocationDbId;
+	private String locationName;
+	private String programDbId;
+	private String parentLocationName;
+
+	public String getExternalReferenceId() {
 		return externalReferenceId;
 	}
-    public String externalReferenceId() {
+
+	public String externalReferenceId() {
 		return externalReferenceId;
 	}
+
 	public void setExternalReferenceId(String externalReferenceId) {
 		this.externalReferenceId = externalReferenceId;
 	}
@@ -53,10 +60,12 @@ public void setExternalReferenceId(String externalReferenceId) {
 	public String getExternalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public String externalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/LocationsAPITests.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/LocationsAPITests.java
index 88b7847b..aeffd584 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/LocationsAPITests.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/core/LocationsAPITests.java
@@ -43,303 +43,302 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class LocationsAPITests extends BrAPIClientTest {
 
-    private LocationsApi locationsAPI = new LocationsApi(this.apiClient);
-    private String externalReferenceID = "testId";
-    private String externalReferenceSource = "testSource";
-    private BrAPILocation createdLocation;
-
-    @Test
-    public void createLocationIdPresent() throws ApiException {
-    	BrAPILocation brApiLocation = new BrAPILocation().locationDbId("test");
-        ApiResponse<BrAPILocationListResponse> location = locationsAPI.locationsPost(Arrays.asList(brApiLocation));
-        
-        assertNotEquals(brApiLocation.getLocationDbId(), location.getBody().getResult().getData().get(0).getLocationDbId());
-    }
-
-    @Test
-    public void createLocationNull() {
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-            ApiResponse<BrAPILocationListResponse> location = locationsAPI.locationsPost(null);
-        });
-    }
-
-    @Test
-    public void createLocationMultipleIdPresent() throws ApiException {
-    	BrAPILocation brApiLocation = new BrAPILocation().locationDbId("test");
-    	BrAPILocation brApiLocation1 = new BrAPILocation();
-        List<BrAPILocation> brApiLocations = new ArrayList<>();
-        brApiLocations.add(brApiLocation);
-        brApiLocations.add(brApiLocation1);
-
-        ApiResponse<BrAPILocationListResponse> location = locationsAPI.locationsPost(brApiLocations);
-
-        assertNotEquals(brApiLocation.getLocationDbId(), location.getBody().getResult().getData().get(0).getLocationDbId());
-        assertNotEquals(brApiLocation1.getLocationDbId(), location.getBody().getResult().getData().get(1).getLocationDbId());
-
-    }
-
-    @Test
-    public void createLocationMultipleEmptyList() throws ApiException {
-        List<BrAPILocation> brApiLocations = new ArrayList<>();
-
-        ApiResponse<BrAPILocationListResponse> location = locationsAPI.locationsPost(brApiLocations);
-        
-        assertTrue(location.getBody().getResult().getData().isEmpty());
-
-    }
-
-    @Test
-    public void createLocationMultipleNull() {
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-            ApiResponse<BrAPILocationListResponse> location = locationsAPI.locationsPost(null);
-        });
-    }
-
-    @Test
-    @Order(1)
-    @SneakyThrows
-    public void createLocationSuccess() {
-        BrAPILocation brApiLocation = buildTestLocation();
-        ApiResponse<BrAPILocationListResponse> locationBody = locationsAPI.locationsPost(Arrays.asList(brApiLocation));
-        BrAPILocation location = locationBody.getBody().getResult().getData().get(0);
-        assertFalse(location.getLocationDbId() == null, "Location id missing");
-        locationAssertEquals(brApiLocation, location);
-
-        this.createdLocation = location;
-    }
-
-    private BrAPILocation buildTestLocation() {
-        List<BrAPIExternalReference> externalReferences = new ArrayList<>();
-        externalReferences.add(
-				new BrAPIExternalReference()
-				.referenceID(externalReferenceID)
-				.referenceSource(externalReferenceSource));
-
-        JsonObject additionalInfo = new JsonObject();
-        additionalInfo.addProperty("test", "test");
-
-        BrAPILocation brApiLocation = new BrAPILocation()
-                .locationName("Test location")
-                .locationType("Storage location")
-                .abbreviation("TL")
-                .additionalInfo(additionalInfo)
-                .coordinateDescription("North East corner of greenhouse")
-                .coordinateUncertainty("20")
-                .coordinates(BrApiGeoJSON.builder()
-                        .type("Feature")
-                        .geometry(new Point(new SinglePosition(Coordinates.of(-76.501884, 42.443962, 125))))
-                        .build()
-                )
-                .countryName("United States")
-                .countryCode("USA")
-                .documentationURL("https://brapi.org")
-                .instituteName("Cornell University")
-                .instituteAddress("525 Tower Rd Ithaca, NY 14850")
-                .topography("Hill")
-                .slope("0")
-                .environmentType("Nursery")
-                .siteStatus("Private")
-                .externalReferences(externalReferences)
-                .exposure("Structure, no exposure");
-
-        return brApiLocation;
-    }
-
-    private void locationAssertEquals(BrAPILocation expected, BrAPILocation actual) {
-        assertEquals(expected.getAdditionalInfo(), actual.getAdditionalInfo(), "Location additionalInfo mismatch");
-        assertEquals(expected.getAbbreviation(), actual.getAbbreviation(), "Location abbreviation mismatch");
-        assertEquals(expected.getCoordinateDescription(), actual.getCoordinateDescription(), "Location coordinateDescription mismatch");
-        assertEquals(expected.getCoordinates(), actual.getCoordinates(), "Location coordinates mismatch");
-        assertEquals(expected.getCoordinateUncertainty(), actual.getCoordinateUncertainty(), "Location coordinateUncertainty mismatch");
-        assertEquals(expected.getCountryCode(), actual.getCountryCode(), "Location countryCode mismatch");
-        assertEquals(expected.getCountryName(), actual.getCountryName(), "Location countryName mismatch");
-        assertEquals(expected.getLocationName(), actual.getLocationName(), "Location name mismatch");
-        assertEquals(expected.getLocationType(), actual.getLocationType(), "Location type mismatch");
-        assertEquals(expected.getCountryName(), actual.getCountryName(), "Location countryName mismatch");
-        assertEquals(expected.getEnvironmentType(), actual.getEnvironmentType(), "Location environmentType mismatch");
-        assertEquals(expected.getExposure(), actual.getExposure(), "Location exposure mistmatch");
-        assertEquals(expected.getInstituteName(), actual.getInstituteName(), "Location instituteName mismatch");
-        assertEquals(expected.getInstituteAddress(), actual.getInstituteAddress(), "Location instituteAddress mismatch");
-        assertEquals(expected.getSiteStatus(), actual.getSiteStatus(), "Location siteStatus mismatch");
-        assertEquals(expected.getSlope(), actual.getSlope(), "Location slope mismatch");
-        assertEquals(expected.getTopography(), actual.getTopography(), "Location topography mismatch");
-        assertEquals(expected.getDocumentationURL(), actual.getDocumentationURL(), "Location documentationUrl mismatch");
-        assertEquals(expected.getExternalReferences(), actual.getExternalReferences(), "Location external reference mismatch");
-    }
-
-    @Test
-    @Order(1)
-    @SneakyThrows
-    public void createLocationsMultipleSuccess() {
-        BrAPILocation brApiLocation1 = new BrAPILocation().locationName("new test location1");
-        BrAPILocation brApiLocation2 = new BrAPILocation().locationName("new test location2");
-        
-        List<BrAPILocation> locations = new ArrayList<>();
-        locations.add(brApiLocation1);
-        locations.add(brApiLocation2);
-
-        ApiResponse<BrAPILocationListResponse> locationsBody = locationsAPI.locationsPost(locations);
-
-        List<BrAPILocation> createdLocations = locationsBody.getBody().getResult().getData();
-        assertEquals(true, createdLocations.size() == 2);
-        assertEquals(true, createdLocations.get(0).getLocationDbId() != null, "Location id missing");
-        assertEquals(true, createdLocations.get(1).getLocationDbId() != null, "Location id missing");
-
-        assertEquals(brApiLocation1.getLocationName(), createdLocations.get(0).getLocationName(), "Location name mismatch");
-        assertEquals(brApiLocation2.getLocationName(), createdLocations.get(1).getLocationName(), "Location name mismatch");
-    }
-
-    @Test
-    @SneakyThrows
-    @Order(2)
-    void getLocationsSuccess() {
-        ApiResponse<BrAPILocationListResponse> locations = locationsAPI.locationsGet(new LocationQueryParams());
-
-        assertEquals(true, !locations.getBody().getResult().getData().isEmpty(), "List of locations was empty");
-    }
-
-    @Test
-    @SneakyThrows
-    @Order(2)
-    void getLocationsPageFilter() {
-
-        LocationQueryParams baseRequest = LocationQueryParams.builder()
-                .page(0)
-                .pageSize(1)
-                .build();
-
-        ApiResponse<BrAPILocationListResponse> locations = locationsAPI.locationsGet(baseRequest);
-
-        assertEquals(true, locations.getBody().getResult().getData().size() == 1, "More than one location was returned");
-    }
-
-    @Test
-    @SneakyThrows
-    @Order(2)
-    void getLocationsByExternalReferenceIdSuccess() {
-        LocationQueryParams locationsRequest = LocationQueryParams.builder()
-                .externalReferenceID(externalReferenceID)
-                .build();
-
-        ApiResponse<BrAPILocationListResponse> locations = locationsAPI.locationsGet(locationsRequest);
-
-        assertEquals(true, locations.getBody().getResult().getData().size() > 0, "List of locations was empty");
-    }
-
-    @Test
-    @SneakyThrows
-    @Order(2)
-    void getLocationsByExternalReferenceSourceSuccess() {
-        LocationQueryParams locationsRequest = LocationQueryParams.builder()
-                .externalReferenceSource(externalReferenceSource)
-                .build();
-
-        ApiResponse<BrAPILocationListResponse> locations = locationsAPI.locationsGet(locationsRequest);
-
-        assertEquals(true, locations.getBody().getResult().getData().size() > 0, "List of locations was empty");
-    }
-
-    @Test
-    @SneakyThrows
-    @Order(2)
-    void getLocationsByLocationType() {
-        LocationQueryParams locationsRequest = LocationQueryParams.builder()
-                .locationType(createdLocation.getLocationType())
-                .build();
-
-        ApiResponse<BrAPILocationListResponse> locations = locationsAPI.locationsGet(locationsRequest);
-
-        assertEquals(true, locations.getBody().getResult().getData().size() > 0, "List of locations was empty");
-    }
-
-    @Test
-    @SneakyThrows
-    @Order(2)
-    void getLocationsByLocationId() {
-        LocationQueryParams locationsRequest = LocationQueryParams.builder()
-                .locationDbId(createdLocation.getLocationDbId())
-                .build();
-
-        ApiResponse<BrAPILocationListResponse> locations = locationsAPI.locationsGet(locationsRequest);
-
-        assertEquals(true, locations.getBody().getResult().getData().size() > 0, "List of locations was empty");
-    }
-
-    @Test
-    public void getLocationByIdMissingId() {
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-            ApiResponse<BrAPILocationSingleResponse> location = locationsAPI.locationsLocationDbIdGet(null);
-        });
-    }
-
-    @Test
-    @SneakyThrows
-    @Order(2)
-    void getLocationByIdSuccess() {
-        ApiResponse<BrAPILocationSingleResponse> optionalLocation = locationsAPI.locationsLocationDbIdGet(createdLocation.getLocationDbId());
-
-        BrAPILocation location = optionalLocation.getBody().getResult();
-        assertEquals(true, location.getLocationDbId() != null, "locationDbId was not parsed properly.");
-        locationAssertEquals(createdLocation, location);
-    }
-
-    @Test
-    @SneakyThrows
-    void getLocationByIdInvalid() {
-    	ApiException exception = assertThrows(ApiException.class, () -> {
-            ApiResponse<BrAPILocationSingleResponse> location = locationsAPI.locationsLocationDbIdGet("badLocationId");
-        });
-        assertEquals(404, exception.getCode());
-    }
-
-    @Test
-    @SneakyThrows
-    @Order(2)
-    public void updateLocationSuccess() {
-        BrAPILocation location = this.createdLocation;
-        location.setLocationName("updated_name");
-
-        // Check that it is a success and all data matches
-        ApiResponse<BrAPILocationSingleResponse> updatedLocationResult = this.locationsAPI.locationsLocationDbIdPut(createdLocation.getLocationDbId(), location);
-
-        BrAPILocation updatedLocation = updatedLocationResult.getBody().getResult();
-        locationAssertEquals(location, updatedLocation);
-    }
-
-    @Test
-    @SneakyThrows
-    public void updateLocationMissingId() {
-        // Check that it throws an ApiException
-        BrAPILocation brApiLocation = new BrAPILocation().locationName("new test location");
-
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-            ApiResponse<BrAPILocationSingleResponse> updatedLocationResult = this.locationsAPI.locationsLocationDbIdPut(null, brApiLocation);
-        });
-    }
-
-    @Test
-    public void updateLocationNull() {
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-            ApiResponse<BrAPILocationSingleResponse> updatedLocationResult = this.locationsAPI.locationsLocationDbIdPut(null, null);
-        });
-    }
-
-    @Test
-    @Order(3)
-    @SneakyThrows
-    public void searchLocationByName() {
-        BrAPILocationSearchRequest locationSearchRequest = new BrAPILocationSearchRequest();
-        List<String> names = new ArrayList<>();
-        names.add("updated_name");
-        locationSearchRequest.setLocationNames(names);
-        ApiResponse<Pair<Optional<BrAPILocationListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = locationsAPI.searchLocationsPost(locationSearchRequest);
-        BrAPILocationListResponse locationResponse = response.getBody().getLeft().get();
-
-        assertEquals(true, locationResponse.getResult().getData().size() > 0, "List of locations was empty");
-
-    }
-
+	private LocationsApi api = new LocationsApi(this.apiClient);
+
+	@Test
+	public void createLocationIdPresent() throws ApiException {
+		BrAPILocation brApiLocation = new BrAPILocation().locationDbId("test");
+		ApiResponse<BrAPILocationListResponse> location = api.locationsPost(Arrays.asList(brApiLocation));
+
+		assertNotEquals(brApiLocation.getLocationDbId(),
+				location.getBody().getResult().getData().get(0).getLocationDbId());
+	}
+
+	@Test
+	public void createLocationNull() {
+		assertThrows(IllegalArgumentException.class, () -> {
+			api.locationsPost(null);
+		});
+	}
+
+	@Test
+	public void createLocationMultipleIdPresent() throws ApiException {
+		BrAPILocation loc1 = new BrAPILocation().locationName("test name 1");
+		BrAPILocation loc2 = new BrAPILocation().locationName("test name 2");
+		List<BrAPILocation> brApiLocations = Arrays.asList(loc1, loc2);
+
+		ApiResponse<BrAPILocationListResponse> locations = api.locationsPost(brApiLocations);
+
+		assertNotNull(locations.getBody().getResult().getData().get(0).getLocationDbId());
+		assertNotNull(locations.getBody().getResult().getData().get(1).getLocationDbId());
+		assertEquals(loc1.getLocationName(), locations.getBody().getResult().getData().get(0).getLocationName());
+		assertEquals(loc2.getLocationName(), locations.getBody().getResult().getData().get(1).getLocationName());
+
+	}
+
+	@Test
+	public void createLocationMultipleEmptyList() throws ApiException {
+		List<BrAPILocation> brApiLocations = new ArrayList<>();
+
+		ApiResponse<BrAPILocationListResponse> location = api.locationsPost(brApiLocations);
+
+		assertTrue(location.getBody().getResult().getData().isEmpty());
+
+	}
+
+	@Test
+	public void createLocationMultipleNull() {
+		assertThrows(IllegalArgumentException.class, () -> {
+			api.locationsPost(null);
+		});
+	}
+
+	@Test
+	@SneakyThrows
+	public void createLocationSuccess() {
+		BrAPILocation brApiLocation = buildTestLocation();
+		ApiResponse<BrAPILocationListResponse> locationBody = api.locationsPost(Arrays.asList(brApiLocation));
+		BrAPILocation location = locationBody.getBody().getResult().getData().get(0);
+		assertFalse(location.getLocationDbId() == null, "Location id missing");
+		locationAssertEquals(brApiLocation, location);
+	}
+
+	private BrAPILocation buildTestLocation() {
+		List<BrAPIExternalReference> externalReferences = new ArrayList<>();
+		externalReferences.add(new BrAPIExternalReference().referenceId("refID").referenceID("refID").referenceSource("refSource"));
+
+		JsonObject additionalInfo = new JsonObject();
+		additionalInfo.addProperty("test", "test");
+
+		BrAPILocation brApiLocation = new BrAPILocation().locationName("Test location").locationType("Storage location")
+				.abbreviation("TL").additionalInfo(additionalInfo)
+				.coordinateDescription("North East corner of greenhouse").coordinateUncertainty("20")
+				.coordinates(BrApiGeoJSON.builder().type("Feature")
+						.geometry(new Point(new SinglePosition(Coordinates.of(-76.501884, 42.443962, 125)))).build())
+				.countryName("United States").countryCode("USA").documentationURL("https://brapi.org")
+				.instituteName("Cornell University").instituteAddress("525 Tower Rd Ithaca, NY 14850")
+				.topography("Hill").slope("0").environmentType("Nursery").siteStatus("Private")
+				.externalReferences(externalReferences).exposure("Structure, no exposure");
+
+		return brApiLocation;
+	}
+
+	private void locationAssertEquals(BrAPILocation expected, BrAPILocation actual) {
+		assertEquals(expected.getAdditionalInfo(), actual.getAdditionalInfo(), "Location additionalInfo mismatch");
+		assertEquals(expected.getAbbreviation(), actual.getAbbreviation(), "Location abbreviation mismatch");
+		assertEquals(expected.getCoordinateDescription(), actual.getCoordinateDescription(),
+				"Location coordinateDescription mismatch");
+		assertEquals(expected.getCoordinates(), actual.getCoordinates(), "Location coordinates mismatch");
+		assertEquals(expected.getCoordinateUncertainty(), actual.getCoordinateUncertainty(),
+				"Location coordinateUncertainty mismatch");
+		assertEquals(expected.getCountryCode(), actual.getCountryCode(), "Location countryCode mismatch");
+		assertEquals(expected.getCountryName(), actual.getCountryName(), "Location countryName mismatch");
+		assertEquals(expected.getLocationName(), actual.getLocationName(), "Location name mismatch");
+		assertEquals(expected.getLocationType(), actual.getLocationType(), "Location type mismatch");
+		assertEquals(expected.getCountryName(), actual.getCountryName(), "Location countryName mismatch");
+		assertEquals(expected.getEnvironmentType(), actual.getEnvironmentType(), "Location environmentType mismatch");
+		assertEquals(expected.getExposure(), actual.getExposure(), "Location exposure mistmatch");
+		assertEquals(expected.getInstituteName(), actual.getInstituteName(), "Location instituteName mismatch");
+		assertEquals(expected.getInstituteAddress(), actual.getInstituteAddress(),
+				"Location instituteAddress mismatch");
+		assertEquals(expected.getSiteStatus(), actual.getSiteStatus(), "Location siteStatus mismatch");
+		assertEquals(expected.getSlope(), actual.getSlope(), "Location slope mismatch");
+		assertEquals(expected.getTopography(), actual.getTopography(), "Location topography mismatch");
+		assertEquals(expected.getDocumentationURL(), actual.getDocumentationURL(),
+				"Location documentationUrl mismatch");
+		assertEquals(expected.getExternalReferences(), actual.getExternalReferences(),
+				"Location external reference mismatch");
+	}
+
+	@Test
+	@SneakyThrows
+	public void createLocationsMultipleSuccess() {
+		BrAPILocation brApiLocation1 = new BrAPILocation().locationName("new test location1");
+		BrAPILocation brApiLocation2 = new BrAPILocation().locationName("new test location2");
+
+		List<BrAPILocation> locations = new ArrayList<>();
+		locations.add(brApiLocation1);
+		locations.add(brApiLocation2);
+
+		ApiResponse<BrAPILocationListResponse> locationsBody = api.locationsPost(locations);
+
+		List<BrAPILocation> createdLocations = locationsBody.getBody().getResult().getData();
+		assertEquals(true, createdLocations.size() == 2);
+		assertEquals(true, createdLocations.get(0).getLocationDbId() != null, "Location id missing");
+		assertEquals(true, createdLocations.get(1).getLocationDbId() != null, "Location id missing");
+
+		assertEquals(brApiLocation1.getLocationName(), createdLocations.get(0).getLocationName(),
+				"Location name mismatch");
+		assertEquals(brApiLocation2.getLocationName(), createdLocations.get(1).getLocationName(),
+				"Location name mismatch");
+	}
+
+	@Test
+	@SneakyThrows
+	void getLocationsSuccess() {
+		ApiResponse<BrAPILocationListResponse> locations = api.locationsGet(new LocationQueryParams());
+
+		assertFalse(locations.getBody().getResult().getData().isEmpty(), "List of locations was empty");
+	}
+
+	@Test
+	@SneakyThrows
+	void getLocationsPageFilter() {
+		LocationQueryParams baseRequest = LocationQueryParams.builder().page(0).pageSize(1).build();
+
+		ApiResponse<BrAPILocationListResponse> locations = api.locationsGet(baseRequest);
+
+		assertEquals(1, locations.getBody().getResult().getData().size(), "More than one location was returned");
+	}
+
+	@Test
+	@SneakyThrows
+	void getLocationsByExternalReferenceIdSuccess() {
+		LocationQueryParams locationsRequest = LocationQueryParams.builder()
+				.externalReferenceId("https://brapi.org/specification").build();
+
+		ApiResponse<BrAPILocationListResponse> locations = api.locationsGet(locationsRequest);
+
+		assertEquals(3, locations.getBody().getResult().getData().size(), "Unexpected number of results");
+	}
+
+	@Test
+	@SneakyThrows
+	void getLocationsByExternalReferenceSourceSuccess() {
+		LocationQueryParams locationsRequest = LocationQueryParams.builder().externalReferenceSource("BrAPI Doc")
+				.build();
+
+		ApiResponse<BrAPILocationListResponse> locations = api.locationsGet(locationsRequest);
+
+		assertEquals(3, locations.getBody().getResult().getData().size(), "Unexpected number of results");
+	}
+
+	@Test
+	@SneakyThrows
+	void getLocationsByLocationType() {
+		LocationQueryParams locationsRequest = LocationQueryParams.builder().locationType("Storage location").build();
+
+		ApiResponse<BrAPILocationListResponse> locations = api.locationsGet(locationsRequest);
+
+		assertEquals(1, locations.getBody().getResult().getData().size(), "Unexpected number of results");
+	}
+
+	@Test
+	@SneakyThrows
+	void getLocationsByLocationId() {
+		String locationDbId = "location_01";
+		LocationQueryParams locationsRequest = LocationQueryParams.builder().locationDbId(locationDbId).build();
+
+		ApiResponse<BrAPILocationListResponse> locations = api.locationsGet(locationsRequest);
+
+		assertEquals(true, locations.getBody().getResult().getData().size() > 0, "List of locations was empty");
+	}
+
+	@Test
+	public void getLocationByIdMissingId() {
+		assertThrows(IllegalArgumentException.class, () -> {
+			api.locationsLocationDbIdGet(null);
+		});
+	}
+
+	@Test
+	@SneakyThrows
+	void getLocationByIdSuccess() {
+		String locationDbId = "location_01";
+		ApiResponse<BrAPILocationSingleResponse> optionalLocation = api.locationsLocationDbIdGet(locationDbId);
+
+		BrAPILocation location = optionalLocation.getBody().getResult();
+		assertNotNull(location.getLocationDbId(), "locationDbId was not parsed properly.");
+		assertEquals(locationDbId, location.getLocationDbId());
+	}
+
+	@Test
+	@SneakyThrows
+	void getLocationByIdInvalid() {
+		ApiException exception = assertThrows(ApiException.class, () -> {
+			api.locationsLocationDbIdGet("badLocationId");
+		});
+		assertEquals(404, exception.getCode());
+	}
+
+	@Test
+	@SneakyThrows
+	public void updateLocationSuccess() {
+		String locationDbId = "location_01";
+		BrAPILocation location = new BrAPILocation().locationDbId(locationDbId).locationName("updated_name");
+
+		// Check that it is a success and all data matches
+		ApiResponse<BrAPILocationSingleResponse> updatedLocationResult = this.api.locationsLocationDbIdPut(locationDbId,
+				location);
+
+		BrAPILocation updatedLocation = updatedLocationResult.getBody().getResult();
+		assertEquals(locationDbId, updatedLocation.getLocationDbId());
+		assertEquals(location.getLocationName(), updatedLocation.getLocationName());
+	}
+
+	@Test
+	@SneakyThrows
+	public void updateLocationMissingId() {
+		// Check that it throws an ApiException
+		BrAPILocation brApiLocation = new BrAPILocation().locationName("new test location");
+
+		assertThrows(IllegalArgumentException.class, () -> {
+			this.api.locationsLocationDbIdPut(null, brApiLocation);
+		});
+	}
+
+	@Test
+	public void updateLocationNull() {
+		assertThrows(IllegalArgumentException.class, () -> {
+			this.api.locationsLocationDbIdPut(null, null);
+		});
+	}
+
+	@Test
+	@SneakyThrows
+	public void searchLocationByName() {
+		BrAPILocationSearchRequest body = new BrAPILocationSearchRequest().addLocationDbIdsItem("location_01")
+				.addLocationDbIdsItem("location_02");
+
+		ApiResponse<Pair<Optional<BrAPILocationListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api
+				.searchLocationsPost(body);
+
+		Optional<BrAPILocationListResponse> listResponse = response.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+		// only results are returned
+		assertTrue(listResponse.isPresent());
+		assertFalse(searchIdResponse.isPresent());
+
+		assertEquals(2, listResponse.get().getResult().getData().size(), "unexpected number of items returned");
+
+	}
+
+	@Test
+	public void searchAttributesSearchResultsDbIdGetTest() throws ApiException {
+		BrAPILocationSearchRequest baseRequest = new BrAPILocationSearchRequest().addLocationDbIdsItem("location_01")
+				.addLocationDbIdsItem("location_02").addLocationDbIdsItem("location_03")
+				.addLocationDbIdsItem("location_01").addLocationDbIdsItem("location_02")
+				.addLocationDbIdsItem("location_03");
+
+		ApiResponse<Pair<Optional<BrAPILocationListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = this.api
+				.searchLocationsPost(baseRequest);
+		Optional<BrAPILocationListResponse> listResponse = response.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+		// only search ID is returned
+		assertFalse(listResponse.isPresent());
+		assertTrue(searchIdResponse.isPresent());
+
+		// Get results from search ID
+		ApiResponse<Pair<Optional<BrAPILocationListResponse>, Optional<BrAPIAcceptedSearchResponse>>> searchResponse = this.api
+				.searchLocationsSearchResultsDbIdGet(searchIdResponse.get().getResult().getSearchResultsDbId(), 0, 10);
+		Optional<BrAPILocationListResponse> listResponse2 = searchResponse.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse2 = searchResponse.getBody().getRight();
+		// only results are returned
+		assertTrue(listResponse2.isPresent());
+		assertFalse(searchIdResponse2.isPresent());
+
+		assertEquals(3, listResponse2.get().getResult().getData().size(), "unexpected number of items returned");
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/BrAPIExternalReference.java b/brapi-java-model/src/main/java/org/brapi/v2/model/BrAPIExternalReference.java
index d9fcd056..078fc935 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/BrAPIExternalReference.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/BrAPIExternalReference.java
@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * ExternalReferencesInner
+ * BrAPIExternalReference
  */
 
 public class BrAPIExternalReference {
@@ -88,20 +88,22 @@ public boolean equals(java.lang.Object o) {
 		}
 		BrAPIExternalReference externalReferencesInner = (BrAPIExternalReference) o;
 		return Objects.equals(this.referenceID, externalReferencesInner.referenceID)
+				&& Objects.equals(this.referenceId, externalReferencesInner.referenceId)
 				&& Objects.equals(this.referenceSource, externalReferencesInner.referenceSource);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(referenceID, referenceSource);
+		return Objects.hash(referenceID, referenceId, referenceSource);
 	}
 
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
-		sb.append("class ExternalReferencesInner {\n");
+		sb.append("class BrAPIExternalReference {\n");
 
 		sb.append("    referenceID: ").append(toIndentedString(referenceID)).append("\n");
+		sb.append("    referenceId: ").append(toIndentedString(referenceId)).append("\n");
 		sb.append("    referenceSource: ").append(toIndentedString(referenceSource)).append("\n");
 		sb.append("}");
 		return sb.toString();
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPILocation.java b/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPILocation.java
index 37f9cfc3..0aa1424b 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPILocation.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/core/BrAPILocation.java
@@ -1,8 +1,6 @@
 package org.brapi.v2.model.core;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.Gson;
@@ -13,520 +11,577 @@
 import org.brapi.v2.model.BrApiGeoJSON;
 import org.brapi.v2.model.NullableJsonElementTypeAdapterFactory;
 
-import javax.validation.Valid;
-
-
 /**
  * Location
  */
 
-
 public class BrAPILocation {
-  @JsonProperty("locationDbId")
-  private String locationDbId = null;
-
-  @JsonProperty("abbreviation")
-  private String abbreviation = null;
-
-  @JsonProperty("additionalInfo")
-  @Valid
-  @JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
-  private JsonObject additionalInfo = null;
-
-  @JsonProperty("coordinateDescription")
-  private String coordinateDescription = null;
-
-  @JsonProperty("coordinateUncertainty")
-  private String coordinateUncertainty = null;
-
-  @JsonProperty("coordinates")
-  private BrApiGeoJSON coordinates = null;
-
-  @JsonProperty("countryCode")
-  private String countryCode = null;
-
-  @JsonProperty("countryName")
-  private String countryName = null;
-
-  @JsonProperty("documentationURL")
-  private String documentationURL = null;
-
-  @JsonProperty("environmentType")
-  private String environmentType = null;
-
-  @JsonProperty("exposure")
-  private String exposure = null;
-
-  @JsonProperty("externalReferences")
-  private List<BrAPIExternalReference> externalReferences = null;
-
-  @JsonProperty("instituteAddress")
-  private String instituteAddress = null;
-
-  @JsonProperty("instituteName")
-  private String instituteName = null;
-
-  @JsonProperty("locationName")
-  private String locationName = null;
-
-  @JsonProperty("locationType")
-  private String locationType = null;
-
-  @JsonProperty("siteStatus")
-  private String siteStatus = null;
-
-  @JsonProperty("slope")
-  private String slope = null;
-
-  @JsonProperty("topography")
-  private String topography = null;
-
-  private final transient Gson gson = new Gson();
-
-  public BrAPILocation locationDbId(String locationDbId) {
-    this.locationDbId = locationDbId;
-    return this;
-  }
-
-  /**
-   * The unique identifier for a Location
-   * @return locationDbId
-   **/
-
-
-  public String getLocationDbId() {
-    return locationDbId;
-  }
-
-  public void setLocationDbId(String locationDbId) {
-    this.locationDbId = locationDbId;
-  }
-
-  public BrAPILocation abbreviation(String abbreviation) {
-    this.abbreviation = abbreviation;
-    return this;
-  }
-
-  /**
-   * An abbreviation which represents this location
-   * @return abbreviation
-   **/
-
-
-  public String getAbbreviation() {
-    return abbreviation;
-  }
-
-  public void setAbbreviation(String abbreviation) {
-    this.abbreviation = abbreviation;
-  }
-
-  public BrAPILocation additionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-    return this;
-  }
-
-  public BrAPILocation putAdditionalInfoItem(String key, Object additionalInfoItem) {
-    if (this.additionalInfo == null) {
-      this.additionalInfo = new JsonObject();
-    }
-    JsonElement newElement = gson.toJsonTree(additionalInfoItem);
-    this.additionalInfo.add(key, newElement);
-    return this;
-  }
-
-  /**
-   * Additional arbitrary info
-   * @return additionalInfo
-   **/
-
-
-  public JsonObject getAdditionalInfo() {
-    return additionalInfo;
-  }
-
-  public void setAdditionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-  }
-
-  public BrAPILocation coordinateDescription(String coordinateDescription) {
-    this.coordinateDescription = coordinateDescription;
-    return this;
-  }
-
-  /**
-   * Describes the precision and landmarks of the coordinate values used for this location. (ex. the site, the nearest town, a 10 kilometers radius circle, +/- 20 meters, etc)
-   * @return coordinateDescription
-   **/
-
-
-  public String getCoordinateDescription() {
-    return coordinateDescription;
-  }
-
-  public void setCoordinateDescription(String coordinateDescription) {
-    this.coordinateDescription = coordinateDescription;
-  }
-
-  public BrAPILocation coordinateUncertainty(String coordinateUncertainty) {
-    this.coordinateUncertainty = coordinateUncertainty;
-    return this;
-  }
-
-  /**
-   * Uncertainty associated with the coordinates in meters. Leave the value empty if the uncertainty is unknown.
-   * @return coordinateUncertainty
-   **/
-
-
-  public String getCoordinateUncertainty() {
-    return coordinateUncertainty;
-  }
-
-  public void setCoordinateUncertainty(String coordinateUncertainty) {
-    this.coordinateUncertainty = coordinateUncertainty;
-  }
-
-  public BrAPILocation coordinates(BrApiGeoJSON coordinates) {
-    this.coordinates = coordinates;
-    return this;
-  }
-
-  /**
-   * Get coordinates
-   * @return coordinates
-   **/
-
-
-  @Valid
-  public BrApiGeoJSON getCoordinates() {
-    return coordinates;
-  }
-
-  public void setCoordinates(BrApiGeoJSON coordinates) {
-    this.coordinates = coordinates;
-  }
-
-  public BrAPILocation countryCode(String countryCode) {
-    this.countryCode = countryCode;
-    return this;
-  }
-
-  /**
-   *  [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec MIAPPE V1.1 (DM-17) Geographic location (country) - The country where the experiment took place, either as a full name or preferably as a 2-letter code.
-   * @return countryCode
-   **/
-
-
-  public String getCountryCode() {
-    return countryCode;
-  }
-
-  public void setCountryCode(String countryCode) {
-    this.countryCode = countryCode;
-  }
-
-  public BrAPILocation countryName(String countryName) {
-    this.countryName = countryName;
-    return this;
-  }
-
-  /**
-   * The full name of the country where this location is  MIAPPE V1.1 (DM-17) Geographic location (country) - The country where the experiment took place, either as a full name or preferably as a 2-letter code.
-   * @return countryName
-   **/
-
-
-  public String getCountryName() {
-    return countryName;
-  }
-
-  public void setCountryName(String countryName) {
-    this.countryName = countryName;
-  }
-
-  public BrAPILocation documentationURL(String documentationURL) {
-    this.documentationURL = documentationURL;
-    return this;
-  }
-
-  /**
-   * A URL to the human readable documentation of this object
-   * @return documentationURL
-   **/
-
-
-  public String getDocumentationURL() {
-    return documentationURL;
-  }
-
-  public void setDocumentationURL(String documentationURL) {
-    this.documentationURL = documentationURL;
-  }
-
-  public BrAPILocation environmentType(String environmentType) {
-    this.environmentType = environmentType;
-    return this;
-  }
-
-  /**
-   * Describes the general type of environment of the location. (ex. forest, field, nursery, etc)
-   * @return environmentType
-   **/
-
-
-  public String getEnvironmentType() {
-    return environmentType;
-  }
-
-  public void setEnvironmentType(String environmentType) {
-    this.environmentType = environmentType;
-  }
-
-  public BrAPILocation exposure(String exposure) {
-    this.exposure = exposure;
-    return this;
-  }
-
-  /**
-   * Describes the level of protection/exposure for things like sun light and wind.
-   * @return exposure
-   **/
+	@JsonProperty("locationDbId")
+	private String locationDbId = null;
 
+	@JsonProperty("abbreviation")
+	private String abbreviation = null;
 
-  public String getExposure() {
-    return exposure;
-  }
+	@JsonProperty("additionalInfo")
+	@JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
+	private JsonObject additionalInfo = null;
 
-  public void setExposure(String exposure) {
-    this.exposure = exposure;
-  }
+	@JsonProperty("coordinateDescription")
+	private String coordinateDescription = null;
 
-  public BrAPILocation externalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-    return this;
-  }
+	@JsonProperty("coordinateUncertainty")
+	private String coordinateUncertainty = null;
 
-  /**
-   * Get externalReferences
-   * @return externalReferences
-   **/
+	@JsonProperty("coordinates")
+	private BrApiGeoJSON coordinates = null;
 
+	@JsonProperty("countryCode")
+	private String countryCode = null;
 
-  @Valid
-  public List<BrAPIExternalReference> getExternalReferences() {
-    return externalReferences;
-  }
+	@JsonProperty("countryName")
+	private String countryName = null;
 
-  public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-  }
+	@JsonProperty("documentationURL")
+	private String documentationURL = null;
 
-  public BrAPILocation instituteAddress(String instituteAddress) {
-    this.instituteAddress = instituteAddress;
-    return this;
-  }
+	@JsonProperty("environmentType")
+	private String environmentType = null;
 
-  /**
-   * The street address of the institute representing this location  MIAPPE V1.1 (DM-16) Contact institution - Name and address of the institution responsible for the study.
-   * @return instituteAddress
-   **/
+	@JsonProperty("exposure")
+	private String exposure = null;
 
+	@JsonProperty("externalReferences")
+	private List<BrAPIExternalReference> externalReferences = null;
 
-  public String getInstituteAddress() {
-    return instituteAddress;
-  }
+	@JsonProperty("instituteAddress")
+	private String instituteAddress = null;
 
-  public void setInstituteAddress(String instituteAddress) {
-    this.instituteAddress = instituteAddress;
-  }
+	@JsonProperty("instituteName")
+	private String instituteName = null;
 
-  public BrAPILocation instituteName(String instituteName) {
-    this.instituteName = instituteName;
-    return this;
-  }
+	@JsonProperty("locationName")
+	private String locationName = null;
 
-  /**
-   * Each institute/laboratory can have several experimental field  MIAPPE V1.1 (DM-16) Contact institution - Name and address of the institution responsible for the study.
-   * @return instituteName
-   **/
+	@JsonProperty("locationType")
+	private String locationType = null;
 
+	@JsonProperty("parentLocationDbId")
+	private String parentLocationDbId = null;
 
-  public String getInstituteName() {
-    return instituteName;
-  }
+	@JsonProperty("parentLocationName")
+	private String parentLocationName = null;
 
-  public void setInstituteName(String instituteName) {
-    this.instituteName = instituteName;
-  }
+	@JsonProperty("siteStatus")
+	private String siteStatus = null;
 
-  public BrAPILocation locationName(String locationName) {
-    this.locationName = locationName;
-    return this;
-  }
+	@JsonProperty("slope")
+	private String slope = null;
 
-  /**
-   * A human readable name for this location  MIAPPE V1.1 (DM-18) Experimental site name - The name of the natural site, experimental field, greenhouse, phenotyping facility, etc. where the experiment took place.
-   * @return locationName
-   **/
+	@JsonProperty("topography")
+	private String topography = null;
+
+	private final transient Gson gson = new Gson();
 
+	public BrAPILocation locationDbId(String locationDbId) {
+		this.locationDbId = locationDbId;
+		return this;
+	}
 
-  public String getLocationName() {
-    return locationName;
-  }
-
-  public void setLocationName(String locationName) {
-    this.locationName = locationName;
-  }
-
-  public BrAPILocation locationType(String locationType) {
-    this.locationType = locationType;
-    return this;
-  }
-
-  /**
-   * The type of location this represents (ex. Breeding Location, Storage Location, etc)
-   * @return locationType
-   **/
-
-
-  public String getLocationType() {
-    return locationType;
-  }
-
-  public void setLocationType(String locationType) {
-    this.locationType = locationType;
-  }
-
-  public BrAPILocation siteStatus(String siteStatus) {
-    this.siteStatus = siteStatus;
-    return this;
-  }
-
-  /**
-   * Description of the accessibility of the location (ex. Public, Private)
-   * @return siteStatus
-   **/
-
-
-  public String getSiteStatus() {
-    return siteStatus;
-  }
-
-  public void setSiteStatus(String siteStatus) {
-    this.siteStatus = siteStatus;
-  }
-
-  public BrAPILocation slope(String slope) {
-    this.slope = slope;
-    return this;
-  }
-
-  /**
-   * Describes the approximate slope (height/distance) of the location.
-   * @return slope
-   **/
-
-
-  public String getSlope() {
-    return slope;
-  }
-
-  public void setSlope(String slope) {
-    this.slope = slope;
-  }
-
-  public BrAPILocation topography(String topography) {
-    this.topography = topography;
-    return this;
-  }
-
-  /**
-   * Describes the topography of the land at the location. (ex. Plateau, Cirque, Hill, Valley, etc)
-   * @return topography
-   **/
-
-
-  public String getTopography() {
-    return topography;
-  }
-
-  public void setTopography(String topography) {
-    this.topography = topography;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPILocation location = (BrAPILocation) o;
-    return Objects.equals(this.locationDbId, location.locationDbId) &&
-            Objects.equals(this.abbreviation, location.abbreviation) &&
-            Objects.equals(this.additionalInfo, location.additionalInfo) &&
-            Objects.equals(this.coordinateDescription, location.coordinateDescription) &&
-            Objects.equals(this.coordinateUncertainty, location.coordinateUncertainty) &&
-            Objects.equals(this.coordinates, location.coordinates) &&
-            Objects.equals(this.countryCode, location.countryCode) &&
-            Objects.equals(this.countryName, location.countryName) &&
-            Objects.equals(this.documentationURL, location.documentationURL) &&
-            Objects.equals(this.environmentType, location.environmentType) &&
-            Objects.equals(this.exposure, location.exposure) &&
-            Objects.equals(this.externalReferences, location.externalReferences) &&
-            Objects.equals(this.instituteAddress, location.instituteAddress) &&
-            Objects.equals(this.instituteName, location.instituteName) &&
-            Objects.equals(this.locationName, location.locationName) &&
-            Objects.equals(this.locationType, location.locationType) &&
-            Objects.equals(this.siteStatus, location.siteStatus) &&
-            Objects.equals(this.slope, location.slope) &&
-            Objects.equals(this.topography, location.topography);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(locationDbId, abbreviation, additionalInfo, coordinateDescription, coordinateUncertainty, coordinates, countryCode, countryName, documentationURL, environmentType, exposure, externalReferences, instituteAddress, instituteName, locationName, locationType, siteStatus, slope, topography);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Location {\n");
-    sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
-    sb.append("    abbreviation: ").append(toIndentedString(abbreviation)).append("\n");
-    sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-    sb.append("    coordinateDescription: ").append(toIndentedString(coordinateDescription)).append("\n");
-    sb.append("    coordinateUncertainty: ").append(toIndentedString(coordinateUncertainty)).append("\n");
-    sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
-    sb.append("    countryCode: ").append(toIndentedString(countryCode)).append("\n");
-    sb.append("    countryName: ").append(toIndentedString(countryName)).append("\n");
-    sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-    sb.append("    environmentType: ").append(toIndentedString(environmentType)).append("\n");
-    sb.append("    exposure: ").append(toIndentedString(exposure)).append("\n");
-    sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-    sb.append("    instituteAddress: ").append(toIndentedString(instituteAddress)).append("\n");
-    sb.append("    instituteName: ").append(toIndentedString(instituteName)).append("\n");
-    sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
-    sb.append("    locationType: ").append(toIndentedString(locationType)).append("\n");
-    sb.append("    siteStatus: ").append(toIndentedString(siteStatus)).append("\n");
-    sb.append("    slope: ").append(toIndentedString(slope)).append("\n");
-    sb.append("    topography: ").append(toIndentedString(topography)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+	/**
+	 * The unique identifier for a Location
+	 * 
+	 * @return locationDbId
+	 **/
+
+	public String getLocationDbId() {
+		return locationDbId;
+	}
+
+	public void setLocationDbId(String locationDbId) {
+		this.locationDbId = locationDbId;
+	}
+
+	public BrAPILocation abbreviation(String abbreviation) {
+		this.abbreviation = abbreviation;
+		return this;
+	}
+
+	/**
+	 * An abbreviation which represents this location
+	 * 
+	 * @return abbreviation
+	 **/
+
+	public String getAbbreviation() {
+		return abbreviation;
+	}
+
+	public void setAbbreviation(String abbreviation) {
+		this.abbreviation = abbreviation;
+	}
+
+	public BrAPILocation additionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+		return this;
+	}
+
+	public BrAPILocation putAdditionalInfoItem(String key, Object additionalInfoItem) {
+		if (this.additionalInfo == null) {
+			this.additionalInfo = new JsonObject();
+		}
+		JsonElement newElement = gson.toJsonTree(additionalInfoItem);
+		this.additionalInfo.add(key, newElement);
+		return this;
+	}
+
+	/**
+	 * Additional arbitrary info
+	 * 
+	 * @return additionalInfo
+	 **/
+
+	public JsonObject getAdditionalInfo() {
+		return additionalInfo;
+	}
+
+	public void setAdditionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+	}
+
+	public BrAPILocation coordinateDescription(String coordinateDescription) {
+		this.coordinateDescription = coordinateDescription;
+		return this;
+	}
+
+	/**
+	 * Describes the precision and landmarks of the coordinate values used for this
+	 * location. (ex. the site, the nearest town, a 10 kilometers radius circle, +/-
+	 * 20 meters, etc)
+	 * 
+	 * @return coordinateDescription
+	 **/
+
+	public String getCoordinateDescription() {
+		return coordinateDescription;
+	}
+
+	public void setCoordinateDescription(String coordinateDescription) {
+		this.coordinateDescription = coordinateDescription;
+	}
+
+	public BrAPILocation coordinateUncertainty(String coordinateUncertainty) {
+		this.coordinateUncertainty = coordinateUncertainty;
+		return this;
+	}
+
+	/**
+	 * Uncertainty associated with the coordinates in meters. Leave the value empty
+	 * if the uncertainty is unknown.
+	 * 
+	 * @return coordinateUncertainty
+	 **/
+
+	public String getCoordinateUncertainty() {
+		return coordinateUncertainty;
+	}
+
+	public void setCoordinateUncertainty(String coordinateUncertainty) {
+		this.coordinateUncertainty = coordinateUncertainty;
+	}
+
+	public BrAPILocation coordinates(BrApiGeoJSON coordinates) {
+		this.coordinates = coordinates;
+		return this;
+	}
+
+	/**
+	 * Get coordinates
+	 * 
+	 * @return coordinates
+	 **/
+
+	public BrApiGeoJSON getCoordinates() {
+		return coordinates;
+	}
+
+	public void setCoordinates(BrApiGeoJSON coordinates) {
+		this.coordinates = coordinates;
+	}
+
+	public BrAPILocation countryCode(String countryCode) {
+		this.countryCode = countryCode;
+		return this;
+	}
+
+	/**
+	 * [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec
+	 * MIAPPE V1.1 (DM-17) Geographic location (country) - The country where the
+	 * experiment took place, either as a full name or preferably as a 2-letter
+	 * code.
+	 * 
+	 * @return countryCode
+	 **/
+
+	public String getCountryCode() {
+		return countryCode;
+	}
+
+	public void setCountryCode(String countryCode) {
+		this.countryCode = countryCode;
+	}
+
+	public BrAPILocation countryName(String countryName) {
+		this.countryName = countryName;
+		return this;
+	}
+
+	/**
+	 * The full name of the country where this location is MIAPPE V1.1 (DM-17)
+	 * Geographic location (country) - The country where the experiment took place,
+	 * either as a full name or preferably as a 2-letter code.
+	 * 
+	 * @return countryName
+	 **/
+
+	public String getCountryName() {
+		return countryName;
+	}
+
+	public void setCountryName(String countryName) {
+		this.countryName = countryName;
+	}
+
+	public BrAPILocation documentationURL(String documentationURL) {
+		this.documentationURL = documentationURL;
+		return this;
+	}
+
+	/**
+	 * A URL to the human readable documentation of this object
+	 * 
+	 * @return documentationURL
+	 **/
+
+	public String getDocumentationURL() {
+		return documentationURL;
+	}
+
+	public void setDocumentationURL(String documentationURL) {
+		this.documentationURL = documentationURL;
+	}
+
+	public BrAPILocation environmentType(String environmentType) {
+		this.environmentType = environmentType;
+		return this;
+	}
+
+	/**
+	 * Describes the general type of environment of the location. (ex. forest,
+	 * field, nursery, etc)
+	 * 
+	 * @return environmentType
+	 **/
+
+	public String getEnvironmentType() {
+		return environmentType;
+	}
+
+	public void setEnvironmentType(String environmentType) {
+		this.environmentType = environmentType;
+	}
+
+	public BrAPILocation exposure(String exposure) {
+		this.exposure = exposure;
+		return this;
+	}
+
+	/**
+	 * Describes the level of protection/exposure for things like sun light and
+	 * wind.
+	 * 
+	 * @return exposure
+	 **/
+
+	public String getExposure() {
+		return exposure;
+	}
+
+	public void setExposure(String exposure) {
+		this.exposure = exposure;
+	}
+
+	public BrAPILocation externalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+		return this;
+	}
+
+	/**
+	 * Get externalReferences
+	 * 
+	 * @return externalReferences
+	 **/
+
+	public List<BrAPIExternalReference> getExternalReferences() {
+		return externalReferences;
+	}
+
+	public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+	}
+
+	public BrAPILocation instituteAddress(String instituteAddress) {
+		this.instituteAddress = instituteAddress;
+		return this;
+	}
+
+	/**
+	 * The street address of the institute representing this location MIAPPE V1.1
+	 * (DM-16) Contact institution - Name and address of the institution responsible
+	 * for the study.
+	 * 
+	 * @return instituteAddress
+	 **/
+
+	public String getInstituteAddress() {
+		return instituteAddress;
+	}
+
+	public void setInstituteAddress(String instituteAddress) {
+		this.instituteAddress = instituteAddress;
+	}
+
+	public BrAPILocation instituteName(String instituteName) {
+		this.instituteName = instituteName;
+		return this;
+	}
+
+	/**
+	 * Each institute/laboratory can have several experimental field MIAPPE V1.1
+	 * (DM-16) Contact institution - Name and address of the institution responsible
+	 * for the study.
+	 * 
+	 * @return instituteName
+	 **/
+
+	public String getInstituteName() {
+		return instituteName;
+	}
+
+	public void setInstituteName(String instituteName) {
+		this.instituteName = instituteName;
+	}
+
+	public BrAPILocation locationName(String locationName) {
+		this.locationName = locationName;
+		return this;
+	}
+
+	/**
+	 * A human readable name for this location MIAPPE V1.1 (DM-18) Experimental site
+	 * name - The name of the natural site, experimental field, greenhouse,
+	 * phenotyping facility, etc. where the experiment took place.
+	 * 
+	 * @return locationName
+	 **/
+
+	public String getLocationName() {
+		return locationName;
+	}
+
+	public void setLocationName(String locationName) {
+		this.locationName = locationName;
+	}
+
+	public BrAPILocation locationType(String locationType) {
+		this.locationType = locationType;
+		return this;
+	}
+
+	/**
+	 * The type of location this represents (ex. Breeding Location, Storage
+	 * Location, etc)
+	 * 
+	 * @return locationType
+	 **/
+
+	public String getLocationType() {
+		return locationType;
+	}
+
+	public void setLocationType(String locationType) {
+		this.locationType = locationType;
+	}
+
+	public BrAPILocation parentLocationDbId(String parentLocationDbId) {
+		this.parentLocationDbId = parentLocationDbId;
+		return this;
+	}
+
+	/**
+	 * The type of location this represents (ex. Breeding Location, Storage
+	 * Location, etc)
+	 * 
+	 * @return locationType
+	 **/
+
+	public String getParentLocationDbId() {
+		return parentLocationDbId;
+	}
+
+	public void setParentLocationDbId(String parentLocationDbId) {
+		this.parentLocationDbId = parentLocationDbId;
+	}
+
+	public BrAPILocation parentLocationName(String parentLocationName) {
+		this.parentLocationName = parentLocationName;
+		return this;
+	}
+
+	/**
+	 * The type of location this represents (ex. Breeding Location, Storage
+	 * Location, etc)
+	 * 
+	 * @return locationType
+	 **/
+
+	public String getParentLocationName() {
+		return parentLocationName;
+	}
+
+	public void setParentLocationName(String parentLocationName) {
+		this.parentLocationName = parentLocationName;
+	}
+
+	public BrAPILocation siteStatus(String siteStatus) {
+		this.siteStatus = siteStatus;
+		return this;
+	}
+
+	/**
+	 * Description of the accessibility of the location (ex. Public, Private)
+	 * 
+	 * @return siteStatus
+	 **/
+
+	public String getSiteStatus() {
+		return siteStatus;
+	}
+
+	public void setSiteStatus(String siteStatus) {
+		this.siteStatus = siteStatus;
+	}
+
+	public BrAPILocation slope(String slope) {
+		this.slope = slope;
+		return this;
+	}
+
+	/**
+	 * Describes the approximate slope (height/distance) of the location.
+	 * 
+	 * @return slope
+	 **/
+
+	public String getSlope() {
+		return slope;
+	}
+
+	public void setSlope(String slope) {
+		this.slope = slope;
+	}
+
+	public BrAPILocation topography(String topography) {
+		this.topography = topography;
+		return this;
+	}
+
+	/**
+	 * Describes the topography of the land at the location. (ex. Plateau, Cirque,
+	 * Hill, Valley, etc)
+	 * 
+	 * @return topography
+	 **/
+
+	public String getTopography() {
+		return topography;
+	}
+
+	public void setTopography(String topography) {
+		this.topography = topography;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPILocation location = (BrAPILocation) o;
+		return Objects.equals(this.locationDbId, location.locationDbId)
+				&& Objects.equals(this.abbreviation, location.abbreviation)
+				&& Objects.equals(this.additionalInfo, location.additionalInfo)
+				&& Objects.equals(this.coordinateDescription, location.coordinateDescription)
+				&& Objects.equals(this.coordinateUncertainty, location.coordinateUncertainty)
+				&& Objects.equals(this.coordinates, location.coordinates)
+				&& Objects.equals(this.countryCode, location.countryCode)
+				&& Objects.equals(this.countryName, location.countryName)
+				&& Objects.equals(this.documentationURL, location.documentationURL)
+				&& Objects.equals(this.environmentType, location.environmentType)
+				&& Objects.equals(this.exposure, location.exposure)
+				&& Objects.equals(this.externalReferences, location.externalReferences)
+				&& Objects.equals(this.instituteAddress, location.instituteAddress)
+				&& Objects.equals(this.instituteName, location.instituteName)
+				&& Objects.equals(this.locationName, location.locationName)
+				&& Objects.equals(this.locationType, location.locationType)
+				&& Objects.equals(this.siteStatus, location.siteStatus) && Objects.equals(this.slope, location.slope)
+				&& Objects.equals(this.topography, location.topography);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(locationDbId, abbreviation, additionalInfo, coordinateDescription, coordinateUncertainty,
+				coordinates, countryCode, countryName, documentationURL, environmentType, exposure, externalReferences,
+				instituteAddress, instituteName, locationName, locationType, siteStatus, slope, topography);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class Location {\n");
+		sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
+		sb.append("    abbreviation: ").append(toIndentedString(abbreviation)).append("\n");
+		sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
+		sb.append("    coordinateDescription: ").append(toIndentedString(coordinateDescription)).append("\n");
+		sb.append("    coordinateUncertainty: ").append(toIndentedString(coordinateUncertainty)).append("\n");
+		sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
+		sb.append("    countryCode: ").append(toIndentedString(countryCode)).append("\n");
+		sb.append("    countryName: ").append(toIndentedString(countryName)).append("\n");
+		sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
+		sb.append("    environmentType: ").append(toIndentedString(environmentType)).append("\n");
+		sb.append("    exposure: ").append(toIndentedString(exposure)).append("\n");
+		sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
+		sb.append("    instituteAddress: ").append(toIndentedString(instituteAddress)).append("\n");
+		sb.append("    instituteName: ").append(toIndentedString(instituteName)).append("\n");
+		sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
+		sb.append("    locationType: ").append(toIndentedString(locationType)).append("\n");
+		sb.append("    siteStatus: ").append(toIndentedString(siteStatus)).append("\n");
+		sb.append("    slope: ").append(toIndentedString(slope)).append("\n");
+		sb.append("    topography: ").append(toIndentedString(topography)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPILocationSearchRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPILocationSearchRequest.java
index 909008a2..4ae17a1c 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPILocationSearchRequest.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/core/request/BrAPILocationSearchRequest.java
@@ -7,457 +7,644 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-
 import org.brapi.v2.model.BrApiGeoJSON;
 import org.brapi.v2.model.BrAPISearchRequestParametersPaging;
 
 /**
- * LocationSearchRequest
+ * BrAPILocationSearchRequest
  */
 
+public class BrAPILocationSearchRequest extends BrAPISearchRequestParametersPaging {
+	@JsonProperty("abbreviations")
+	private List<String> abbreviations = null;
+
+	@JsonProperty("altitudeMax")
+	private BigDecimal altitudeMax = null;
+
+	@JsonProperty("altitudeMin")
+	private BigDecimal altitudeMin = null;
+
+	@JsonProperty("commonCropNames")
+	private List<String> commonCropNames = null;
+
+	@JsonProperty("coordinates")
+	private BrApiGeoJSON coordinates = null;
+
+	@JsonProperty("countryCodes")
+	private List<String> countryCodes = null;
+
+	@JsonProperty("countryNames")
+	private List<String> countryNames = null;
+
+	@Deprecated
+	@JsonProperty("externalReferenceIDs")
+	private List<String> externalReferenceIDs = null;
+
+	@JsonProperty("externalReferenceIds")
+	private List<String> externalReferenceIds = null;
+
+	@JsonProperty("externalReferenceSources")
+	private List<String> externalReferenceSources = null;
+
+	@JsonProperty("instituteAddresses")
+	private List<String> instituteAddresses = null;
+
+	@JsonProperty("instituteNames")
+	private List<String> instituteNames = null;
+
+	@JsonProperty("locationDbIds")
+	private List<String> locationDbIds = null;
+
+	@JsonProperty("locationNames")
+	private List<String> locationNames = null;
+
+	@JsonProperty("locationTypes")
+	private List<String> locationTypes = null;
+
+	@JsonProperty("parentLocationDbIds")
+	private List<String> parentLocationDbIds = null;
+
+	@JsonProperty("parentLocationNames")
+	private List<String> parentLocationNames = null;
+
+	@JsonProperty("programDbIds")
+	private List<String> programDbIds = null;
+
+	@JsonProperty("programNames")
+	private List<String> programNames = null;
+
+	public BrAPILocationSearchRequest abbreviations(List<String> abbreviations) {
+		this.abbreviations = abbreviations;
+		return this;
+	}
+
+	public BrAPILocationSearchRequest addAbbreviationsItem(String abbreviationsItem) {
+		if (this.abbreviations == null) {
+			this.abbreviations = new ArrayList<String>();
+		}
+		this.abbreviations.add(abbreviationsItem);
+		return this;
+	}
+
+	/**
+	 * A list of shortened human readable names for a set of Locations
+	 *
+	 * @return abbreviations
+	 **/
+	public List<String> getAbbreviations() {
+		return abbreviations;
+	}
+
+	public void setAbbreviations(List<String> abbreviations) {
+		this.abbreviations = abbreviations;
+	}
+
+	public BrAPILocationSearchRequest altitudeMax(BigDecimal altitudeMax) {
+		this.altitudeMax = altitudeMax;
+		return this;
+	}
+
+	/**
+	 * The maximum altitude to search for
+	 *
+	 * @return altitudeMax
+	 **/
+	public BigDecimal getAltitudeMax() {
+		return altitudeMax;
+	}
+
+	public void setAltitudeMax(BigDecimal altitudeMax) {
+		this.altitudeMax = altitudeMax;
+	}
+
+	public BrAPILocationSearchRequest altitudeMin(BigDecimal altitudeMin) {
+		this.altitudeMin = altitudeMin;
+		return this;
+	}
+
+	/**
+	 * The minimum altitude to search for
+	 *
+	 * @return altitudeMin
+	 **/
+	public BigDecimal getAltitudeMin() {
+		return altitudeMin;
+	}
+
+	public void setAltitudeMin(BigDecimal altitudeMin) {
+		this.altitudeMin = altitudeMin;
+	}
+
+	public BrAPILocationSearchRequest commonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+		return this;
+	}
+
+	public BrAPILocationSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
+		if (this.commonCropNames == null) {
+			this.commonCropNames = new ArrayList<String>();
+		}
+		this.commonCropNames.add(commonCropNamesItem);
+		return this;
+	}
+
+	/**
+	 * The BrAPI Common Crop Name is the simple, generalized, widely accepted name
+	 * of the organism being researched. It is most often used in multi-crop systems
+	 * where digital resources need to be divided at a high level. Things like
+	 * &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of
+	 * common crop names. Use this parameter to only return results associated with
+	 * the given crops. Use &#x60;GET /commoncropnames&#x60; to find the list of
+	 * available crops on a server.
+	 *
+	 * @return commonCropNames
+	 **/
+	public List<String> getCommonCropNames() {
+		return commonCropNames;
+	}
+
+	public void setCommonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+	}
+
+	public BrAPILocationSearchRequest coordinates(BrApiGeoJSON coordinates) {
+		this.coordinates = coordinates;
+		return this;
+	}
+
+	/**
+	 * Get coordinates
+	 *
+	 * @return coordinates
+	 **/
+	public BrApiGeoJSON getCoordinates() {
+		return coordinates;
+	}
+
+	public void setCoordinates(BrApiGeoJSON coordinates) {
+		this.coordinates = coordinates;
+	}
+
+	public BrAPILocationSearchRequest countryCodes(List<String> countryCodes) {
+		this.countryCodes = countryCodes;
+		return this;
+	}
+
+	public BrAPILocationSearchRequest addCountryCodesItem(String countryCodesItem) {
+		if (this.countryCodes == null) {
+			this.countryCodes = new ArrayList<String>();
+		}
+		this.countryCodes.add(countryCodesItem);
+		return this;
+	}
+
+	/**
+	 * [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec
+	 *
+	 * @return countryCodes
+	 **/
+	public List<String> getCountryCodes() {
+		return countryCodes;
+	}
+
+	public void setCountryCodes(List<String> countryCodes) {
+		this.countryCodes = countryCodes;
+	}
+
+	public BrAPILocationSearchRequest countryNames(List<String> countryNames) {
+		this.countryNames = countryNames;
+		return this;
+	}
+
+	public BrAPILocationSearchRequest addCountryNamesItem(String countryNamesItem) {
+		if (this.countryNames == null) {
+			this.countryNames = new ArrayList<String>();
+		}
+		this.countryNames.add(countryNamesItem);
+		return this;
+	}
+
+	/**
+	 * The full name of the country to search for
+	 *
+	 * @return countryNames
+	 **/
+	public List<String> getCountryNames() {
+		return countryNames;
+	}
+
+	public void setCountryNames(List<String> countryNames) {
+		this.countryNames = countryNames;
+	}
+
+	public BrAPILocationSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+		return this;
+	}
+
+	@Deprecated
+	public BrAPILocationSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
+		if (this.externalReferenceIDs == null) {
+			this.externalReferenceIDs = new ArrayList<String>();
+		}
+		this.externalReferenceIDs.add(externalReferenceIDsItem);
+		return this;
+	}
+
+	/**
+	 * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github
+	 * issue number #460 &lt;br&gt;List of external reference IDs. Could be a simple
+	 * strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
+	 *
+	 * @return externalReferenceIDs
+	 **/
+
+	@Deprecated
+	public List<String> getExternalReferenceIDs() {
+		return externalReferenceIDs;
+	}
+
+	@Deprecated
+	public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+	}
+
+	public BrAPILocationSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+		return this;
+	}
+
+	public BrAPILocationSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
+		if (this.externalReferenceIds == null) {
+			this.externalReferenceIds = new ArrayList<String>();
+		}
+		this.externalReferenceIds.add(externalReferenceIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of external reference IDs. Could be a simple strings or a URIs. (use
+	 * with &#x60;externalReferenceSources&#x60; parameter)
+	 *
+	 * @return externalReferenceIds
+	 **/
+	public List<String> getExternalReferenceIds() {
+		return externalReferenceIds;
+	}
+
+	public void setExternalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+	}
+
+	public BrAPILocationSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+		return this;
+	}
+
+	public BrAPILocationSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
+		if (this.externalReferenceSources == null) {
+			this.externalReferenceSources = new ArrayList<String>();
+		}
+		this.externalReferenceSources.add(externalReferenceSourcesItem);
+		return this;
+	}
+
+	/**
+	 * List of identifiers for the source system or database of an external
+	 * reference (use with &#x60;externalReferenceIDs&#x60; parameter)
+	 *
+	 * @return externalReferenceSources
+	 **/
+	public List<String> getExternalReferenceSources() {
+		return externalReferenceSources;
+	}
+
+	public void setExternalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+	}
+
+	public BrAPILocationSearchRequest instituteAddresses(List<String> instituteAddresses) {
+		this.instituteAddresses = instituteAddresses;
+		return this;
+	}
+
+	public BrAPILocationSearchRequest addInstituteAddressesItem(String instituteAddressesItem) {
+		if (this.instituteAddresses == null) {
+			this.instituteAddresses = new ArrayList<String>();
+		}
+		this.instituteAddresses.add(instituteAddressesItem);
+		return this;
+	}
+
+	/**
+	 * The street address of the institute to search for
+	 *
+	 * @return instituteAddresses
+	 **/
+	public List<String> getInstituteAddresses() {
+		return instituteAddresses;
+	}
+
+	public void setInstituteAddresses(List<String> instituteAddresses) {
+		this.instituteAddresses = instituteAddresses;
+	}
+
+	public BrAPILocationSearchRequest instituteNames(List<String> instituteNames) {
+		this.instituteNames = instituteNames;
+		return this;
+	}
+
+	public BrAPILocationSearchRequest addInstituteNamesItem(String instituteNamesItem) {
+		if (this.instituteNames == null) {
+			this.instituteNames = new ArrayList<String>();
+		}
+		this.instituteNames.add(instituteNamesItem);
+		return this;
+	}
+
+	/**
+	 * The name of the institute to search for
+	 *
+	 * @return instituteNames
+	 **/
+	public List<String> getInstituteNames() {
+		return instituteNames;
+	}
+
+	public void setInstituteNames(List<String> instituteNames) {
+		this.instituteNames = instituteNames;
+	}
+
+	public BrAPILocationSearchRequest locationDbIds(List<String> locationDbIds) {
+		this.locationDbIds = locationDbIds;
+		return this;
+	}
+
+	public BrAPILocationSearchRequest addLocationDbIdsItem(String locationDbIdsItem) {
+		if (this.locationDbIds == null) {
+			this.locationDbIds = new ArrayList<String>();
+		}
+		this.locationDbIds.add(locationDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The location ids to search for
+	 *
+	 * @return locationDbIds
+	 **/
+	public List<String> getLocationDbIds() {
+		return locationDbIds;
+	}
+
+	public void setLocationDbIds(List<String> locationDbIds) {
+		this.locationDbIds = locationDbIds;
+	}
+
+	public BrAPILocationSearchRequest locationNames(List<String> locationNames) {
+		this.locationNames = locationNames;
+		return this;
+	}
+
+	public BrAPILocationSearchRequest addLocationNamesItem(String locationNamesItem) {
+		if (this.locationNames == null) {
+			this.locationNames = new ArrayList<String>();
+		}
+		this.locationNames.add(locationNamesItem);
+		return this;
+	}
+
+	/**
+	 * A human readable names to search for
+	 *
+	 * @return locationNames
+	 **/
+	public List<String> getLocationNames() {
+		return locationNames;
+	}
+
+	public void setLocationNames(List<String> locationNames) {
+		this.locationNames = locationNames;
+	}
+
+	public BrAPILocationSearchRequest locationTypes(List<String> locationTypes) {
+		this.locationTypes = locationTypes;
+		return this;
+	}
+
+	public BrAPILocationSearchRequest addLocationTypesItem(String locationTypesItem) {
+		if (this.locationTypes == null) {
+			this.locationTypes = new ArrayList<String>();
+		}
+		this.locationTypes.add(locationTypesItem);
+		return this;
+	}
+
+	/**
+	 * The type of location this represents (ex. Breeding Location, Storage
+	 * Location, etc)
+	 *
+	 * @return locationTypes
+	 **/
+	public List<String> getLocationTypes() {
+		return locationTypes;
+	}
+
+	public void setLocationTypes(List<String> locationTypes) {
+		this.locationTypes = locationTypes;
+	}
+
+	public BrAPILocationSearchRequest parentLocationDbIds(List<String> parentLocationDbIds) {
+		this.parentLocationDbIds = parentLocationDbIds;
+		return this;
+	}
+
+	public BrAPILocationSearchRequest addParentLocationDbIdsItem(String parentLocationDbIdsItem) {
+		if (this.parentLocationDbIds == null) {
+			this.parentLocationDbIds = new ArrayList<String>();
+		}
+		this.parentLocationDbIds.add(parentLocationDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The unique identifier for a Location &lt;br/&gt; The Parent Location defines
+	 * the encompassing location that this location belongs to. For example, an
+	 * Institution might have multiple Field Stations inside it and each Field
+	 * Station might have multiple Fields.
+	 *
+	 * @return parentLocationDbIds
+	 **/
+	public List<String> getParentLocationDbIds() {
+		return parentLocationDbIds;
+	}
+
+	public void setParentLocationDbIds(List<String> parentLocationDbIds) {
+		this.parentLocationDbIds = parentLocationDbIds;
+	}
+
+	public BrAPILocationSearchRequest parentLocationNames(List<String> parentLocationNames) {
+		this.parentLocationNames = parentLocationNames;
+		return this;
+	}
+
+	public BrAPILocationSearchRequest addParentLocationNamesItem(String parentLocationNamesItem) {
+		if (this.parentLocationNames == null) {
+			this.parentLocationNames = new ArrayList<String>();
+		}
+		this.parentLocationNames.add(parentLocationNamesItem);
+		return this;
+	}
+
+	/**
+	 * A human readable name for a location &lt;br/&gt; The Parent Location defines
+	 * the encompassing location that this location belongs to. For example, an
+	 * Institution might have multiple Field Stations inside it and each Field
+	 * Station might have multiple Fields.
+	 *
+	 * @return parentLocationNames
+	 **/
+	public List<String> getParentLocationNames() {
+		return parentLocationNames;
+	}
+
+	public void setParentLocationNames(List<String> parentLocationNames) {
+		this.parentLocationNames = parentLocationNames;
+	}
+
+	public BrAPILocationSearchRequest programDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+		return this;
+	}
+
+	public BrAPILocationSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
+		if (this.programDbIds == null) {
+			this.programDbIds = new ArrayList<String>();
+		}
+		this.programDbIds.add(programDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * A BrAPI Program represents the high level organization or group who is
+	 * responsible for conducting trials and studies. Things like Breeding Programs
+	 * and Funded Projects are considered BrAPI Programs. Use this parameter to only
+	 * return results associated with the given programs. Use &#x60;GET
+	 * /programs&#x60; to find the list of available programs on a server.
+	 *
+	 * @return programDbIds
+	 **/
+	public List<String> getProgramDbIds() {
+		return programDbIds;
+	}
+
+	public void setProgramDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+	}
+
+	public BrAPILocationSearchRequest programNames(List<String> programNames) {
+		this.programNames = programNames;
+		return this;
+	}
+
+	public BrAPILocationSearchRequest addProgramNamesItem(String programNamesItem) {
+		if (this.programNames == null) {
+			this.programNames = new ArrayList<String>();
+		}
+		this.programNames.add(programNamesItem);
+		return this;
+	}
+
+	/**
+	 * Use this parameter to only return results associated with the given program
+	 * names. Program names are not required to be unique. Use &#x60;GET
+	 * /programs&#x60; to find the list of available programs on a server.
+	 *
+	 * @return programNames
+	 **/
+	public List<String> getProgramNames() {
+		return programNames;
+	}
+
+	public void setProgramNames(List<String> programNames) {
+		this.programNames = programNames;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPILocationSearchRequest locationSearchRequest = (BrAPILocationSearchRequest) o;
+		return Objects.equals(this.abbreviations, locationSearchRequest.abbreviations)
+				&& Objects.equals(this.altitudeMax, locationSearchRequest.altitudeMax)
+				&& Objects.equals(this.altitudeMin, locationSearchRequest.altitudeMin)
+				&& Objects.equals(this.commonCropNames, locationSearchRequest.commonCropNames)
+				&& Objects.equals(this.coordinates, locationSearchRequest.coordinates)
+				&& Objects.equals(this.countryCodes, locationSearchRequest.countryCodes)
+				&& Objects.equals(this.countryNames, locationSearchRequest.countryNames)
+				&& Objects.equals(this.externalReferenceIDs, locationSearchRequest.externalReferenceIDs)
+				&& Objects.equals(this.externalReferenceIds, locationSearchRequest.externalReferenceIds)
+				&& Objects.equals(this.externalReferenceSources, locationSearchRequest.externalReferenceSources)
+				&& Objects.equals(this.instituteAddresses, locationSearchRequest.instituteAddresses)
+				&& Objects.equals(this.instituteNames, locationSearchRequest.instituteNames)
+				&& Objects.equals(this.locationDbIds, locationSearchRequest.locationDbIds)
+				&& Objects.equals(this.locationNames, locationSearchRequest.locationNames)
+				&& Objects.equals(this.locationTypes, locationSearchRequest.locationTypes)
+				&& Objects.equals(this.parentLocationDbIds, locationSearchRequest.parentLocationDbIds)
+				&& Objects.equals(this.parentLocationNames, locationSearchRequest.parentLocationNames)
+				&& Objects.equals(this.programDbIds, locationSearchRequest.programDbIds)
+				&& Objects.equals(this.programNames, locationSearchRequest.programNames);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(abbreviations, altitudeMax, altitudeMin, commonCropNames, coordinates, countryCodes,
+				countryNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, instituteAddresses,
+				instituteNames, locationDbIds, locationNames, locationTypes, parentLocationDbIds, parentLocationNames,
+				programDbIds, programNames);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class BrAPILocationSearchRequest {\n");
+
+		sb.append("    abbreviations: ").append(toIndentedString(abbreviations)).append("\n");
+		sb.append("    altitudeMax: ").append(toIndentedString(altitudeMax)).append("\n");
+		sb.append("    altitudeMin: ").append(toIndentedString(altitudeMin)).append("\n");
+		sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
+		sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
+		sb.append("    countryCodes: ").append(toIndentedString(countryCodes)).append("\n");
+		sb.append("    countryNames: ").append(toIndentedString(countryNames)).append("\n");
+		sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
+		sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
+		sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
+		sb.append("    instituteAddresses: ").append(toIndentedString(instituteAddresses)).append("\n");
+		sb.append("    instituteNames: ").append(toIndentedString(instituteNames)).append("\n");
+		sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
+		sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
+		sb.append("    locationTypes: ").append(toIndentedString(locationTypes)).append("\n");
+		sb.append("    parentLocationDbIds: ").append(toIndentedString(parentLocationDbIds)).append("\n");
+		sb.append("    parentLocationNames: ").append(toIndentedString(parentLocationNames)).append("\n");
+		sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
+		sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 
-public class BrAPILocationSearchRequest extends BrAPISearchRequestParametersPaging  {
-  @JsonProperty("externalReferenceIDs")
-  @Valid
-  private List<String> externalReferenceIDs = null;
-
-  @JsonProperty("externalReferenceSources")
-  @Valid
-  private List<String> externalReferenceSources = null;
-
-  @JsonProperty("locationDbIds")
-  @Valid
-  private List<String> locationDbIds = null;
-
-  @JsonProperty("locationNames")
-  @Valid
-  private List<String> locationNames = null;
-
-  @JsonProperty("abbreviations")
-  @Valid
-  private List<String> abbreviations = null;
-
-  @JsonProperty("altitudeMax")
-  private BigDecimal altitudeMax = null;
-
-  @JsonProperty("altitudeMin")
-  private BigDecimal altitudeMin = null;
-
-  @JsonProperty("coordinates")
-  private BrApiGeoJSON coordinates = null;
-
-  @JsonProperty("countryCodes")
-  @Valid
-  private List<String> countryCodes = null;
-
-  @JsonProperty("countryNames")
-  @Valid
-  private List<String> countryNames = null;
-
-  @JsonProperty("instituteAddresses")
-  @Valid
-  private List<String> instituteAddresses = null;
-
-  @JsonProperty("instituteNames")
-  @Valid
-  private List<String> instituteNames = null;
-
-  @JsonProperty("locationTypes")
-  @Valid
-  private List<String> locationTypes = null;
-
-  public BrAPILocationSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-    return this;
-  }
-
-  public BrAPILocationSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-    if (this.externalReferenceIDs == null) {
-      this.externalReferenceIDs = new ArrayList<String>();
-    }
-    this.externalReferenceIDs.add(externalReferenceIDsItem);
-    return this;
-  }
-
-  /**
-   * List of external references for the trait to search for
-   * @return externalReferenceIDs
-  **/
-  
-  
-    public List<String> getExternalReferenceIDs() {
-    return externalReferenceIDs;
-  }
-
-  public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-  }
-
-  public BrAPILocationSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-    return this;
-  }
-
-  public BrAPILocationSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-    if (this.externalReferenceSources == null) {
-      this.externalReferenceSources = new ArrayList<String>();
-    }
-    this.externalReferenceSources.add(externalReferenceSourcesItem);
-    return this;
-  }
-
-  /**
-   * List of external references sources for the trait to search for
-   * @return externalReferenceSources
-  **/
-  
-  
-    public List<String> getExternalReferenceSources() {
-    return externalReferenceSources;
-  }
-
-  public void setExternalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-  }
-
-  public BrAPILocationSearchRequest locationDbIds(List<String> locationDbIds) {
-    this.locationDbIds = locationDbIds;
-    return this;
-  }
-
-  public BrAPILocationSearchRequest addLocationDbIdsItem(String locationDbIdsItem) {
-    if (this.locationDbIds == null) {
-      this.locationDbIds = new ArrayList<String>();
-    }
-    this.locationDbIds.add(locationDbIdsItem);
-    return this;
-  }
-
-  /**
-   * The location ids to search for
-   * @return locationDbIds
-  **/
-  
-  
-    public List<String> getLocationDbIds() {
-    return locationDbIds;
-  }
-
-  public void setLocationDbIds(List<String> locationDbIds) {
-    this.locationDbIds = locationDbIds;
-  }
-
-  public BrAPILocationSearchRequest locationNames(List<String> locationNames) {
-    this.locationNames = locationNames;
-    return this;
-  }
-
-  public BrAPILocationSearchRequest addLocationNamesItem(String locationNamesItem) {
-    if (this.locationNames == null) {
-      this.locationNames = new ArrayList<String>();
-    }
-    this.locationNames.add(locationNamesItem);
-    return this;
-  }
-
-  /**
-   * A human readable names to search for
-   * @return locationNames
-  **/
-  
-  
-    public List<String> getLocationNames() {
-    return locationNames;
-  }
-
-  public void setLocationNames(List<String> locationNames) {
-    this.locationNames = locationNames;
-  }
-
-  public BrAPILocationSearchRequest abbreviations(List<String> abbreviations) {
-    this.abbreviations = abbreviations;
-    return this;
-  }
-
-  public BrAPILocationSearchRequest addAbbreviationsItem(String abbreviationsItem) {
-    if (this.abbreviations == null) {
-      this.abbreviations = new ArrayList<String>();
-    }
-    this.abbreviations.add(abbreviationsItem);
-    return this;
-  }
-
-  /**
-   * An abbreviation which represents this location
-   * @return abbreviations
-  **/
-  
-  
-    public List<String> getAbbreviations() {
-    return abbreviations;
-  }
-
-  public void setAbbreviations(List<String> abbreviations) {
-    this.abbreviations = abbreviations;
-  }
-
-  public BrAPILocationSearchRequest altitudeMax(BigDecimal altitudeMax) {
-    this.altitudeMax = altitudeMax;
-    return this;
-  }
-
-  /**
-   * The maximum altitude to search for
-   * @return altitudeMax
-  **/
-  
-  
-    @Valid
-    public BigDecimal getAltitudeMax() {
-    return altitudeMax;
-  }
-
-  public void setAltitudeMax(BigDecimal altitudeMax) {
-    this.altitudeMax = altitudeMax;
-  }
-
-  public BrAPILocationSearchRequest altitudeMin(BigDecimal altitudeMin) {
-    this.altitudeMin = altitudeMin;
-    return this;
-  }
-
-  /**
-   * The minimum altitude to search for
-   * @return altitudeMin
-  **/
-  
-  
-    @Valid
-    public BigDecimal getAltitudeMin() {
-    return altitudeMin;
-  }
-
-  public void setAltitudeMin(BigDecimal altitudeMin) {
-    this.altitudeMin = altitudeMin;
-  }
-
-  public BrAPILocationSearchRequest coordinates(BrApiGeoJSON coordinates) {
-    this.coordinates = coordinates;
-    return this;
-  }
-
-  /**
-   * Get coordinates
-   * @return coordinates
-  **/
-  
-  
-    @Valid
-    public BrApiGeoJSON getCoordinates() {
-    return coordinates;
-  }
-
-  public void setCoordinates(BrApiGeoJSON coordinates) {
-    this.coordinates = coordinates;
-  }
-
-  public BrAPILocationSearchRequest countryCodes(List<String> countryCodes) {
-    this.countryCodes = countryCodes;
-    return this;
-  }
-
-  public BrAPILocationSearchRequest addCountryCodesItem(String countryCodesItem) {
-    if (this.countryCodes == null) {
-      this.countryCodes = new ArrayList<String>();
-    }
-    this.countryCodes.add(countryCodesItem);
-    return this;
-  }
-
-  /**
-   * [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec
-   * @return countryCodes
-  **/
-  
-  
-    public List<String> getCountryCodes() {
-    return countryCodes;
-  }
-
-  public void setCountryCodes(List<String> countryCodes) {
-    this.countryCodes = countryCodes;
-  }
-
-  public BrAPILocationSearchRequest countryNames(List<String> countryNames) {
-    this.countryNames = countryNames;
-    return this;
-  }
-
-  public BrAPILocationSearchRequest addCountryNamesItem(String countryNamesItem) {
-    if (this.countryNames == null) {
-      this.countryNames = new ArrayList<String>();
-    }
-    this.countryNames.add(countryNamesItem);
-    return this;
-  }
-
-  /**
-   * The full name of the country to search for
-   * @return countryNames
-  **/
-  
-  
-    public List<String> getCountryNames() {
-    return countryNames;
-  }
-
-  public void setCountryNames(List<String> countryNames) {
-    this.countryNames = countryNames;
-  }
-
-  public BrAPILocationSearchRequest instituteAddresses(List<String> instituteAddresses) {
-    this.instituteAddresses = instituteAddresses;
-    return this;
-  }
-
-  public BrAPILocationSearchRequest addInstituteAddressesItem(String instituteAddressesItem) {
-    if (this.instituteAddresses == null) {
-      this.instituteAddresses = new ArrayList<String>();
-    }
-    this.instituteAddresses.add(instituteAddressesItem);
-    return this;
-  }
-
-  /**
-   * The street address of the institute to search for
-   * @return instituteAddresses
-  **/
-  
-  
-    public List<String> getInstituteAddresses() {
-    return instituteAddresses;
-  }
-
-  public void setInstituteAddresses(List<String> instituteAddresses) {
-    this.instituteAddresses = instituteAddresses;
-  }
-
-  public BrAPILocationSearchRequest instituteNames(List<String> instituteNames) {
-    this.instituteNames = instituteNames;
-    return this;
-  }
-
-  public BrAPILocationSearchRequest addInstituteNamesItem(String instituteNamesItem) {
-    if (this.instituteNames == null) {
-      this.instituteNames = new ArrayList<String>();
-    }
-    this.instituteNames.add(instituteNamesItem);
-    return this;
-  }
-
-  /**
-   * The name of the institute to search for
-   * @return instituteNames
-  **/
-  
-  
-    public List<String> getInstituteNames() {
-    return instituteNames;
-  }
-
-  public void setInstituteNames(List<String> instituteNames) {
-    this.instituteNames = instituteNames;
-  }
-
-  public BrAPILocationSearchRequest locationTypes(List<String> locationTypes) {
-    this.locationTypes = locationTypes;
-    return this;
-  }
-
-  public BrAPILocationSearchRequest addLocationTypesItem(String locationTypesItem) {
-    if (this.locationTypes == null) {
-      this.locationTypes = new ArrayList<String>();
-    }
-    this.locationTypes.add(locationTypesItem);
-    return this;
-  }
-
-  /**
-   * The type of location this represents (ex. Breeding Location, Storage Location, etc)
-   * @return locationTypes
-  **/
-  
-  
-    public List<String> getLocationTypes() {
-    return locationTypes;
-  }
-
-  public void setLocationTypes(List<String> locationTypes) {
-    this.locationTypes = locationTypes;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPILocationSearchRequest locationSearchRequest = (BrAPILocationSearchRequest) o;
-    return Objects.equals(this.externalReferenceIDs, locationSearchRequest.externalReferenceIDs) &&
-        Objects.equals(this.externalReferenceSources, locationSearchRequest.externalReferenceSources) &&
-        Objects.equals(this.locationDbIds, locationSearchRequest.locationDbIds) &&
-        Objects.equals(this.locationNames, locationSearchRequest.locationNames) &&
-        Objects.equals(this.abbreviations, locationSearchRequest.abbreviations) &&
-        Objects.equals(this.altitudeMax, locationSearchRequest.altitudeMax) &&
-        Objects.equals(this.altitudeMin, locationSearchRequest.altitudeMin) &&
-        Objects.equals(this.coordinates, locationSearchRequest.coordinates) &&
-        Objects.equals(this.countryCodes, locationSearchRequest.countryCodes) &&
-        Objects.equals(this.countryNames, locationSearchRequest.countryNames) &&
-        Objects.equals(this.instituteAddresses, locationSearchRequest.instituteAddresses) &&
-        Objects.equals(this.instituteNames, locationSearchRequest.instituteNames) &&
-        Objects.equals(this.locationTypes, locationSearchRequest.locationTypes) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(externalReferenceIDs, externalReferenceSources, locationDbIds, locationNames, abbreviations, altitudeMax, altitudeMin, coordinates, countryCodes, countryNames, instituteAddresses, instituteNames, locationTypes, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class LocationSearchRequest {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-    sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-    sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-    sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-    sb.append("    abbreviations: ").append(toIndentedString(abbreviations)).append("\n");
-    sb.append("    altitudeMax: ").append(toIndentedString(altitudeMax)).append("\n");
-    sb.append("    altitudeMin: ").append(toIndentedString(altitudeMin)).append("\n");
-    sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
-    sb.append("    countryCodes: ").append(toIndentedString(countryCodes)).append("\n");
-    sb.append("    countryNames: ").append(toIndentedString(countryNames)).append("\n");
-    sb.append("    instituteAddresses: ").append(toIndentedString(instituteAddresses)).append("\n");
-    sb.append("    instituteNames: ").append(toIndentedString(instituteNames)).append("\n");
-    sb.append("    locationTypes: ").append(toIndentedString(locationTypes)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
 }

From 4381dd25c6d52bf2a7f9b7e717eb347d637b3631 Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Mon, 21 Aug 2023 12:07:37 -0400
Subject: [PATCH 18/28] fixes issues #87, #88, #89, #90, #142, #141. dependent
 on #199

---
 .../germplasm/GermplasmQueryParams.java       |   48 +-
 .../brapi/v2/model/germ/BrAPIGermplasm.java   |  113 +-
 .../v2/model/germ/BrAPIGermplasmDonors.java   |  226 +--
 .../request/BrAPIGermplasmSearchRequest.java  | 1342 ++++++++++-------
 4 files changed, 996 insertions(+), 733 deletions(-)

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmQueryParams.java
index cbef452f..205b0e02 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmQueryParams.java
@@ -26,38 +26,42 @@
 
 import org.brapi.client.v2.model.queryParams.core.BrAPIQueryParams;
 
-
 @Getter
 @Setter
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(fluent=true)
+@Accessors(fluent = true)
 public class GermplasmQueryParams extends BrAPIQueryParams {
 
-    private String germplasmPUI;
-    private String germplasmDbId;
-    private String germplasmName;
-    private String commonCropName;
-    private String accessionNumber;
-    private String collection;
-    private String genus;
-    private String species;
-    private String studyDbId;
-    private String synonym;
-    private String parentDbId;
-    private String progenyDbId;
-    private String externalReferenceSource;
-    private String externalReferenceId;
-    @Deprecated
-    private String externalReferenceID;
-    
-    public String getExternalReferenceId() {
+	private String germplasmPUI;
+	private String germplasmDbId;
+	private String germplasmName;
+	private String commonCropName;
+	private String accessionNumber;
+	private String collection;
+	private String genus;
+	private String species;
+	private String binomialName;
+	private String programDbId;
+	private String trialDbId;
+	private String studyDbId;
+	private String synonym;
+	private String parentDbId;
+	private String progenyDbId;
+	private String externalReferenceSource;
+	private String externalReferenceId;
+	@Deprecated
+	private String externalReferenceID;
+
+	public String getExternalReferenceId() {
 		return externalReferenceId;
 	}
-    public String externalReferenceId() {
+
+	public String externalReferenceId() {
 		return externalReferenceId;
 	}
+
 	public void setExternalReferenceId(String externalReferenceId) {
 		this.externalReferenceId = externalReferenceId;
 	}
@@ -66,10 +70,12 @@ public void setExternalReferenceId(String externalReferenceId) {
 	public String getExternalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public String externalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIGermplasm.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIGermplasm.java
index 8c4e5625..95085392 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIGermplasm.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIGermplasm.java
@@ -12,14 +12,10 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.brapi.v2.model.NullableJsonElementTypeAdapterFactory;
 
-import javax.validation.Valid;
-
-
 /**
  * Germplasm
  */
 
-
 public class BrAPIGermplasm {
 	@JsonProperty("germplasmDbId")
 	private String germplasmDbId = null;
@@ -31,8 +27,7 @@ public class BrAPIGermplasm {
 	private LocalDate acquisitionDate = null;
 
 	@JsonProperty("additionalInfo")
-    @Valid
-    @JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
+	@JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
 	private JsonObject additionalInfo = null;
 
 	@JsonProperty("biologicalStatusOfAccessionCode")
@@ -44,6 +39,9 @@ public class BrAPIGermplasm {
 	@JsonProperty("breedingMethodDbId")
 	private String breedingMethodDbId = null;
 
+	@JsonProperty("breedingMethodName")
+	private String breedingMethodName = null;
+
 	@JsonProperty("collection")
 	private String collection = null;
 
@@ -60,7 +58,6 @@ public class BrAPIGermplasm {
 	private String documentationURL = null;
 
 	@JsonProperty("donors")
-	@Valid
 	private List<BrAPIGermplasmDonors> donors = null;
 
 	@JsonProperty("externalReferences")
@@ -73,7 +70,7 @@ public class BrAPIGermplasm {
 	private String germplasmName = null;
 
 	@JsonProperty("germplasmOrigin")
-	@Valid
+
 	private List<BrAPIGermplasmOrigin> germplasmOrigin = null;
 
 	@JsonProperty("germplasmPUI")
@@ -104,7 +101,7 @@ public class BrAPIGermplasm {
 	private String speciesAuthority = null;
 
 	@JsonProperty("storageTypes")
-	@Valid
+
 	private List<BrAPIGermplasmStorageTypes> storageTypes = null;
 
 	@JsonProperty("subtaxa")
@@ -114,11 +111,11 @@ public class BrAPIGermplasm {
 	private String subtaxaAuthority = null;
 
 	@JsonProperty("synonyms")
-	@Valid
+
 	private List<BrAPIGermplasmSynonyms> synonyms = null;
 
 	@JsonProperty("taxonIds")
-	@Valid
+
 	private List<BrAPITaxonID> taxonIds = null;
 
 	private final transient Gson gson = new Gson();
@@ -139,8 +136,6 @@ public BrAPIGermplasm germplasmDbId(String germplasmDbId) {
 	 * @return germplasmDbId
 	 **/
 
-
-
 	public String getGermplasmDbId() {
 		return germplasmDbId;
 	}
@@ -161,7 +156,6 @@ public BrAPIGermplasm accessionNumber(String accessionNumber) {
 	 * @return accessionNumber
 	 **/
 
-
 	public String getAccessionNumber() {
 		return accessionNumber;
 	}
@@ -184,8 +178,6 @@ public BrAPIGermplasm acquisitionDate(LocalDate acquisitionDate) {
 	 * @return acquisitionDate
 	 **/
 
-
-	@Valid
 	public LocalDate getAcquisitionDate() {
 		return acquisitionDate;
 	}
@@ -200,13 +192,13 @@ public BrAPIGermplasm additionalInfo(JsonObject additionalInfo) {
 	}
 
 	public BrAPIGermplasm putAdditionalInfoItem(String key, Object additionalInfoItem) {
-        if (this.additionalInfo == null) {
-          this.additionalInfo = new JsonObject();
-        }
-        JsonElement newElement = gson.toJsonTree(additionalInfoItem);
-        this.additionalInfo.add(key, newElement);
-        return this;
-  	}
+		if (this.additionalInfo == null) {
+			this.additionalInfo = new JsonObject();
+		}
+		JsonElement newElement = gson.toJsonTree(additionalInfoItem);
+		this.additionalInfo.add(key, newElement);
+		return this;
+	}
 
 	/**
 	 * Additional arbitrary info
@@ -214,7 +206,6 @@ public BrAPIGermplasm putAdditionalInfoItem(String key, Object additionalInfoIte
 	 * @return additionalInfo
 	 **/
 
-
 	public JsonObject getAdditionalInfo() {
 		return additionalInfo;
 	}
@@ -247,12 +238,12 @@ public BrAPIGermplasm biologicalStatusOfAccessionCode(
 	 * @return biologicalStatusOfAccessionCode
 	 **/
 
-
 	public BrAPIBiologicalStatusOfAccessionCode getBiologicalStatusOfAccessionCode() {
 		return biologicalStatusOfAccessionCode;
 	}
 
-	public void setBiologicalStatusOfAccessionCode(BrAPIBiologicalStatusOfAccessionCode biologicalStatusOfAccessionCode) {
+	public void setBiologicalStatusOfAccessionCode(
+			BrAPIBiologicalStatusOfAccessionCode biologicalStatusOfAccessionCode) {
 		this.biologicalStatusOfAccessionCode = biologicalStatusOfAccessionCode;
 	}
 
@@ -267,7 +258,6 @@ public BrAPIGermplasm biologicalStatusOfAccessionDescription(String biologicalSt
 	 * @return biologicalStatusOfAccessionDescription
 	 **/
 
-
 	public String getBiologicalStatusOfAccessionDescription() {
 		return biologicalStatusOfAccessionDescription;
 	}
@@ -287,7 +277,6 @@ public BrAPIGermplasm breedingMethodDbId(String breedingMethodDbId) {
 	 * @return breedingMethodDbId
 	 **/
 
-
 	public String getBreedingMethodDbId() {
 		return breedingMethodDbId;
 	}
@@ -296,6 +285,25 @@ public void setBreedingMethodDbId(String breedingMethodDbId) {
 		this.breedingMethodDbId = breedingMethodDbId;
 	}
 
+	public BrAPIGermplasm breedingMethodName(String breedingMethodName) {
+		this.breedingMethodName = breedingMethodName;
+		return this;
+	}
+
+	/**
+	 * The unique identifier for the breeding method used to create this germplasm
+	 *
+	 * @return breedingMethodDbId
+	 **/
+
+	public String getBreedingMethodName() {
+		return breedingMethodName;
+	}
+
+	public void setBreedingMethodName(String breedingMethodName) {
+		this.breedingMethodName = breedingMethodName;
+	}
+
 	public BrAPIGermplasm collection(String collection) {
 		this.collection = collection;
 		return this;
@@ -307,7 +315,6 @@ public BrAPIGermplasm collection(String collection) {
 	 * @return collection
 	 **/
 
-
 	public String getCollection() {
 		return collection;
 	}
@@ -345,7 +352,6 @@ public BrAPIGermplasm countryOfOriginCode(String countryOfOriginCode) {
 	 * @return countryOfOriginCode
 	 **/
 
-
 	public String getCountryOfOriginCode() {
 		return countryOfOriginCode;
 	}
@@ -365,7 +371,6 @@ public BrAPIGermplasm defaultDisplayName(String defaultDisplayName) {
 	 * @return defaultDisplayName
 	 **/
 
-
 	public String getDefaultDisplayName() {
 		return defaultDisplayName;
 	}
@@ -385,7 +390,6 @@ public BrAPIGermplasm documentationURL(String documentationURL) {
 	 * @return documentationURL
 	 **/
 
-
 	public String getDocumentationURL() {
 		return documentationURL;
 	}
@@ -413,7 +417,6 @@ public BrAPIGermplasm addDonorsItem(BrAPIGermplasmDonors donorsItem) {
 	 * @return donors
 	 **/
 
-	@Valid
 	public List<BrAPIGermplasmDonors> getDonors() {
 		return donors;
 	}
@@ -433,8 +436,6 @@ public BrAPIGermplasm externalReferences(List<BrAPIExternalReference> externalRe
 	 * @return externalReferences
 	 **/
 
-
-	@Valid
 	public List<BrAPIExternalReference> getExternalReferences() {
 		return externalReferences;
 	}
@@ -457,7 +458,6 @@ public BrAPIGermplasm genus(String genus) {
 	 * @return genus
 	 **/
 
-
 	public String getGenus() {
 		return genus;
 	}
@@ -500,7 +500,6 @@ public BrAPIGermplasm addGermplasmOriginItem(BrAPIGermplasmOrigin germplasmOrigi
 	 * @return germplasmOrigin
 	 **/
 
-	@Valid
 	public List<BrAPIGermplasmOrigin> getGermplasmOrigin() {
 		return germplasmOrigin;
 	}
@@ -535,7 +534,6 @@ public BrAPIGermplasm germplasmPreprocessing(String germplasmPreprocessing) {
 	 * @return germplasmPreprocessing
 	 **/
 
-
 	public String getGermplasmPreprocessing() {
 		return germplasmPreprocessing;
 	}
@@ -561,7 +559,6 @@ public BrAPIGermplasm instituteCode(String instituteCode) {
 	 * @return instituteCode
 	 **/
 
-
 	public String getInstituteCode() {
 		return instituteCode;
 	}
@@ -581,7 +578,6 @@ public BrAPIGermplasm instituteName(String instituteName) {
 	 * @return instituteName
 	 **/
 
-
 	public String getInstituteName() {
 		return instituteName;
 	}
@@ -601,7 +597,6 @@ public BrAPIGermplasm pedigree(String pedigree) {
 	 * @return pedigree
 	 **/
 
-
 	public String getPedigree() {
 		return pedigree;
 	}
@@ -621,7 +616,6 @@ public BrAPIGermplasm seedSource(String seedSource) {
 	 * @return seedSource
 	 **/
 
-
 	public String getSeedSource() {
 		return seedSource;
 	}
@@ -641,7 +635,6 @@ public BrAPIGermplasm seedSourceDescription(String seedSourceDescription) {
 	 * @return seedSourceDescription
 	 **/
 
-
 	public String getSeedSourceDescription() {
 		return seedSourceDescription;
 	}
@@ -665,7 +658,6 @@ public BrAPIGermplasm species(String species) {
 	 * @return species
 	 **/
 
-
 	public String getSpecies() {
 		return species;
 	}
@@ -687,7 +679,6 @@ public BrAPIGermplasm speciesAuthority(String speciesAuthority) {
 	 * @return speciesAuthority
 	 **/
 
-
 	public String getSpeciesAuthority() {
 		return speciesAuthority;
 	}
@@ -715,7 +706,6 @@ public BrAPIGermplasm addStorageTypesItem(BrAPIGermplasmStorageTypes storageType
 	 * @return storageTypes
 	 **/
 
-	@Valid
 	public List<BrAPIGermplasmStorageTypes> getStorageTypes() {
 		return storageTypes;
 	}
@@ -747,7 +737,6 @@ public BrAPIGermplasm subtaxa(String subtaxa) {
 	 * @return subtaxa
 	 **/
 
-
 	public String getSubtaxa() {
 		return subtaxa;
 	}
@@ -769,7 +758,6 @@ public BrAPIGermplasm subtaxaAuthority(String subtaxaAuthority) {
 	 * @return subtaxaAuthority
 	 **/
 
-
 	public String getSubtaxaAuthority() {
 		return subtaxaAuthority;
 	}
@@ -797,7 +785,6 @@ public BrAPIGermplasm addSynonymsItem(BrAPIGermplasmSynonyms synonymsItem) {
 	 * @return synonyms
 	 **/
 
-	@Valid
 	public List<BrAPIGermplasmSynonyms> getSynonyms() {
 		return synonyms;
 	}
@@ -829,7 +816,6 @@ public BrAPIGermplasm addTaxonIdsItem(BrAPITaxonID taxonIdsItem) {
 	 * @return taxonIds
 	 **/
 
-	@Valid
 	public List<BrAPITaxonID> getTaxonIds() {
 		return taxonIds;
 	}
@@ -847,15 +833,15 @@ public boolean equals(java.lang.Object o) {
 			return false;
 		}
 		BrAPIGermplasm germplasm = (BrAPIGermplasm) o;
-		return Objects.equals(this.germplasmDbId, germplasm.germplasmDbId) &&
-				Objects.equals(this.accessionNumber, germplasm.accessionNumber)
+		return Objects.equals(this.germplasmDbId, germplasm.germplasmDbId)
+				&& Objects.equals(this.accessionNumber, germplasm.accessionNumber)
 				&& Objects.equals(this.acquisitionDate, germplasm.acquisitionDate)
 				&& Objects.equals(this.additionalInfo, germplasm.additionalInfo)
-				&& Objects.equals(this.biologicalStatusOfAccessionCode,
-								  germplasm.biologicalStatusOfAccessionCode)
+				&& Objects.equals(this.biologicalStatusOfAccessionCode, germplasm.biologicalStatusOfAccessionCode)
 				&& Objects.equals(this.biologicalStatusOfAccessionDescription,
-								  germplasm.biologicalStatusOfAccessionDescription)
+						germplasm.biologicalStatusOfAccessionDescription)
 				&& Objects.equals(this.breedingMethodDbId, germplasm.breedingMethodDbId)
+				&& Objects.equals(this.breedingMethodName, germplasm.breedingMethodName)
 				&& Objects.equals(this.collection, germplasm.collection)
 				&& Objects.equals(this.commonCropName, germplasm.commonCropName)
 				&& Objects.equals(this.countryOfOriginCode, germplasm.countryOfOriginCode)
@@ -884,12 +870,12 @@ public boolean equals(java.lang.Object o) {
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(germplasmDbId, accessionNumber, acquisitionDate, additionalInfo, biologicalStatusOfAccessionCode,
-							biologicalStatusOfAccessionDescription, breedingMethodDbId, collection, commonCropName,
-							countryOfOriginCode, defaultDisplayName, documentationURL, donors, externalReferences, genus,
-							germplasmName, germplasmOrigin, germplasmPUI, germplasmPreprocessing, instituteCode, instituteName,
-							pedigree, seedSource, seedSourceDescription, species, speciesAuthority, storageTypes, subtaxa,
-							subtaxaAuthority, synonyms, taxonIds);
+		return Objects.hash(germplasmDbId, accessionNumber, acquisitionDate, additionalInfo,
+				biologicalStatusOfAccessionCode, biologicalStatusOfAccessionDescription, breedingMethodDbId,
+				breedingMethodName, collection, commonCropName, countryOfOriginCode, defaultDisplayName,
+				documentationURL, donors, externalReferences, genus, germplasmName, germplasmOrigin, germplasmPUI,
+				germplasmPreprocessing, instituteCode, instituteName, pedigree, seedSource, seedSourceDescription,
+				species, speciesAuthority, storageTypes, subtaxa, subtaxaAuthority, synonyms, taxonIds);
 	}
 
 	@Override
@@ -901,10 +887,11 @@ public String toString() {
 		sb.append("    acquisitionDate: ").append(toIndentedString(acquisitionDate)).append("\n");
 		sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
 		sb.append("    biologicalStatusOfAccessionCode: ").append(toIndentedString(biologicalStatusOfAccessionCode))
-		  .append("\n");
+				.append("\n");
 		sb.append("    biologicalStatusOfAccessionDescription: ")
-		  .append(toIndentedString(biologicalStatusOfAccessionDescription)).append("\n");
+				.append(toIndentedString(biologicalStatusOfAccessionDescription)).append("\n");
 		sb.append("    breedingMethodDbId: ").append(toIndentedString(breedingMethodDbId)).append("\n");
+		sb.append("    breedingMethodName: ").append(toIndentedString(breedingMethodName)).append("\n");
 		sb.append("    collection: ").append(toIndentedString(collection)).append("\n");
 		sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
 		sb.append("    countryOfOriginCode: ").append(toIndentedString(countryOfOriginCode)).append("\n");
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIGermplasmDonors.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIGermplasmDonors.java
index bbb690e5..12f31ab1 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIGermplasmDonors.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIGermplasmDonors.java
@@ -3,122 +3,122 @@
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
-
-
-
 /**
  * GermplasmDonors
  */
 
-
 public class BrAPIGermplasmDonors {
-  @JsonProperty("donorAccessionNumber")
-  private String donorAccessionNumber = null;
-
-  @JsonProperty("donorInstituteCode")
-  private String donorInstituteCode = null;
-
-  @JsonProperty("germplasmPUI")
-  private String germplasmPUI = null;
-
-  public BrAPIGermplasmDonors donorAccessionNumber(String donorAccessionNumber) {
-    this.donorAccessionNumber = donorAccessionNumber;
-    return this;
-  }
-
-  /**
-   * The accession number assigned by the donor  MCPD (v2.1) (DONORNUMB) 23. Identifier assigned to an accession by the donor. Follows ACCENUMB standard.
-   * @return donorAccessionNumber
-  **/
-  
-  
-    public String getDonorAccessionNumber() {
-    return donorAccessionNumber;
-  }
-
-  public void setDonorAccessionNumber(String donorAccessionNumber) {
-    this.donorAccessionNumber = donorAccessionNumber;
-  }
-
-  public BrAPIGermplasmDonors donorInstituteCode(String donorInstituteCode) {
-    this.donorInstituteCode = donorInstituteCode;
-    return this;
-  }
-
-  /**
-   * The institute code for the donor institute  MCPD (v2.1) (DONORCODE) 22. FAO WIEWS code of the donor institute. Follows INSTCODE standard.
-   * @return donorInstituteCode
-  **/
-  
-  
-    public String getDonorInstituteCode() {
-    return donorInstituteCode;
-  }
-
-  public void setDonorInstituteCode(String donorInstituteCode) {
-    this.donorInstituteCode = donorInstituteCode;
-  }
-
-  public BrAPIGermplasmDonors germplasmPUI(String germplasmPUI) {
-    this.germplasmPUI = germplasmPUI;
-    return this;
-  }
-
-  /**
-   * Get germplasmPUI
-   * @return germplasmPUI
-  **/
-  
-  
-    public String getGermplasmPUI() {
-    return germplasmPUI;
-  }
-
-  public void setGermplasmPUI(String germplasmPUI) {
-    this.germplasmPUI = germplasmPUI;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIGermplasmDonors germplasmDonors = (BrAPIGermplasmDonors) o;
-    return Objects.equals(this.donorAccessionNumber, germplasmDonors.donorAccessionNumber) &&
-        Objects.equals(this.donorInstituteCode, germplasmDonors.donorInstituteCode) &&
-        Objects.equals(this.germplasmPUI, germplasmDonors.germplasmPUI);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(donorAccessionNumber, donorInstituteCode, germplasmPUI);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class GermplasmDonors {\n");
-    
-    sb.append("    donorAccessionNumber: ").append(toIndentedString(donorAccessionNumber)).append("\n");
-    sb.append("    donorInstituteCode: ").append(toIndentedString(donorInstituteCode)).append("\n");
-    sb.append("    germplasmPUI: ").append(toIndentedString(germplasmPUI)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+	@JsonProperty("donorAccessionNumber")
+	private String donorAccessionNumber = null;
+
+	@JsonProperty("donorInstituteCode")
+	private String donorInstituteCode = null;
+	
+	@Deprecated
+	@JsonProperty("germplasmPUI")
+	private String germplasmPUI = null;
+
+	public BrAPIGermplasmDonors donorAccessionNumber(String donorAccessionNumber) {
+		this.donorAccessionNumber = donorAccessionNumber;
+		return this;
+	}
+
+	/**
+	 * The accession number assigned by the donor MCPD (v2.1) (DONORNUMB) 23.
+	 * Identifier assigned to an accession by the donor. Follows ACCENUMB standard.
+	 * 
+	 * @return donorAccessionNumber
+	 **/
+
+	public String getDonorAccessionNumber() {
+		return donorAccessionNumber;
+	}
+
+	public void setDonorAccessionNumber(String donorAccessionNumber) {
+		this.donorAccessionNumber = donorAccessionNumber;
+	}
+
+	public BrAPIGermplasmDonors donorInstituteCode(String donorInstituteCode) {
+		this.donorInstituteCode = donorInstituteCode;
+		return this;
+	}
+
+	/**
+	 * The institute code for the donor institute MCPD (v2.1) (DONORCODE) 22. FAO
+	 * WIEWS code of the donor institute. Follows INSTCODE standard.
+	 * 
+	 * @return donorInstituteCode
+	 **/
+
+	public String getDonorInstituteCode() {
+		return donorInstituteCode;
+	}
+
+	public void setDonorInstituteCode(String donorInstituteCode) {
+		this.donorInstituteCode = donorInstituteCode;
+	}
+
+	@Deprecated
+	public BrAPIGermplasmDonors germplasmPUI(String germplasmPUI) {
+		this.germplasmPUI = germplasmPUI;
+		return this;
+	}
+
+	/**
+	 * Get germplasmPUI
+	 * 
+	 * @return germplasmPUI
+	 **/
+
+	@Deprecated
+	public String getGermplasmPUI() {
+		return germplasmPUI;
+	}
+
+	@Deprecated
+	public void setGermplasmPUI(String germplasmPUI) {
+		this.germplasmPUI = germplasmPUI;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIGermplasmDonors germplasmDonors = (BrAPIGermplasmDonors) o;
+		return Objects.equals(this.donorAccessionNumber, germplasmDonors.donorAccessionNumber)
+				&& Objects.equals(this.donorInstituteCode, germplasmDonors.donorInstituteCode)
+				&& Objects.equals(this.germplasmPUI, germplasmDonors.germplasmPUI);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(donorAccessionNumber, donorInstituteCode, germplasmPUI);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class GermplasmDonors {\n");
+
+		sb.append("    donorAccessionNumber: ").append(toIndentedString(donorAccessionNumber)).append("\n");
+		sb.append("    donorInstituteCode: ").append(toIndentedString(donorInstituteCode)).append("\n");
+		sb.append("    germplasmPUI: ").append(toIndentedString(germplasmPUI)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIGermplasmSearchRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIGermplasmSearchRequest.java
index 13d73ebb..220288da 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIGermplasmSearchRequest.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIGermplasmSearchRequest.java
@@ -6,546 +6,816 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-
 import org.brapi.v2.model.BrAPISearchRequestParametersPaging;
 
 /**
- * GermplasmSearchRequest
+ * BrAPIGermplasmSearchRequest
  */
 
+public class BrAPIGermplasmSearchRequest extends BrAPISearchRequestParametersPaging {
+	@JsonProperty("accessionNumbers")
+	private List<String> accessionNumbers = null;
+
+	@JsonProperty("binomialNames")
+	private List<String> binomialNames = null;
+
+	@JsonProperty("collections")
+	private List<String> collections = null;
+
+	@JsonProperty("commonCropNames")
+	private List<String> commonCropNames = null;
+
+	@Deprecated
+	@JsonProperty("externalReferenceIDs")
+	private List<String> externalReferenceIDs = null;
+
+	@JsonProperty("externalReferenceIds")
+	private List<String> externalReferenceIds = null;
+
+	@JsonProperty("externalReferenceSources")
+	private List<String> externalReferenceSources = null;
+
+	@JsonProperty("familyCodes")
+	private List<String> familyCodes = null;
+
+	@JsonProperty("genus")
+	private List<String> genus = null;
+
+	@JsonProperty("germplasmDbIds")
+	private List<String> germplasmDbIds = null;
+
+	@JsonProperty("germplasmNames")
+	private List<String> germplasmNames = null;
+
+	@JsonProperty("germplasmPUIs")
+	private List<String> germplasmPUIs = null;
+
+	@JsonProperty("instituteCodes")
+	private List<String> instituteCodes = null;
+
+	@JsonProperty("parentDbIds")
+	private List<String> parentDbIds = null;
+
+	@JsonProperty("progenyDbIds")
+	private List<String> progenyDbIds = null;
+
+	@JsonProperty("programDbIds")
+	private List<String> programDbIds = null;
+
+	@JsonProperty("programNames")
+	private List<String> programNames = null;
+
+	@JsonProperty("species")
+	private List<String> species = null;
+
+	@JsonProperty("studyDbIds")
+	private List<String> studyDbIds = null;
+
+	@JsonProperty("studyNames")
+	private List<String> studyNames = null;
+
+	@JsonProperty("synonyms")
+	private List<String> synonyms = null;
+
+	@JsonProperty("trialDbIds")
+	private List<String> trialDbIds = null;
+
+	@JsonProperty("trialNames")
+	private List<String> trialNames = null;
+
+	public BrAPIGermplasmSearchRequest accessionNumbers(List<String> accessionNumbers) {
+		this.accessionNumbers = accessionNumbers;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addAccessionNumbersItem(String accessionNumbersItem) {
+		if (this.accessionNumbers == null) {
+			this.accessionNumbers = new ArrayList<String>();
+		}
+		this.accessionNumbers.add(accessionNumbersItem);
+		return this;
+	}
+
+	/**
+	 * A collection of unique identifiers for materials or germplasm within a
+	 * genebank MCPD (v2.1) (ACCENUMB) 2. This is the unique identifier for
+	 * accessions within a genebank, and is assigned when a sample is entered into
+	 * the genebank collection (e.g. \&quot;PI 113869\&quot;).
+	 *
+	 * @return accessionNumbers
+	 **/
+
+	public List<String> getAccessionNumbers() {
+		return accessionNumbers;
+	}
+
+	public void setAccessionNumbers(List<String> accessionNumbers) {
+		this.accessionNumbers = accessionNumbers;
+	}
+
+	public BrAPIGermplasmSearchRequest binomialNames(List<String> binomialNames) {
+		this.binomialNames = binomialNames;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addBinomialNamesItem(String binomialNamesItem) {
+		if (this.binomialNames == null) {
+			this.binomialNames = new ArrayList<String>();
+		}
+		this.binomialNames.add(binomialNamesItem);
+		return this;
+	}
+
+	/**
+	 * List of the full binomial name (scientific name) to identify a germplasm
+	 *
+	 * @return binomialNames
+	 **/
+
+	public List<String> getBinomialNames() {
+		return binomialNames;
+	}
+
+	public void setBinomialNames(List<String> binomialNames) {
+		this.binomialNames = binomialNames;
+	}
+
+	public BrAPIGermplasmSearchRequest collections(List<String> collections) {
+		this.collections = collections;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addCollectionsItem(String collectionsItem) {
+		if (this.collections == null) {
+			this.collections = new ArrayList<String>();
+		}
+		this.collections.add(collectionsItem);
+		return this;
+	}
+
+	/**
+	 * A specific panel/collection/population name this germplasm belongs to.
+	 *
+	 * @return collections
+	 **/
+
+	public List<String> getCollections() {
+		return collections;
+	}
+
+	public void setCollections(List<String> collections) {
+		this.collections = collections;
+	}
+
+	public BrAPIGermplasmSearchRequest commonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
+		if (this.commonCropNames == null) {
+			this.commonCropNames = new ArrayList<String>();
+		}
+		this.commonCropNames.add(commonCropNamesItem);
+		return this;
+	}
+
+	/**
+	 * The BrAPI Common Crop Name is the simple, generalized, widely accepted name
+	 * of the organism being researched. It is most often used in multi-crop systems
+	 * where digital resources need to be divided at a high level. Things like
+	 * &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of
+	 * common crop names. Use this parameter to only return results associated with
+	 * the given crops. Use &#x60;GET /commoncropnames&#x60; to find the list of
+	 * available crops on a server.
+	 *
+	 * @return commonCropNames
+	 **/
+
+	public List<String> getCommonCropNames() {
+		return commonCropNames;
+	}
+
+	public void setCommonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+	}
+
+	@Deprecated
+	public BrAPIGermplasmSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+		return this;
+	}
+
+	@Deprecated
+	public BrAPIGermplasmSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
+		if (this.externalReferenceIDs == null) {
+			this.externalReferenceIDs = new ArrayList<String>();
+		}
+		this.externalReferenceIDs.add(externalReferenceIDsItem);
+		return this;
+	}
+
+	/**
+	 * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github
+	 * issue number #460 &lt;br&gt;List of external reference IDs. Could be a simple
+	 * strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
+	 *
+	 * @return externalReferenceIDs
+	 **/
+
+	@Deprecated
+	public List<String> getExternalReferenceIDs() {
+		return externalReferenceIDs;
+	}
+
+	@Deprecated
+	public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+	}
+
+	public BrAPIGermplasmSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
+		if (this.externalReferenceIds == null) {
+			this.externalReferenceIds = new ArrayList<String>();
+		}
+		this.externalReferenceIds.add(externalReferenceIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of external reference IDs. Could be a simple strings or a URIs. (use
+	 * with &#x60;externalReferenceSources&#x60; parameter)
+	 *
+	 * @return externalReferenceIds
+	 **/
+
+	public List<String> getExternalReferenceIds() {
+		return externalReferenceIds;
+	}
+
+	public void setExternalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+	}
+
+	public BrAPIGermplasmSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
+		if (this.externalReferenceSources == null) {
+			this.externalReferenceSources = new ArrayList<String>();
+		}
+		this.externalReferenceSources.add(externalReferenceSourcesItem);
+		return this;
+	}
+
+	/**
+	 * List of identifiers for the source system or database of an external
+	 * reference (use with &#x60;externalReferenceIDs&#x60; parameter)
+	 *
+	 * @return externalReferenceSources
+	 **/
+
+	public List<String> getExternalReferenceSources() {
+		return externalReferenceSources;
+	}
+
+	public void setExternalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+	}
+
+	public BrAPIGermplasmSearchRequest familyCodes(List<String> familyCodes) {
+		this.familyCodes = familyCodes;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addFamilyCodesItem(String familyCodesItem) {
+		if (this.familyCodes == null) {
+			this.familyCodes = new ArrayList<String>();
+		}
+		this.familyCodes.add(familyCodesItem);
+		return this;
+	}
+
+	/**
+	 * A familyCode representing the family this germplasm belongs to.
+	 *
+	 * @return familyCodes
+	 **/
+
+	public List<String> getFamilyCodes() {
+		return familyCodes;
+	}
+
+	public void setFamilyCodes(List<String> familyCodes) {
+		this.familyCodes = familyCodes;
+	}
+
+	public BrAPIGermplasmSearchRequest genus(List<String> genus) {
+		this.genus = genus;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addGenusItem(String genusItem) {
+		if (this.genus == null) {
+			this.genus = new ArrayList<String>();
+		}
+		this.genus.add(genusItem);
+		return this;
+	}
+
+	/**
+	 * List of Genus names to identify germplasm
+	 *
+	 * @return genus
+	 **/
+
+	public List<String> getGenus() {
+		return genus;
+	}
+
+	public void setGenus(List<String> genus) {
+		this.genus = genus;
+	}
+
+	public BrAPIGermplasmSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
+		this.germplasmDbIds = germplasmDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
+		if (this.germplasmDbIds == null) {
+			this.germplasmDbIds = new ArrayList<String>();
+		}
+		this.germplasmDbIds.add(germplasmDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of IDs which uniquely identify germplasm to search for
+	 *
+	 * @return germplasmDbIds
+	 **/
+
+	public List<String> getGermplasmDbIds() {
+		return germplasmDbIds;
+	}
+
+	public void setGermplasmDbIds(List<String> germplasmDbIds) {
+		this.germplasmDbIds = germplasmDbIds;
+	}
+
+	public BrAPIGermplasmSearchRequest germplasmNames(List<String> germplasmNames) {
+		this.germplasmNames = germplasmNames;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
+		if (this.germplasmNames == null) {
+			this.germplasmNames = new ArrayList<String>();
+		}
+		this.germplasmNames.add(germplasmNamesItem);
+		return this;
+	}
+
+	/**
+	 * List of human readable names to identify germplasm to search for
+	 *
+	 * @return germplasmNames
+	 **/
+
+	public List<String> getGermplasmNames() {
+		return germplasmNames;
+	}
+
+	public void setGermplasmNames(List<String> germplasmNames) {
+		this.germplasmNames = germplasmNames;
+	}
+
+	public BrAPIGermplasmSearchRequest germplasmPUIs(List<String> germplasmPUIs) {
+		this.germplasmPUIs = germplasmPUIs;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addGermplasmPUIsItem(String germplasmPUIsItem) {
+		if (this.germplasmPUIs == null) {
+			this.germplasmPUIs = new ArrayList<String>();
+		}
+		this.germplasmPUIs.add(germplasmPUIsItem);
+		return this;
+	}
+
+	/**
+	 * List of Permanent Unique Identifiers to identify germplasm
+	 *
+	 * @return germplasmPUIs
+	 **/
+
+	public List<String> getGermplasmPUIs() {
+		return germplasmPUIs;
+	}
+
+	public void setGermplasmPUIs(List<String> germplasmPUIs) {
+		this.germplasmPUIs = germplasmPUIs;
+	}
+
+	public BrAPIGermplasmSearchRequest instituteCodes(List<String> instituteCodes) {
+		this.instituteCodes = instituteCodes;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addInstituteCodesItem(String instituteCodesItem) {
+		if (this.instituteCodes == null) {
+			this.instituteCodes = new ArrayList<String>();
+		}
+		this.instituteCodes.add(instituteCodesItem);
+		return this;
+	}
+
+	/**
+	 * The code for the institute that maintains the material. &lt;br/&gt; MCPD
+	 * (v2.1) (INSTCODE) 1. FAO WIEWS code of the institute where the accession is
+	 * maintained. The codes consist of the 3-letter ISO 3166 country code of the
+	 * country where the institute is located plus a number (e.g. PER001). The
+	 * current set of institute codes is available from http://www.fao.org/wiews.
+	 * For those institutes not yet having an FAO Code, or for those with
+	 * \&quot;obsolete\&quot; codes, see \&quot;Common formatting rules (v)\&quot;.
+	 *
+	 * @return instituteCodes
+	 **/
+
+	public List<String> getInstituteCodes() {
+		return instituteCodes;
+	}
+
+	public void setInstituteCodes(List<String> instituteCodes) {
+		this.instituteCodes = instituteCodes;
+	}
+
+	public BrAPIGermplasmSearchRequest parentDbIds(List<String> parentDbIds) {
+		this.parentDbIds = parentDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addParentDbIdsItem(String parentDbIdsItem) {
+		if (this.parentDbIds == null) {
+			this.parentDbIds = new ArrayList<String>();
+		}
+		this.parentDbIds.add(parentDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * Search for Germplasm with these parents
+	 *
+	 * @return parentDbIds
+	 **/
+
+	public List<String> getParentDbIds() {
+		return parentDbIds;
+	}
+
+	public void setParentDbIds(List<String> parentDbIds) {
+		this.parentDbIds = parentDbIds;
+	}
+
+	public BrAPIGermplasmSearchRequest progenyDbIds(List<String> progenyDbIds) {
+		this.progenyDbIds = progenyDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addProgenyDbIdsItem(String progenyDbIdsItem) {
+		if (this.progenyDbIds == null) {
+			this.progenyDbIds = new ArrayList<String>();
+		}
+		this.progenyDbIds.add(progenyDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * Search for Germplasm with these children
+	 *
+	 * @return progenyDbIds
+	 **/
+
+	public List<String> getProgenyDbIds() {
+		return progenyDbIds;
+	}
+
+	public void setProgenyDbIds(List<String> progenyDbIds) {
+		this.progenyDbIds = progenyDbIds;
+	}
+
+	public BrAPIGermplasmSearchRequest programDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
+		if (this.programDbIds == null) {
+			this.programDbIds = new ArrayList<String>();
+		}
+		this.programDbIds.add(programDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * A BrAPI Program represents the high level organization or group who is
+	 * responsible for conducting trials and studies. Things like Breeding Programs
+	 * and Funded Projects are considered BrAPI Programs. Use this parameter to only
+	 * return results associated with the given programs. Use &#x60;GET
+	 * /programs&#x60; to find the list of available programs on a server.
+	 *
+	 * @return programDbIds
+	 **/
+
+	public List<String> getProgramDbIds() {
+		return programDbIds;
+	}
+
+	public void setProgramDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+	}
+
+	public BrAPIGermplasmSearchRequest programNames(List<String> programNames) {
+		this.programNames = programNames;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addProgramNamesItem(String programNamesItem) {
+		if (this.programNames == null) {
+			this.programNames = new ArrayList<String>();
+		}
+		this.programNames.add(programNamesItem);
+		return this;
+	}
+
+	/**
+	 * Use this parameter to only return results associated with the given program
+	 * names. Program names are not required to be unique. Use &#x60;GET
+	 * /programs&#x60; to find the list of available programs on a server.
+	 *
+	 * @return programNames
+	 **/
+
+	public List<String> getProgramNames() {
+		return programNames;
+	}
+
+	public void setProgramNames(List<String> programNames) {
+		this.programNames = programNames;
+	}
+
+	public BrAPIGermplasmSearchRequest species(List<String> species) {
+		this.species = species;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addSpeciesItem(String speciesItem) {
+		if (this.species == null) {
+			this.species = new ArrayList<String>();
+		}
+		this.species.add(speciesItem);
+		return this;
+	}
+
+	/**
+	 * List of Species names to identify germplasm
+	 *
+	 * @return species
+	 **/
+
+	public List<String> getSpecies() {
+		return species;
+	}
+
+	public void setSpecies(List<String> species) {
+		this.species = species;
+	}
+
+	public BrAPIGermplasmSearchRequest studyDbIds(List<String> studyDbIds) {
+		this.studyDbIds = studyDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
+		if (this.studyDbIds == null) {
+			this.studyDbIds = new ArrayList<String>();
+		}
+		this.studyDbIds.add(studyDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of study identifiers to search for
+	 *
+	 * @return studyDbIds
+	 **/
+
+	public List<String> getStudyDbIds() {
+		return studyDbIds;
+	}
+
+	public void setStudyDbIds(List<String> studyDbIds) {
+		this.studyDbIds = studyDbIds;
+	}
+
+	public BrAPIGermplasmSearchRequest studyNames(List<String> studyNames) {
+		this.studyNames = studyNames;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addStudyNamesItem(String studyNamesItem) {
+		if (this.studyNames == null) {
+			this.studyNames = new ArrayList<String>();
+		}
+		this.studyNames.add(studyNamesItem);
+		return this;
+	}
+
+	/**
+	 * List of study names to filter search results
+	 *
+	 * @return studyNames
+	 **/
+
+	public List<String> getStudyNames() {
+		return studyNames;
+	}
+
+	public void setStudyNames(List<String> studyNames) {
+		this.studyNames = studyNames;
+	}
+
+	public BrAPIGermplasmSearchRequest synonyms(List<String> synonyms) {
+		this.synonyms = synonyms;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addSynonymsItem(String synonymsItem) {
+		if (this.synonyms == null) {
+			this.synonyms = new ArrayList<String>();
+		}
+		this.synonyms.add(synonymsItem);
+		return this;
+	}
+
+	/**
+	 * List of alternative names or IDs used to reference this germplasm
+	 *
+	 * @return synonyms
+	 **/
+
+	public List<String> getSynonyms() {
+		return synonyms;
+	}
+
+	public void setSynonyms(List<String> synonyms) {
+		this.synonyms = synonyms;
+	}
+
+	public BrAPIGermplasmSearchRequest trialDbIds(List<String> trialDbIds) {
+		this.trialDbIds = trialDbIds;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
+		if (this.trialDbIds == null) {
+			this.trialDbIds = new ArrayList<String>();
+		}
+		this.trialDbIds.add(trialDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a trial to search for
+	 *
+	 * @return trialDbIds
+	 **/
+
+	public List<String> getTrialDbIds() {
+		return trialDbIds;
+	}
+
+	public void setTrialDbIds(List<String> trialDbIds) {
+		this.trialDbIds = trialDbIds;
+	}
+
+	public BrAPIGermplasmSearchRequest trialNames(List<String> trialNames) {
+		this.trialNames = trialNames;
+		return this;
+	}
+
+	public BrAPIGermplasmSearchRequest addTrialNamesItem(String trialNamesItem) {
+		if (this.trialNames == null) {
+			this.trialNames = new ArrayList<String>();
+		}
+		this.trialNames.add(trialNamesItem);
+		return this;
+	}
+
+	/**
+	 * The human readable name of a trial to search for
+	 *
+	 * @return trialNames
+	 **/
+
+	public List<String> getTrialNames() {
+		return trialNames;
+	}
+
+	public void setTrialNames(List<String> trialNames) {
+		this.trialNames = trialNames;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIGermplasmSearchRequest germplasmSearchRequest = (BrAPIGermplasmSearchRequest) o;
+		return Objects.equals(this.accessionNumbers, germplasmSearchRequest.accessionNumbers)
+				&& Objects.equals(this.binomialNames, germplasmSearchRequest.binomialNames)
+				&& Objects.equals(this.collections, germplasmSearchRequest.collections)
+				&& Objects.equals(this.commonCropNames, germplasmSearchRequest.commonCropNames)
+				&& Objects.equals(this.externalReferenceIDs, germplasmSearchRequest.externalReferenceIDs)
+				&& Objects.equals(this.externalReferenceIds, germplasmSearchRequest.externalReferenceIds)
+				&& Objects.equals(this.externalReferenceSources, germplasmSearchRequest.externalReferenceSources)
+				&& Objects.equals(this.familyCodes, germplasmSearchRequest.familyCodes)
+				&& Objects.equals(this.genus, germplasmSearchRequest.genus)
+				&& Objects.equals(this.germplasmDbIds, germplasmSearchRequest.germplasmDbIds)
+				&& Objects.equals(this.germplasmNames, germplasmSearchRequest.germplasmNames)
+				&& Objects.equals(this.germplasmPUIs, germplasmSearchRequest.germplasmPUIs)
+				&& Objects.equals(this.instituteCodes, germplasmSearchRequest.instituteCodes)
+				&& Objects.equals(this.parentDbIds, germplasmSearchRequest.parentDbIds)
+				&& Objects.equals(this.progenyDbIds, germplasmSearchRequest.progenyDbIds)
+				&& Objects.equals(this.programDbIds, germplasmSearchRequest.programDbIds)
+				&& Objects.equals(this.programNames, germplasmSearchRequest.programNames)
+				&& Objects.equals(this.species, germplasmSearchRequest.species)
+				&& Objects.equals(this.studyDbIds, germplasmSearchRequest.studyDbIds)
+				&& Objects.equals(this.studyNames, germplasmSearchRequest.studyNames)
+				&& Objects.equals(this.synonyms, germplasmSearchRequest.synonyms)
+				&& Objects.equals(this.trialDbIds, germplasmSearchRequest.trialDbIds)
+				&& Objects.equals(this.trialNames, germplasmSearchRequest.trialNames);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(accessionNumbers, binomialNames, collections, commonCropNames, externalReferenceIDs,
+				externalReferenceIds, externalReferenceSources, familyCodes, genus, germplasmDbIds, germplasmNames,
+				germplasmPUIs, instituteCodes, parentDbIds, progenyDbIds, programDbIds, programNames, species,
+				studyDbIds, studyNames, synonyms, trialDbIds, trialNames);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class BrAPIGermplasmSearchRequest {\n");
+
+		sb.append("    accessionNumbers: ").append(toIndentedString(accessionNumbers)).append("\n");
+		sb.append("    binomialNames: ").append(toIndentedString(binomialNames)).append("\n");
+		sb.append("    collections: ").append(toIndentedString(collections)).append("\n");
+		sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
+		sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
+		sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
+		sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
+		sb.append("    familyCodes: ").append(toIndentedString(familyCodes)).append("\n");
+		sb.append("    genus: ").append(toIndentedString(genus)).append("\n");
+		sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
+		sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
+		sb.append("    germplasmPUIs: ").append(toIndentedString(germplasmPUIs)).append("\n");
+		sb.append("    instituteCodes: ").append(toIndentedString(instituteCodes)).append("\n");
+		sb.append("    parentDbIds: ").append(toIndentedString(parentDbIds)).append("\n");
+		sb.append("    progenyDbIds: ").append(toIndentedString(progenyDbIds)).append("\n");
+		sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
+		sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
+		sb.append("    species: ").append(toIndentedString(species)).append("\n");
+		sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
+		sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
+		sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
+		sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
+		sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 
-public class BrAPIGermplasmSearchRequest extends BrAPISearchRequestParametersPaging  {
-  @JsonProperty("commonCropNames")
-  @Valid
-  private List<String> commonCropNames = null;
-
-  @JsonProperty("germplasmDbIds")
-  @Valid
-  private List<String> germplasmDbIds = null;
-
-  @JsonProperty("germplasmNames")
-  @Valid
-  private List<String> germplasmNames = null;
-
-  @JsonProperty("studyDbIds")
-  @Valid
-  private List<String> studyDbIds = null;
-
-  @JsonProperty("studyNames")
-  @Valid
-  private List<String> studyNames = null;
-
-  @JsonProperty("externalReferenceIDs")
-  @Valid
-  private List<String> externalReferenceIDs = null;
-
-  @JsonProperty("externalReferenceSources")
-  @Valid
-  private List<String> externalReferenceSources = null;
-
-  @JsonProperty("accessionNumbers")
-  @Valid
-  private List<String> accessionNumbers = null;
-
-  @JsonProperty("collections")
-  @Valid
-  private List<String> collections = null;
-
-  @JsonProperty("genus")
-  @Valid
-  private List<String> genus = null;
-
-  @JsonProperty("germplasmPUIs")
-  @Valid
-  private List<String> germplasmPUIs = null;
-
-  @JsonProperty("parentDbIds")
-  @Valid
-  private List<String> parentDbIds = null;
-
-  @JsonProperty("progenyDbIds")
-  @Valid
-  private List<String> progenyDbIds = null;
-
-  @JsonProperty("species")
-  @Valid
-  private List<String> species = null;
-
-  @JsonProperty("synonyms")
-  @Valid
-  private List<String> synonyms = null;
-
-  public BrAPIGermplasmSearchRequest commonCropNames(List<String> commonCropNames) {
-    this.commonCropNames = commonCropNames;
-    return this;
-  }
-
-  public BrAPIGermplasmSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-    if (this.commonCropNames == null) {
-      this.commonCropNames = new ArrayList<String>();
-    }
-    this.commonCropNames.add(commonCropNamesItem);
-    return this;
-  }
-
-  /**
-   * Common name for the crop which this program is for
-   * @return commonCropNames
-  **/
-  
-  
-    public List<String> getCommonCropNames() {
-    return commonCropNames;
-  }
-
-  public void setCommonCropNames(List<String> commonCropNames) {
-    this.commonCropNames = commonCropNames;
-  }
-
-  public BrAPIGermplasmSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-    this.germplasmDbIds = germplasmDbIds;
-    return this;
-  }
-
-  public BrAPIGermplasmSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-    if (this.germplasmDbIds == null) {
-      this.germplasmDbIds = new ArrayList<String>();
-    }
-    this.germplasmDbIds.add(germplasmDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of IDs which uniquely identify germplasm to search for
-   * @return germplasmDbIds
-  **/
-  
-  
-    public List<String> getGermplasmDbIds() {
-    return germplasmDbIds;
-  }
-
-  public void setGermplasmDbIds(List<String> germplasmDbIds) {
-    this.germplasmDbIds = germplasmDbIds;
-  }
-
-  public BrAPIGermplasmSearchRequest germplasmNames(List<String> germplasmNames) {
-    this.germplasmNames = germplasmNames;
-    return this;
-  }
-
-  public BrAPIGermplasmSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-    if (this.germplasmNames == null) {
-      this.germplasmNames = new ArrayList<String>();
-    }
-    this.germplasmNames.add(germplasmNamesItem);
-    return this;
-  }
-
-  /**
-   * List of human readable names to identify germplasm to search for
-   * @return germplasmNames
-  **/
-  
-  
-    public List<String> getGermplasmNames() {
-    return germplasmNames;
-  }
-
-  public void setGermplasmNames(List<String> germplasmNames) {
-    this.germplasmNames = germplasmNames;
-  }
-
-  public BrAPIGermplasmSearchRequest studyDbIds(List<String> studyDbIds) {
-    this.studyDbIds = studyDbIds;
-    return this;
-  }
-
-  public BrAPIGermplasmSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-    if (this.studyDbIds == null) {
-      this.studyDbIds = new ArrayList<String>();
-    }
-    this.studyDbIds.add(studyDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of study identifiers to search for
-   * @return studyDbIds
-  **/
-  
-  
-    public List<String> getStudyDbIds() {
-    return studyDbIds;
-  }
-
-  public void setStudyDbIds(List<String> studyDbIds) {
-    this.studyDbIds = studyDbIds;
-  }
-
-  public BrAPIGermplasmSearchRequest studyNames(List<String> studyNames) {
-    this.studyNames = studyNames;
-    return this;
-  }
-
-  public BrAPIGermplasmSearchRequest addStudyNamesItem(String studyNamesItem) {
-    if (this.studyNames == null) {
-      this.studyNames = new ArrayList<String>();
-    }
-    this.studyNames.add(studyNamesItem);
-    return this;
-  }
-
-  /**
-   * List of study names to filter search results
-   * @return studyNames
-  **/
-  
-  
-    public List<String> getStudyNames() {
-    return studyNames;
-  }
-
-  public void setStudyNames(List<String> studyNames) {
-    this.studyNames = studyNames;
-  }
-
-  public BrAPIGermplasmSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-    return this;
-  }
-
-  public BrAPIGermplasmSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-    if (this.externalReferenceIDs == null) {
-      this.externalReferenceIDs = new ArrayList<String>();
-    }
-    this.externalReferenceIDs.add(externalReferenceIDsItem);
-    return this;
-  }
-
-  /**
-   * List of external references for the trait to search for
-   * @return externalReferenceIDs
-  **/
-  
-  
-    public List<String> getExternalReferenceIDs() {
-    return externalReferenceIDs;
-  }
-
-  public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-  }
-
-  public BrAPIGermplasmSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-    return this;
-  }
-
-  public BrAPIGermplasmSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-    if (this.externalReferenceSources == null) {
-      this.externalReferenceSources = new ArrayList<String>();
-    }
-    this.externalReferenceSources.add(externalReferenceSourcesItem);
-    return this;
-  }
-
-  /**
-   * List of external references sources for the trait to search for
-   * @return externalReferenceSources
-  **/
-  
-  
-    public List<String> getExternalReferenceSources() {
-    return externalReferenceSources;
-  }
-
-  public void setExternalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-  }
-
-  public BrAPIGermplasmSearchRequest accessionNumbers(List<String> accessionNumbers) {
-    this.accessionNumbers = accessionNumbers;
-    return this;
-  }
-
-  public BrAPIGermplasmSearchRequest addAccessionNumbersItem(String accessionNumbersItem) {
-    if (this.accessionNumbers == null) {
-      this.accessionNumbers = new ArrayList<String>();
-    }
-    this.accessionNumbers.add(accessionNumbersItem);
-    return this;
-  }
-
-  /**
-   * List unique identifiers for accessions within a genebank
-   * @return accessionNumbers
-  **/
-  
-  
-    public List<String> getAccessionNumbers() {
-    return accessionNumbers;
-  }
-
-  public void setAccessionNumbers(List<String> accessionNumbers) {
-    this.accessionNumbers = accessionNumbers;
-  }
-
-  public BrAPIGermplasmSearchRequest collections(List<String> collections) {
-    this.collections = collections;
-    return this;
-  }
-
-  public BrAPIGermplasmSearchRequest addCollectionsItem(String collectionsItem) {
-    if (this.collections == null) {
-      this.collections = new ArrayList<String>();
-    }
-    this.collections.add(collectionsItem);
-    return this;
-  }
-
-  /**
-   * A specific panel/collection/population name this germplasm belongs to.
-   * @return collections
-  **/
-  
-  
-    public List<String> getCollections() {
-    return collections;
-  }
-
-  public void setCollections(List<String> collections) {
-    this.collections = collections;
-  }
-
-  public BrAPIGermplasmSearchRequest genus(List<String> genus) {
-    this.genus = genus;
-    return this;
-  }
-
-  public BrAPIGermplasmSearchRequest addGenusItem(String genusItem) {
-    if (this.genus == null) {
-      this.genus = new ArrayList<String>();
-    }
-    this.genus.add(genusItem);
-    return this;
-  }
-
-  /**
-   * List of Genus names to identify germplasm
-   * @return genus
-  **/
-  
-  
-    public List<String> getGenus() {
-    return genus;
-  }
-
-  public void setGenus(List<String> genus) {
-    this.genus = genus;
-  }
-
-  public BrAPIGermplasmSearchRequest germplasmPUIs(List<String> germplasmPUIs) {
-    this.germplasmPUIs = germplasmPUIs;
-    return this;
-  }
-
-  public BrAPIGermplasmSearchRequest addGermplasmPUIsItem(String germplasmPUIsItem) {
-    if (this.germplasmPUIs == null) {
-      this.germplasmPUIs = new ArrayList<String>();
-    }
-    this.germplasmPUIs.add(germplasmPUIsItem);
-    return this;
-  }
-
-  /**
-   * List of Permanent Unique Identifiers to identify germplasm
-   * @return germplasmPUIs
-  **/
-  
-  
-    public List<String> getGermplasmPUIs() {
-    return germplasmPUIs;
-  }
-
-  public void setGermplasmPUIs(List<String> germplasmPUIs) {
-    this.germplasmPUIs = germplasmPUIs;
-  }
-
-  public BrAPIGermplasmSearchRequest parentDbIds(List<String> parentDbIds) {
-    this.parentDbIds = parentDbIds;
-    return this;
-  }
-
-  public BrAPIGermplasmSearchRequest addParentDbIdsItem(String parentDbIdsItem) {
-    if (this.parentDbIds == null) {
-      this.parentDbIds = new ArrayList<String>();
-    }
-    this.parentDbIds.add(parentDbIdsItem);
-    return this;
-  }
-
-  /**
-   * Search for Germplasm with these parents
-   * @return parentDbIds
-  **/
-  
-  
-    public List<String> getParentDbIds() {
-    return parentDbIds;
-  }
-
-  public void setParentDbIds(List<String> parentDbIds) {
-    this.parentDbIds = parentDbIds;
-  }
-
-  public BrAPIGermplasmSearchRequest progenyDbIds(List<String> progenyDbIds) {
-    this.progenyDbIds = progenyDbIds;
-    return this;
-  }
-
-  public BrAPIGermplasmSearchRequest addProgenyDbIdsItem(String progenyDbIdsItem) {
-    if (this.progenyDbIds == null) {
-      this.progenyDbIds = new ArrayList<String>();
-    }
-    this.progenyDbIds.add(progenyDbIdsItem);
-    return this;
-  }
-
-  /**
-   * Search for Germplasm with these children
-   * @return progenyDbIds
-  **/
-  
-  
-    public List<String> getProgenyDbIds() {
-    return progenyDbIds;
-  }
-
-  public void setProgenyDbIds(List<String> progenyDbIds) {
-    this.progenyDbIds = progenyDbIds;
-  }
-
-  public BrAPIGermplasmSearchRequest species(List<String> species) {
-    this.species = species;
-    return this;
-  }
-
-  public BrAPIGermplasmSearchRequest addSpeciesItem(String speciesItem) {
-    if (this.species == null) {
-      this.species = new ArrayList<String>();
-    }
-    this.species.add(speciesItem);
-    return this;
-  }
-
-  /**
-   * List of Species names to identify germplasm
-   * @return species
-  **/
-  
-  
-    public List<String> getSpecies() {
-    return species;
-  }
-
-  public void setSpecies(List<String> species) {
-    this.species = species;
-  }
-
-  public BrAPIGermplasmSearchRequest synonyms(List<String> synonyms) {
-    this.synonyms = synonyms;
-    return this;
-  }
-
-  public BrAPIGermplasmSearchRequest addSynonymsItem(String synonymsItem) {
-    if (this.synonyms == null) {
-      this.synonyms = new ArrayList<String>();
-    }
-    this.synonyms.add(synonymsItem);
-    return this;
-  }
-
-  /**
-   * List of alternative names or IDs used to reference this germplasm
-   * @return synonyms
-  **/
-  
-  
-    public List<String> getSynonyms() {
-    return synonyms;
-  }
-
-  public void setSynonyms(List<String> synonyms) {
-    this.synonyms = synonyms;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIGermplasmSearchRequest germplasmSearchRequest = (BrAPIGermplasmSearchRequest) o;
-    return Objects.equals(this.commonCropNames, germplasmSearchRequest.commonCropNames) &&
-        Objects.equals(this.germplasmDbIds, germplasmSearchRequest.germplasmDbIds) &&
-        Objects.equals(this.germplasmNames, germplasmSearchRequest.germplasmNames) &&
-        Objects.equals(this.studyDbIds, germplasmSearchRequest.studyDbIds) &&
-        Objects.equals(this.studyNames, germplasmSearchRequest.studyNames) &&
-        Objects.equals(this.externalReferenceIDs, germplasmSearchRequest.externalReferenceIDs) &&
-        Objects.equals(this.externalReferenceSources, germplasmSearchRequest.externalReferenceSources) &&
-        Objects.equals(this.accessionNumbers, germplasmSearchRequest.accessionNumbers) &&
-        Objects.equals(this.collections, germplasmSearchRequest.collections) &&
-        Objects.equals(this.genus, germplasmSearchRequest.genus) &&
-        Objects.equals(this.germplasmPUIs, germplasmSearchRequest.germplasmPUIs) &&
-        Objects.equals(this.parentDbIds, germplasmSearchRequest.parentDbIds) &&
-        Objects.equals(this.progenyDbIds, germplasmSearchRequest.progenyDbIds) &&
-        Objects.equals(this.species, germplasmSearchRequest.species) &&
-        Objects.equals(this.synonyms, germplasmSearchRequest.synonyms) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(commonCropNames, germplasmDbIds, germplasmNames, studyDbIds, studyNames, externalReferenceIDs, externalReferenceSources, accessionNumbers, collections, genus, germplasmPUIs, parentDbIds, progenyDbIds, species, synonyms, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class GermplasmSearchRequest {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-    sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-    sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-    sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-    sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-    sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-    sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-    sb.append("    accessionNumbers: ").append(toIndentedString(accessionNumbers)).append("\n");
-    sb.append("    collections: ").append(toIndentedString(collections)).append("\n");
-    sb.append("    genus: ").append(toIndentedString(genus)).append("\n");
-    sb.append("    germplasmPUIs: ").append(toIndentedString(germplasmPUIs)).append("\n");
-    sb.append("    parentDbIds: ").append(toIndentedString(parentDbIds)).append("\n");
-    sb.append("    progenyDbIds: ").append(toIndentedString(progenyDbIds)).append("\n");
-    sb.append("    species: ").append(toIndentedString(species)).append("\n");
-    sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
 }

From 73ddaf6275fd844f4cb02a3b5b44acee75917d1c Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Mon, 21 Aug 2023 13:12:57 -0400
Subject: [PATCH 19/28] fixes issues #167, #168, #169, #170, #171, #172, #173.
 Dependent on #199

---
 .../germplasm/SeedLotQueryParams.java         |  30 +-
 .../SeedLotTransactionQueryParams.java        |  32 +-
 .../v2/modules/germplasm/SeedLotsApiTest.java | 295 +++---
 .../org/brapi/v2/model/germ/BrAPISeedLot.java | 887 ++++++++++--------
 .../germ/BrAPISeedLotContentMixture.java      | 176 ++++
 5 files changed, 857 insertions(+), 563 deletions(-)
 create mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPISeedLotContentMixture.java

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotQueryParams.java
index 4a238613..05e16a19 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotQueryParams.java
@@ -26,28 +26,34 @@
 
 import org.brapi.client.v2.model.queryParams.core.BrAPIQueryParams;
 
-
 @Getter
 @Setter
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(fluent=true)
+@Accessors(fluent = true)
 public class SeedLotQueryParams extends BrAPIQueryParams {
 
-    private String seedLotDbId;
-    private String germplasmDbId;
-    private String externalReferenceSource;
-    private String externalReferenceId;
-    @Deprecated
-    private String externalReferenceID;
-    
-    public String getExternalReferenceId() {
+	private String seedLotDbId;
+	private String germplasmDbId;
+	private String externalReferenceSource;
+	private String externalReferenceId;
+	@Deprecated
+	private String externalReferenceID;
+	private String germplasmName;
+	private String crossDbId;
+	private String commonCropName;
+	private String crossName;
+	private String programDbId;
+
+	public String getExternalReferenceId() {
 		return externalReferenceId;
 	}
-    public String externalReferenceId() {
+
+	public String externalReferenceId() {
 		return externalReferenceId;
 	}
+
 	public void setExternalReferenceId(String externalReferenceId) {
 		this.externalReferenceId = externalReferenceId;
 	}
@@ -56,10 +62,12 @@ public void setExternalReferenceId(String externalReferenceId) {
 	public String getExternalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public String externalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotTransactionQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotTransactionQueryParams.java
index 5f95e830..4dd4647e 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotTransactionQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotTransactionQueryParams.java
@@ -26,29 +26,35 @@
 
 import org.brapi.client.v2.model.queryParams.core.BrAPIQueryParams;
 
-
 @Getter
 @Setter
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(fluent=true)
+@Accessors(fluent = true)
 public class SeedLotTransactionQueryParams extends BrAPIQueryParams {
 
-    private String transactionDbId;
-    private String seedLotDbId;
-    private String germplasmDbId;
-    private String externalReferenceSource;
-    private String externalReferenceId;
-    @Deprecated
-    private String externalReferenceID;
-    
-    public String getExternalReferenceId() {
+	private String transactionDbId;
+	private String seedLotDbId;
+	private String germplasmDbId;
+	private String externalReferenceSource;
+	private String externalReferenceId;
+	@Deprecated
+	private String externalReferenceID;
+	private String germplasmName;
+	private String crossDbId;
+	private String commonCropName;
+	private String crossName;
+	private String programDbId;
+
+	public String getExternalReferenceId() {
 		return externalReferenceId;
 	}
-    public String externalReferenceId() {
+
+	public String externalReferenceId() {
 		return externalReferenceId;
 	}
+
 	public void setExternalReferenceId(String externalReferenceId) {
 		this.externalReferenceId = externalReferenceId;
 	}
@@ -57,10 +63,12 @@ public void setExternalReferenceId(String externalReferenceId) {
 	public String getExternalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public String externalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/SeedLotsApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/SeedLotsApiTest.java
index 766bd843..a5c63587 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/SeedLotsApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/SeedLotsApiTest.java
@@ -13,6 +13,7 @@
 package org.brapi.client.v2.modules.germplasm;
 
 import org.brapi.client.v2.ApiResponse;
+import org.brapi.client.v2.BrAPIClientTest;
 import org.brapi.client.v2.model.exceptions.ApiException;
 import org.brapi.client.v2.model.queryParams.germplasm.SeedLotQueryParams;
 import org.brapi.client.v2.model.queryParams.germplasm.SeedLotTransactionQueryParams;
@@ -22,156 +23,160 @@
 import org.brapi.v2.model.germ.response.BrAPISeedLotSingleResponse;
 import org.brapi.v2.model.germ.response.BrAPISeedLotTransactionListResponse;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.math.BigDecimal;
+import java.util.Arrays;
 import java.util.List;
 
 /**
  * API tests for SeedLotsApi
  */
-public class SeedLotsApiTest {
-
-    private final SeedLotsApi api = new SeedLotsApi();
-
-    /**
-     * Get a filtered list of Seed Lot descriptions
-     *
-     * Get a filtered list of Seed Lot descriptions available in a system.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void seedlotsGetTest() throws ApiException {
-        String seedLotDbId = null;
-        String germplasmDbId = null;
-        String externalReferenceID = null;
-        String externalReferenceSource = null;
-        Integer page = null;
-        Integer pageSize = null;
-        
-        SeedLotQueryParams queryParams = new SeedLotQueryParams();
-        ApiResponse<BrAPISeedLotListResponse> response = api.seedlotsGet(queryParams);
-
-        // TODO: test validations
-    }
-    /**
-     * Add new Seed Lot descriptions to a server
-     *
-     * Add new Seed Lot descriptions to a server
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void seedlotsPostTest() throws ApiException {
-        List<BrAPISeedLot> body = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPISeedLotListResponse> response = api.seedlotsPost(body);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Get a specific Seed Lot
-     *
-     * Get a specific Seed Lot by seedLotDbId
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void seedlotsSeedLotDbIdGetTest() throws ApiException {
-        String seedLotDbId = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPISeedLotSingleResponse> response = api.seedlotsSeedLotDbIdGet(seedLotDbId);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Update an existing Seed Lot
-     *
-     * Update an existing Seed Lot
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void seedlotsSeedLotDbIdPutTest() throws ApiException {
-        String seedLotDbId = null;
-        BrAPISeedLot body = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPISeedLotSingleResponse> response = api.seedlotsSeedLotDbIdPut(seedLotDbId, body);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Get all Transactions related to a specific Seed Lot
-     *
-     * Get all Transactions related to a specific Seed Lot
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void seedlotsSeedLotDbIdTransactionsGetTest() throws ApiException {
-        String seedLotDbId = null;
-        String transactionDbId = null;
-        String transactionDirection = null;
-        Integer page = null;
-        Integer pageSize = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPISeedLotTransactionListResponse> response = api.seedlotsSeedLotDbIdTransactionsGet(seedLotDbId, transactionDbId, transactionDirection, page, pageSize);
-		});
-
-        // TODO: test validations
-    }
-    /**
-     * Get a filtered list of Seed Lot Transactions
-     *
-     * Get a filtered list of Seed Lot Transactions
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void seedlotsTransactionsGetTest() throws ApiException {
-        String transactionDbId = null;
-        String seedLotDbId = null;
-        String germplasmDbId = null;
-        String externalReferenceID = null;
-        String externalReferenceSource = null;
-        Integer page = null;
-        Integer pageSize = null;
-        
-        SeedLotTransactionQueryParams queryParams = new SeedLotTransactionQueryParams();
-        ApiResponse<BrAPISeedLotTransactionListResponse> response = api.seedlotsTransactionsGet(queryParams);
-
-        // TODO: test validations
-    }
-    /**
-     * Add new Seed Lot Transaction to be recorded
-     *
-     * Add new Seed Lot Transaction to be recorded
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void seedlotsTransactionsPostTest() throws ApiException {
-        List<BrAPISeedLotTransaction> body = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-        ApiResponse<BrAPISeedLotTransactionListResponse> response = api.seedlotsTransactionsPost(body);
-		});
-
-        // TODO: test validations
-    }
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class SeedLotsApiTest extends BrAPIClientTest {
+
+	private final SeedLotsApi api = new SeedLotsApi(this.apiClient);
+
+	/**
+	 * Get a filtered list of Seed Lot descriptions
+	 *
+	 * Get a filtered list of Seed Lot descriptions available in a system.
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void seedlotsGetTest() throws ApiException {
+		String seedLotDbId = "seed_lot1";
+
+		SeedLotQueryParams queryParams = new SeedLotQueryParams().seedLotDbId(seedLotDbId);
+		ApiResponse<BrAPISeedLotListResponse> response = api.seedlotsGet(queryParams);
+
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(seedLotDbId, response.getBody().getResult().getData().get(0).getSeedLotDbId());
+	}
+
+	/**
+	 * Add new Seed Lot descriptions to a server
+	 *
+	 * Add new Seed Lot descriptions to a server
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void seedlotsPostTest() throws ApiException {
+		BrAPISeedLot seedLot = new BrAPISeedLot().seedLotName("New Name");
+		List<BrAPISeedLot> body = Arrays.asList(seedLot);
+
+		ApiResponse<BrAPISeedLotListResponse> response = api.seedlotsPost(body);
+
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(seedLot.getSeedLotName(), response.getBody().getResult().getData().get(0).getSeedLotName());
+		assertNotNull(response.getBody().getResult().getData().get(0).getSeedLotDbId());
+
+	}
+
+	/**
+	 * Get a specific Seed Lot
+	 *
+	 * Get a specific Seed Lot by seedLotDbId
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void seedlotsSeedLotDbIdGetTest() throws ApiException {
+		String seedLotDbId = "seed_lot1";
+
+		ApiResponse<BrAPISeedLotSingleResponse> response = api.seedlotsSeedLotDbIdGet(seedLotDbId);
+
+		assertEquals(seedLotDbId, response.getBody().getResult().getSeedLotDbId());
+	}
+
+	/**
+	 * Update an existing Seed Lot
+	 *
+	 * Update an existing Seed Lot
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void seedlotsSeedLotDbIdPutTest() throws ApiException {
+		String seedLotDbId = "seed_lot1";
+		BrAPISeedLot seedLot = new BrAPISeedLot().seedLotName("New Name").seedLotDbId(seedLotDbId);
+
+		ApiResponse<BrAPISeedLotSingleResponse> response = api.seedlotsSeedLotDbIdPut(seedLotDbId, seedLot);
+
+		assertEquals(seedLot.getSeedLotDbId(), response.getBody().getResult().getSeedLotDbId());
+		assertEquals(seedLot.getSeedLotName(), response.getBody().getResult().getSeedLotName());
+	}
+
+	/**
+	 * Get all Transactions related to a specific Seed Lot
+	 *
+	 * Get all Transactions related to a specific Seed Lot
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void seedlotsSeedLotDbIdTransactionsGetTest() throws ApiException {
+		String seedLotDbId = "seed_lot1";
+		String transactionDbId = "seed_lot_transaction2";
+		String transactionDirection = null;
+		Integer page = null;
+		Integer pageSize = null;
+
+		ApiResponse<BrAPISeedLotTransactionListResponse> response = api.seedlotsSeedLotDbIdTransactionsGet(seedLotDbId,
+				transactionDbId, transactionDirection, page, pageSize);
+
+		assertEquals(1, response.getBody().getResult().getData().size());
+	}
+
+	/**
+	 * Get a filtered list of Seed Lot Transactions
+	 *
+	 * Get a filtered list of Seed Lot Transactions
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void seedlotsTransactionsGetTest() throws ApiException {
+		String transactionDbId = "seed_lot_transaction1";
+
+		SeedLotTransactionQueryParams queryParams = new SeedLotTransactionQueryParams()
+				.transactionDbId(transactionDbId);
+		ApiResponse<BrAPISeedLotTransactionListResponse> response = api.seedlotsTransactionsGet(queryParams);
+
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(transactionDbId, response.getBody().getResult().getData().get(0).getTransactionDbId());
+	}
+
+	/**
+	 * Add new Seed Lot Transaction to be recorded
+	 *
+	 * Add new Seed Lot Transaction to be recorded
+	 *
+	 * @throws ApiException if the Api call fails
+	 */
+	@Test
+	public void seedlotsTransactionsPostTest() throws ApiException {
+		BrAPISeedLotTransaction transaction = new BrAPISeedLotTransaction().fromSeedLotDbId("seed_lot1")
+				.toSeedLotDbId("seed_lot2").amount(new BigDecimal(20)).transactionDescription("test").units("seeds");
+		List<BrAPISeedLotTransaction> body = Arrays.asList(transaction);
+
+		ApiResponse<BrAPISeedLotTransactionListResponse> response = api.seedlotsTransactionsPost(body);
+
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertNotNull(response.getBody().getResult().getData().get(0).getTransactionDbId());
+		assertEquals(transaction.getFromSeedLotDbId(),
+				response.getBody().getResult().getData().get(0).getFromSeedLotDbId());
+		assertEquals(transaction.getToSeedLotDbId(),
+				response.getBody().getResult().getData().get(0).getToSeedLotDbId());
+		assertEquals(transaction.getAmount(), response.getBody().getResult().getData().get(0).getAmount());
+		assertEquals(transaction.getTransactionDescription(),
+				response.getBody().getResult().getData().get(0).getTransactionDescription());
+		assertEquals(transaction.getUnits(), response.getBody().getResult().getData().get(0).getUnits());
+
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPISeedLot.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPISeedLot.java
index d8916b19..eb7e8a09 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPISeedLot.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPISeedLot.java
@@ -2,416 +2,513 @@
 
 import java.math.BigDecimal;
 import java.time.OffsetDateTime;
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
+import org.brapi.v2.model.BrAPIExternalReference;
+import org.brapi.v2.model.NullableJsonElementTypeAdapterFactory;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.JsonAdapter;
-import org.brapi.v2.model.BrAPIExternalReference;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.brapi.v2.model.NullableJsonElementTypeAdapterFactory;
-
-import javax.validation.Valid;
-
 
 /**
- * SeedLot
+ * BrAPISeedLot
  */
 
-
 public class BrAPISeedLot {
-  @JsonProperty("seedLotDbId")
-  private String seedLotDbId = null;
-
-  @JsonProperty("additionalInfo")
-  @Valid
-  @JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
-  private JsonObject additionalInfo = null;
-
-  @JsonProperty("amount")
-  private BigDecimal amount = null;
-
-  @JsonProperty("createdDate")
-  private OffsetDateTime createdDate = null;
-
-  @JsonProperty("externalReferences")
-  private List<BrAPIExternalReference> externalReferences = null;
-
-  @JsonProperty("germplasmDbId")
-  private String germplasmDbId = null;
-
-  @JsonProperty("lastUpdated")
-  private OffsetDateTime lastUpdated = null;
-
-  @JsonProperty("locationDbId")
-  private String locationDbId = null;
-
-  @JsonProperty("programDbId")
-  private String programDbId = null;
-
-  @JsonProperty("seedLotDescription")
-  private String seedLotDescription = null;
-
-  @JsonProperty("seedLotName")
-  private String seedLotName = null;
-
-  @JsonProperty("sourceCollection")
-  private String sourceCollection = null;
-
-  @JsonProperty("storageLocation")
-  private String storageLocation = null;
-
-  @JsonProperty("units")
-  private String units = null;
-
-  private final transient Gson gson = new Gson();
-
-  public BrAPISeedLot seedLotDbId(String seedLotDbId) {
-    this.seedLotDbId = seedLotDbId;
-    return this;
-  }
-
-  /**
-   * Unique DbId for the Seed Lot
-   * @return seedLotDbId
-  **/
-  
-      
-
-  public String getSeedLotDbId() {
-    return seedLotDbId;
-  }
-
-  public void setSeedLotDbId(String seedLotDbId) {
-    this.seedLotDbId = seedLotDbId;
-  }
-
-  public BrAPISeedLot additionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-    return this;
-  }
-
-  public BrAPISeedLot putAdditionalInfoItem(String key, Object additionalInfoItem) {
-    if (this.additionalInfo == null) {
-      this.additionalInfo = new JsonObject();
-    }
-    JsonElement newElement = gson.toJsonTree(additionalInfoItem);
-    this.additionalInfo.add(key, newElement);
-    return this;
-  }
-
-  /**
-   * Additional arbitrary info
-   * @return additionalInfo
-   **/
-
-
-  public JsonObject getAdditionalInfo() {
-    return additionalInfo;
-  }
-
-  public void setAdditionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-  }
-
-  public BrAPISeedLot amount(BigDecimal amount) {
-    this.amount = amount;
-    return this;
-  }
-
-  /**
-   * Current balance of seeds in this lot. Could be a count (seeds, bulbs, etc) or a weight (kg of seed).
-   * @return amount
-   **/
-
-
-  @Valid
-  public BigDecimal getAmount() {
-    return amount;
-  }
-
-  public void setAmount(BigDecimal amount) {
-    this.amount = amount;
-  }
-
-  public BrAPISeedLot createdDate(OffsetDateTime createdDate) {
-    this.createdDate = createdDate;
-    return this;
-  }
-
-  /**
-   * The time stamp for when this seed lot was created
-   * @return createdDate
-   **/
-
-
-  @Valid
-  public OffsetDateTime getCreatedDate() {
-    return createdDate;
-  }
-
-  public void setCreatedDate(OffsetDateTime createdDate) {
-    this.createdDate = createdDate;
-  }
-
-  public BrAPISeedLot externalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-    return this;
-  }
-
-  /**
-   * Get externalReferences
-   * @return externalReferences
-   **/
-
-
-  @Valid
-  public List<BrAPIExternalReference> getExternalReferences() {
-    return externalReferences;
-  }
-
-  public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-  }
-
-  public BrAPISeedLot germplasmDbId(String germplasmDbId) {
-    this.germplasmDbId = germplasmDbId;
-    return this;
-  }
-
-  /**
-   * Unique DbId of the Germplasm held in this Seed Lot
-   * @return germplasmDbId
-   **/
-
-
-  public String getGermplasmDbId() {
-    return germplasmDbId;
-  }
-
-  public void setGermplasmDbId(String germplasmDbId) {
-    this.germplasmDbId = germplasmDbId;
-  }
-
-  public BrAPISeedLot lastUpdated(OffsetDateTime lastUpdated) {
-    this.lastUpdated = lastUpdated;
-    return this;
-  }
-
-  /**
-   * The timestamp for the last update to this Seed Lot (including transactions)
-   * @return lastUpdated
-   **/
-
-
-  @Valid
-  public OffsetDateTime getLastUpdated() {
-    return lastUpdated;
-  }
-
-  public void setLastUpdated(OffsetDateTime lastUpdated) {
-    this.lastUpdated = lastUpdated;
-  }
-
-  public BrAPISeedLot locationDbId(String locationDbId) {
-    this.locationDbId = locationDbId;
-    return this;
-  }
-
-  /**
-   * DbId of the storage location
-   * @return locationDbId
-   **/
-
-
-  public String getLocationDbId() {
-    return locationDbId;
-  }
-
-  public void setLocationDbId(String locationDbId) {
-    this.locationDbId = locationDbId;
-  }
-
-  public BrAPISeedLot programDbId(String programDbId) {
-    this.programDbId = programDbId;
-    return this;
-  }
-
-  /**
-   * Unique DbId of the breeding Program this Seed Lot belongs to
-   * @return programDbId
-   **/
-
-
-  public String getProgramDbId() {
-    return programDbId;
-  }
+	@JsonProperty("additionalInfo")
+	@JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
+	private JsonObject additionalInfo = null;
 
-  public void setProgramDbId(String programDbId) {
-    this.programDbId = programDbId;
-  }
+	@JsonProperty("amount")
+	private BigDecimal amount = null;
 
-  public BrAPISeedLot seedLotDescription(String seedLotDescription) {
-    this.seedLotDescription = seedLotDescription;
-    return this;
-  }
+	@JsonProperty("contentMixture")
+	private List<BrAPISeedLotContentMixture> contentMixture = null;
 
-  /**
-   * A general description of this Seed Lot
-   * @return seedLotDescription
-   **/
+	@JsonProperty("createdDate")
+	private OffsetDateTime createdDate = null;
 
+	@JsonProperty("externalReferences")
+	private List<BrAPIExternalReference> externalReferences = null;
+
+	@Deprecated
+	@JsonProperty("germplasmDbId")
+	private String germplasmDbId = null;
+
+	@JsonProperty("lastUpdated")
+	private OffsetDateTime lastUpdated = null;
+
+	@JsonProperty("locationDbId")
+	private String locationDbId = null;
+
+	@JsonProperty("locationName")
+	private String locationName = null;
+
+	@JsonProperty("programDbId")
+	private String programDbId = null;
+
+	@JsonProperty("programName")
+	private String programName = null;
+
+	@JsonProperty("seedLotDbId")
+	private String seedLotDbId = null;
+
+	@JsonProperty("seedLotDescription")
+	private String seedLotDescription = null;
+
+	@JsonProperty("seedLotName")
+	private String seedLotName = null;
+
+	@JsonProperty("sourceCollection")
+	private String sourceCollection = null;
+
+	@JsonProperty("storageLocation")
+	private String storageLocation = null;
+
+	@JsonProperty("units")
+	private String units = null;
+
+	private final transient Gson gson = new Gson();
+
+	public BrAPISeedLot additionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+		return this;
+	}
+
+	public BrAPISeedLot putAdditionalInfoItem(String key, Object additionalInfoItem) {
+		if (this.additionalInfo == null) {
+			this.additionalInfo = new JsonObject();
+		}
+		JsonElement newElement = gson.toJsonTree(additionalInfoItem);
+		this.additionalInfo.add(key, newElement);
+		return this;
+	}
+
+	/**
+	 * A free space containing any additional information related to a particular
+	 * object. A data source may provide any JSON object, unrestriced by the BrAPI
+	 * specification.
+	 *
+	 * @return additionalInfo
+	 **/
+
+	public JsonObject getAdditionalInfo() {
+		return additionalInfo;
+	}
+
+	public void setAdditionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+	}
+
+	public BrAPISeedLot amount(BigDecimal amount) {
+		this.amount = amount;
+		return this;
+	}
+
+	/**
+	 * The current balance of the amount of material in a BrAPISeedLot. Could be a
+	 * count (seeds, bulbs, etc) or a weight (kg of seed).
+	 *
+	 * @return amount
+	 **/
+
+	public BigDecimal getAmount() {
+		return amount;
+	}
+
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
+
+	public BrAPISeedLot contentMixture(List<BrAPISeedLotContentMixture> contentMixture) {
+		this.contentMixture = contentMixture;
+		return this;
+	}
+
+	public BrAPISeedLot addContentMixtureItem(BrAPISeedLotContentMixture contentMixtureItem) {
+		if (this.contentMixture == null) {
+			this.contentMixture = new ArrayList<BrAPISeedLotContentMixture>();
+		}
+		this.contentMixture.add(contentMixtureItem);
+		return this;
+	}
+
+	/**
+	 * The mixture of germplasm present in the seed lot. &lt;br/&gt; If this seed
+	 * lot only contains a single germplasm, the response should contain the name
+	 * and DbId of that germplasm with a mixturePercentage value of 100 &lt;br/&gt;
+	 * If the seed lot contains a mixture of different germplasm, the response
+	 * should contain the name and DbId every germplasm present. The
+	 * mixturePercentage field should contain the ratio of each germplasm in the
+	 * total mixture. All of the mixturePercentage values in this array should sum
+	 * to equal 100.
+	 *
+	 * @return contentMixture
+	 **/
+
+	public List<BrAPISeedLotContentMixture> getContentMixture() {
+		return contentMixture;
+	}
+
+	public void setContentMixture(List<BrAPISeedLotContentMixture> contentMixture) {
+		this.contentMixture = contentMixture;
+	}
+
+	public BrAPISeedLot createdDate(OffsetDateTime createdDate) {
+		this.createdDate = createdDate;
+		return this;
+	}
+
+	/**
+	 * The time stamp for when this seed lot was created
+	 *
+	 * @return createdDate
+	 **/
+
+	public OffsetDateTime getCreatedDate() {
+		return createdDate;
+	}
+
+	public void setCreatedDate(OffsetDateTime createdDate) {
+		this.createdDate = createdDate;
+	}
+
+	public BrAPISeedLot externalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+		return this;
+	}
+
+	public BrAPISeedLot addExternalReferencesItem(BrAPIExternalReference externalReferencesItem) {
+		if (this.externalReferences == null) {
+			this.externalReferences = new ArrayList<BrAPIExternalReference>();
+		}
+		this.externalReferences.add(externalReferencesItem);
+		return this;
+	}
+
+	/**
+	 * An array of external reference ids. These are references to this piece of
+	 * data in an external system. Could be a simple string or a URI.
+	 *
+	 * @return externalReferences
+	 **/
+
+	public List<BrAPIExternalReference> getExternalReferences() {
+		return externalReferences;
+	}
+
+	public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+	}
+
+	@Deprecated
+	public BrAPISeedLot germplasmDbId(String germplasmDbId) {
+		this.germplasmDbId = germplasmDbId;
+		return this;
+	}
+
+	/**
+	 * The unique identifier for a Location
+	 *
+	 * @return locationDbId
+	 **/
+
+	@Deprecated
+	public String getGermplasmDbId() {
+		return germplasmDbId;
+	}
+
+	@Deprecated
+	public void setGermplasmDbId(String germplasmDbId) {
+		this.germplasmDbId = germplasmDbId;
+	}
+
+	public BrAPISeedLot lastUpdated(OffsetDateTime lastUpdated) {
+		this.lastUpdated = lastUpdated;
+		return this;
+	}
+
+	/**
+	 * The timestamp for the last update to this Seed Lot (including transactions)
+	 *
+	 * @return lastUpdated
+	 **/
+
+	public OffsetDateTime getLastUpdated() {
+		return lastUpdated;
+	}
+
+	public void setLastUpdated(OffsetDateTime lastUpdated) {
+		this.lastUpdated = lastUpdated;
+	}
+
+	public BrAPISeedLot locationDbId(String locationDbId) {
+		this.locationDbId = locationDbId;
+		return this;
+	}
+
+	/**
+	 * The unique identifier for a Location
+	 *
+	 * @return locationDbId
+	 **/
+
+	public String getLocationDbId() {
+		return locationDbId;
+	}
+
+	public void setLocationDbId(String locationDbId) {
+		this.locationDbId = locationDbId;
+	}
+
+	public BrAPISeedLot locationName(String locationName) {
+		this.locationName = locationName;
+		return this;
+	}
+
+	/**
+	 * A human readable name for a location
+	 *
+	 * @return locationName
+	 **/
+
+	public String getLocationName() {
+		return locationName;
+	}
+
+	public void setLocationName(String locationName) {
+		this.locationName = locationName;
+	}
+
+	public BrAPISeedLot programDbId(String programDbId) {
+		this.programDbId = programDbId;
+		return this;
+	}
+
+	/**
+	 * The unique DbId of the breeding program this Seed Lot belongs to
+	 *
+	 * @return programDbId
+	 **/
+
+	public String getProgramDbId() {
+		return programDbId;
+	}
+
+	public void setProgramDbId(String programDbId) {
+		this.programDbId = programDbId;
+	}
+
+	public BrAPISeedLot programName(String programName) {
+		this.programName = programName;
+		return this;
+	}
+
+	/**
+	 * The human readable name of the breeding program this Seed Lot belongs to
+	 *
+	 * @return programName
+	 **/
+
+	public String getProgramName() {
+		return programName;
+	}
+
+	public void setProgramName(String programName) {
+		this.programName = programName;
+	}
+
+	public BrAPISeedLot seedLotDbId(String seedLotDbId) {
+		this.seedLotDbId = seedLotDbId;
+		return this;
+	}
+
+	/**
+	 * Unique DbId for the Seed Lot
+	 *
+	 * @return seedLotDbId
+	 **/
+
+	public String getSeedLotDbId() {
+		return seedLotDbId;
+	}
+
+	public void setSeedLotDbId(String seedLotDbId) {
+		this.seedLotDbId = seedLotDbId;
+	}
+
+	public BrAPISeedLot seedLotDescription(String seedLotDescription) {
+		this.seedLotDescription = seedLotDescription;
+		return this;
+	}
+
+	/**
+	 * A general description of this Seed Lot
+	 *
+	 * @return seedLotDescription
+	 **/
+
+	public String getSeedLotDescription() {
+		return seedLotDescription;
+	}
+
+	public void setSeedLotDescription(String seedLotDescription) {
+		this.seedLotDescription = seedLotDescription;
+	}
+
+	public BrAPISeedLot seedLotName(String seedLotName) {
+		this.seedLotName = seedLotName;
+		return this;
+	}
+
+	/**
+	 * A human readable name for this Seed Lot
+	 *
+	 * @return seedLotName
+	 **/
+
+	public String getSeedLotName() {
+		return seedLotName;
+	}
+
+	public void setSeedLotName(String seedLotName) {
+		this.seedLotName = seedLotName;
+	}
+
+	public BrAPISeedLot sourceCollection(String sourceCollection) {
+		this.sourceCollection = sourceCollection;
+		return this;
+	}
+
+	/**
+	 * The description of the source where this material was originally collected
+	 * (wild, nursery, etc)
+	 *
+	 * @return sourceCollection
+	 **/
+
+	public String getSourceCollection() {
+		return sourceCollection;
+	}
+
+	public void setSourceCollection(String sourceCollection) {
+		this.sourceCollection = sourceCollection;
+	}
+
+	public BrAPISeedLot storageLocation(String storageLocation) {
+		this.storageLocation = storageLocation;
+		return this;
+	}
+
+	/**
+	 * Description the storage location
+	 *
+	 * @return storageLocation
+	 **/
+
+	public String getStorageLocation() {
+		return storageLocation;
+	}
+
+	public void setStorageLocation(String storageLocation) {
+		this.storageLocation = storageLocation;
+	}
+
+	public BrAPISeedLot units(String units) {
+		this.units = units;
+		return this;
+	}
+
+	/**
+	 * A description of the things being counted in a BrAPISeedLot (seeds, bulbs,
+	 * kg, tree, etc)
+	 *
+	 * @return units
+	 **/
+
+	public String getUnits() {
+		return units;
+	}
+
+	public void setUnits(String units) {
+		this.units = units;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPISeedLot seedLot = (BrAPISeedLot) o;
+		return Objects.equals(this.additionalInfo, seedLot.additionalInfo)
+				&& Objects.equals(this.amount, seedLot.amount)
+				&& Objects.equals(this.contentMixture, seedLot.contentMixture)
+				&& Objects.equals(this.createdDate, seedLot.createdDate)
+				&& Objects.equals(this.externalReferences, seedLot.externalReferences)
+				&& Objects.equals(this.germplasmDbId, seedLot.germplasmDbId)
+				&& Objects.equals(this.lastUpdated, seedLot.lastUpdated)
+				&& Objects.equals(this.locationDbId, seedLot.locationDbId)
+				&& Objects.equals(this.locationName, seedLot.locationName)
+				&& Objects.equals(this.programDbId, seedLot.programDbId)
+				&& Objects.equals(this.programName, seedLot.programName)
+				&& Objects.equals(this.seedLotDbId, seedLot.seedLotDbId)
+				&& Objects.equals(this.seedLotDescription, seedLot.seedLotDescription)
+				&& Objects.equals(this.seedLotName, seedLot.seedLotName)
+				&& Objects.equals(this.sourceCollection, seedLot.sourceCollection)
+				&& Objects.equals(this.storageLocation, seedLot.storageLocation)
+				&& Objects.equals(this.units, seedLot.units);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(additionalInfo, amount, contentMixture, createdDate, externalReferences, germplasmDbId,
+				lastUpdated, locationDbId, locationName, programDbId, programName, seedLotDbId, seedLotDescription,
+				seedLotName, sourceCollection, storageLocation, units);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class BrAPISeedLot {\n");
+
+		sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
+		sb.append("    amount: ").append(toIndentedString(amount)).append("\n");
+		sb.append("    contentMixture: ").append(toIndentedString(contentMixture)).append("\n");
+		sb.append("    createdDate: ").append(toIndentedString(createdDate)).append("\n");
+		sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
+		sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
+		sb.append("    lastUpdated: ").append(toIndentedString(lastUpdated)).append("\n");
+		sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
+		sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
+		sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
+		sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
+		sb.append("    seedLotDbId: ").append(toIndentedString(seedLotDbId)).append("\n");
+		sb.append("    seedLotDescription: ").append(toIndentedString(seedLotDescription)).append("\n");
+		sb.append("    seedLotName: ").append(toIndentedString(seedLotName)).append("\n");
+		sb.append("    sourceCollection: ").append(toIndentedString(sourceCollection)).append("\n");
+		sb.append("    storageLocation: ").append(toIndentedString(storageLocation)).append("\n");
+		sb.append("    units: ").append(toIndentedString(units)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 
-  public String getSeedLotDescription() {
-    return seedLotDescription;
-  }
-
-  public void setSeedLotDescription(String seedLotDescription) {
-    this.seedLotDescription = seedLotDescription;
-  }
-
-  public BrAPISeedLot seedLotName(String seedLotName) {
-    this.seedLotName = seedLotName;
-    return this;
-  }
-
-  /**
-   * A human readable name for this Seed Lot
-   * @return seedLotName
-   **/
-
-
-  public String getSeedLotName() {
-    return seedLotName;
-  }
-
-  public void setSeedLotName(String seedLotName) {
-    this.seedLotName = seedLotName;
-  }
-
-  public BrAPISeedLot sourceCollection(String sourceCollection) {
-    this.sourceCollection = sourceCollection;
-    return this;
-  }
-
-  /**
-   * The description of the source where this material was originally collected (wild, nursery, etc)
-   * @return sourceCollection
-   **/
-
-
-  public String getSourceCollection() {
-    return sourceCollection;
-  }
-
-  public void setSourceCollection(String sourceCollection) {
-    this.sourceCollection = sourceCollection;
-  }
-
-  public BrAPISeedLot storageLocation(String storageLocation) {
-    this.storageLocation = storageLocation;
-    return this;
-  }
-
-  /**
-   * Description the storage location
-   * @return storageLocation
-   **/
-
-
-  public String getStorageLocation() {
-    return storageLocation;
-  }
-
-  public void setStorageLocation(String storageLocation) {
-    this.storageLocation = storageLocation;
-  }
-
-  public BrAPISeedLot units(String units) {
-    this.units = units;
-    return this;
-  }
-
-  /**
-   * Description of the things being counted in this Seed Lot (seeds, bulbs, kg, tree, etc)
-   * @return units
-   **/
-
-
-  public String getUnits() {
-    return units;
-  }
-
-  public void setUnits(String units) {
-    this.units = units;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPISeedLot seedLot = (BrAPISeedLot) o;
-    return Objects.equals(this.seedLotDbId, seedLot.seedLotDbId) &&
-            Objects.equals(this.additionalInfo, seedLot.additionalInfo) &&
-            Objects.equals(this.amount, seedLot.amount) &&
-            Objects.equals(this.createdDate, seedLot.createdDate) &&
-            Objects.equals(this.externalReferences, seedLot.externalReferences) &&
-            Objects.equals(this.germplasmDbId, seedLot.germplasmDbId) &&
-            Objects.equals(this.lastUpdated, seedLot.lastUpdated) &&
-            Objects.equals(this.locationDbId, seedLot.locationDbId) &&
-            Objects.equals(this.programDbId, seedLot.programDbId) &&
-            Objects.equals(this.seedLotDescription, seedLot.seedLotDescription) &&
-            Objects.equals(this.seedLotName, seedLot.seedLotName) &&
-            Objects.equals(this.sourceCollection, seedLot.sourceCollection) &&
-            Objects.equals(this.storageLocation, seedLot.storageLocation) &&
-            Objects.equals(this.units, seedLot.units);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(seedLotDbId, additionalInfo, amount, createdDate, externalReferences, germplasmDbId, lastUpdated, locationDbId, programDbId, seedLotDescription, seedLotName, sourceCollection, storageLocation, units);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SeedLot {\n");
-    sb.append("    seedLotDbId: ").append(toIndentedString(seedLotDbId)).append("\n");
-    sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-    sb.append("    amount: ").append(toIndentedString(amount)).append("\n");
-    sb.append("    createdDate: ").append(toIndentedString(createdDate)).append("\n");
-    sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-    sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-    sb.append("    lastUpdated: ").append(toIndentedString(lastUpdated)).append("\n");
-    sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
-    sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-    sb.append("    seedLotDescription: ").append(toIndentedString(seedLotDescription)).append("\n");
-    sb.append("    seedLotName: ").append(toIndentedString(seedLotName)).append("\n");
-    sb.append("    sourceCollection: ").append(toIndentedString(sourceCollection)).append("\n");
-    sb.append("    storageLocation: ").append(toIndentedString(storageLocation)).append("\n");
-    sb.append("    units: ").append(toIndentedString(units)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPISeedLotContentMixture.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPISeedLotContentMixture.java
new file mode 100644
index 00000000..2530758d
--- /dev/null
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPISeedLotContentMixture.java
@@ -0,0 +1,176 @@
+/*
+ * BrAPI-Germplasm
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ *
+ * OpenAPI spec version: 2.1
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package org.brapi.v2.model.germ;
+
+import java.util.Objects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * SeedLotContentMixture
+ */
+
+public class BrAPISeedLotContentMixture {
+	@JsonProperty("crossDbId")
+	private String crossDbId = null;
+
+	@JsonProperty("crossName")
+	private String crossName = null;
+
+	@JsonProperty("germplasmDbId")
+	private String germplasmDbId = null;
+
+	@JsonProperty("germplasmName")
+	private String germplasmName = null;
+
+	@JsonProperty("mixturePercentage")
+	private Integer mixturePercentage = null;
+
+	public BrAPISeedLotContentMixture crossDbId(String crossDbId) {
+		this.crossDbId = crossDbId;
+		return this;
+	}
+
+	/**
+	 * The unique DbId for a cross contained in this seed lot
+	 *
+	 * @return crossDbId
+	 **/
+	public String getCrossDbId() {
+		return crossDbId;
+	}
+
+	public void setCrossDbId(String crossDbId) {
+		this.crossDbId = crossDbId;
+	}
+
+	public BrAPISeedLotContentMixture crossName(String crossName) {
+		this.crossName = crossName;
+		return this;
+	}
+
+	/**
+	 * The human readable name for a cross contained in this seed lot
+	 *
+	 * @return crossName
+	 **/
+	public String getCrossName() {
+		return crossName;
+	}
+
+	public void setCrossName(String crossName) {
+		this.crossName = crossName;
+	}
+
+	public BrAPISeedLotContentMixture germplasmDbId(String germplasmDbId) {
+		this.germplasmDbId = germplasmDbId;
+		return this;
+	}
+
+	/**
+	 * The unique DbId of the Germplasm contained in this Seed Lot
+	 *
+	 * @return germplasmDbId
+	 **/
+	public String getGermplasmDbId() {
+		return germplasmDbId;
+	}
+
+	public void setGermplasmDbId(String germplasmDbId) {
+		this.germplasmDbId = germplasmDbId;
+	}
+
+	public BrAPISeedLotContentMixture germplasmName(String germplasmName) {
+		this.germplasmName = germplasmName;
+		return this;
+	}
+
+	/**
+	 * The human readable name of the Germplasm contained in this Seed Lot
+	 *
+	 * @return germplasmName
+	 **/
+	public String getGermplasmName() {
+		return germplasmName;
+	}
+
+	public void setGermplasmName(String germplasmName) {
+		this.germplasmName = germplasmName;
+	}
+
+	public BrAPISeedLotContentMixture mixturePercentage(Integer mixturePercentage) {
+		this.mixturePercentage = mixturePercentage;
+		return this;
+	}
+
+	/**
+	 * The percentage of the given germplasm in the seed lot mixture.
+	 *
+	 * @return mixturePercentage
+	 **/
+
+	public Integer getMixturePercentage() {
+		return mixturePercentage;
+	}
+
+	public void setMixturePercentage(Integer mixturePercentage) {
+		this.mixturePercentage = mixturePercentage;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPISeedLotContentMixture seedLotContentMixture = (BrAPISeedLotContentMixture) o;
+		return Objects.equals(this.crossDbId, seedLotContentMixture.crossDbId)
+				&& Objects.equals(this.crossName, seedLotContentMixture.crossName)
+				&& Objects.equals(this.germplasmDbId, seedLotContentMixture.germplasmDbId)
+				&& Objects.equals(this.germplasmName, seedLotContentMixture.germplasmName)
+				&& Objects.equals(this.mixturePercentage, seedLotContentMixture.mixturePercentage);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(crossDbId, crossName, germplasmDbId, germplasmName, mixturePercentage);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class BrAPISeedLotContentMixture {\n");
+
+		sb.append("    crossDbId: ").append(toIndentedString(crossDbId)).append("\n");
+		sb.append("    crossName: ").append(toIndentedString(crossName)).append("\n");
+		sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
+		sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
+		sb.append("    mixturePercentage: ").append(toIndentedString(mixturePercentage)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
+
+}

From 38f6f3ae9df1e6b40a5200a7d2fd2e175aff93bb Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Mon, 21 Aug 2023 15:15:26 -0400
Subject: [PATCH 20/28] fixes issues #91, #92, #93, #94, #95, #143, #144, #149,
 #150, #109, #110, #111, #112, #113, #114. Dependent on #199

---
 .../phenotype/ImageQueryParams.java           |    2 +
 .../phenotype/ObservationQueryParams.java     |    6 +
 .../ObservationTableQueryParams.java          |   35 +
 .../v2/modules/phenotype/ImagesApiTest.java   |  134 +-
 .../phenotype/ObservationsApiTest.java        |  158 +-
 .../v2/model/pheno/BrAPIObservation.java      |  800 ++++-----
 ...BrAPIObservationUnitLevelRelationship.java |  151 +-
 .../request/BrAPIImageSearchRequest.java      |  166 +-
 .../BrAPIObservationSearchRequest.java        | 1527 +++++++++--------
 9 files changed, 1615 insertions(+), 1364 deletions(-)

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ImageQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ImageQueryParams.java
index 7d23a559..d7214d17 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ImageQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ImageQueryParams.java
@@ -34,6 +34,8 @@
 @Accessors(fluent=true)
 public class ImageQueryParams extends BrAPIQueryParams {
 
+    protected String commonCropName;
+    protected String programDbId;
     protected String imageDbId;
     protected String imageName;
     protected String observationUnitDbId;
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationQueryParams.java
index bfae4d60..7c153996 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationQueryParams.java
@@ -52,6 +52,12 @@ public class ObservationQueryParams extends BrAPIQueryParams {
     private String externalReferenceId;
     @Deprecated
     private String externalReferenceID;
+    private String observationUnitLevelRelationshipDbId;
+    private String observationUnitLevelRelationshipCode;
+    private String commonCropName;
+    private String observationUnitLevelRelationshipOrder;
+    private String observationUnitLevelRelationshipName;
+
     
     public String getExternalReferenceId() {
 		return externalReferenceId;
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationTableQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationTableQueryParams.java
index c138aab3..f7c01b94 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationTableQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationTableQueryParams.java
@@ -42,11 +42,46 @@ public class ObservationTableQueryParams extends BrAPIQueryParams {
     protected String trialDbId;
     protected String programDbId;
     protected String seasonDbId;
+    @Deprecated
     protected String observationLevel;
     protected String searchResultsDbId;
     protected String observationTimeStampRangeStart;
     protected String observationTimeStampRangeEnd;
+    protected String externalReferenceId;
+    @Deprecated
     protected String externalReferenceID;
     protected String externalReferenceSource;
+    protected String observationUnitLevelRelationshipDbId;
+    protected String observationUnitLevelRelationshipCode;
+    protected String observationUnitLevelRelationshipOrder;
+    protected String observationUnitLevelOrder;
+    protected String observationUnitLevelCode;
+    protected String observationUnitLevelRelationshipName;
+    protected String observationUnitLevelName;
+
+
+    
+    public String getExternalReferenceId() {
+		return externalReferenceId;
+	}
+    public String externalReferenceId() {
+		return externalReferenceId;
+	}
+	public void setExternalReferenceId(String externalReferenceId) {
+		this.externalReferenceId = externalReferenceId;
+	}
+
+	@Deprecated
+	public String getExternalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public String externalReferenceID() {
+		return externalReferenceID;
+	}
+	@Deprecated
+	public void setExternalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+	}
 
 }
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ImagesApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ImagesApiTest.java
index 7fcda15b..d37a0c87 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ImagesApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ImagesApiTest.java
@@ -1,6 +1,6 @@
 /*
  * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/URL_Structure.md\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Response_Structure.md\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Date_Time_Encoding.md\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Location_Encoding.md\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Error_Handling.md\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Search_Services.md\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/URL_Structure.md\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Response_Structure.md\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Date_Time_Encoding.md\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Location_Encoding.md\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Error_Handling.md\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Search_Services.md\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Images, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
  *
  * OpenAPI spec version: 2.0
  * 
@@ -14,6 +14,7 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.brapi.client.v2.ApiResponse;
+import org.brapi.client.v2.BrAPIClientTest;
 import org.brapi.client.v2.model.exceptions.ApiException;
 import org.brapi.client.v2.model.queryParams.phenotype.ImageQueryParams;
 import org.brapi.v2.model.BrAPIAcceptedSearchResponse;
@@ -21,29 +22,24 @@
 import org.brapi.v2.model.pheno.response.BrAPIImageListResponse;
 import org.brapi.v2.model.pheno.request.BrAPIImageSearchRequest;
 import org.brapi.v2.model.pheno.response.BrAPIImageSingleResponse;
-import org.brapi.v2.model.pheno.response.BrAPIObservationUnitListResponse;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
 /**
  * API tests for ImagesApi
  */
-public class ImagesApiTest {
-
-	private static ImagesApi api;
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ImagesApiTest extends BrAPIClientTest {
 
-	@BeforeAll
-	public static void setup() throws ApiException {
-		api = new ImagesApi();
-		api.getApiClient().authenticate((v) -> {
-			return "XXXX";
-		});
-	}
+	private ImagesApi api = new ImagesApi(this.apiClient);
 
 	/**
 	 * Get the image meta data summaries
@@ -60,20 +56,13 @@ public static void setup() throws ApiException {
 	 */
 	@Test
 	public void imagesGetTest() throws ApiException {
-		String imageDbId = null;
-		String imageName = null;
-		String observationUnitDbId = null;
-		String observationDbId = null;
-		String descriptiveOntologyTerm = null;
-		String externalReferenceID = null;
-		String externalReferenceSource = null;
-		Integer page = null;
-		Integer pageSize = null;
-
-		ImageQueryParams queryParams = new ImageQueryParams();
+		String imageDbId = "image1";
+
+		ImageQueryParams queryParams = new ImageQueryParams().imageDbId(imageDbId);
 		ApiResponse<BrAPIImageListResponse> response = api.imagesGet(queryParams);
 
-		// TODO: test validations
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(imageDbId, response.getBody().getResult().getData().get(0).getImageDbId());
 	}
 
 	/**
@@ -91,13 +80,12 @@ public void imagesGetTest() throws ApiException {
 	 */
 	@Test
 	public void imagesImageDbIdGetTest() throws ApiException {
-		String imageDbId = null;
+		String imageDbId = "image1";
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-			ApiResponse<BrAPIImageSingleResponse> response = api.imagesImageDbIdGet(imageDbId);
-		});
+		ApiResponse<BrAPIImageSingleResponse> response = api.imagesImageDbIdGet(imageDbId);
+
+		assertEquals(imageDbId, response.getBody().getResult().getImageDbId());
 
-		// TODO: test validations
 	}
 
 	/**
@@ -114,14 +102,12 @@ public void imagesImageDbIdGetTest() throws ApiException {
 	 */
 	@Test
 	public void imagesImageDbIdImagecontentPutTest() throws ApiException {
-		String imageDbId = null;
-		Object body = null;
+		String imageDbId = "image1";
+		Object body = new byte[10];
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-			ApiResponse<BrAPIImageSingleResponse> response = api.imagesImageDbIdImagecontentPut(imageDbId, body);
-		});
+		ApiResponse<BrAPIImageSingleResponse> response = api.imagesImageDbIdImagecontentPut(imageDbId, body);
 
-		// TODO: test validations
+		assertEquals(imageDbId, response.getBody().getResult().getImageDbId());
 	}
 
 	/**
@@ -148,14 +134,13 @@ public void imagesImageDbIdImagecontentPutTest() throws ApiException {
 	 */
 	@Test
 	public void imagesImageDbIdPutTest() throws ApiException {
-		String imageDbId = null;
-		BrAPIImage body = null;
+		String imageDbId = "image1";
+		BrAPIImage body = new BrAPIImage().imageDbId(imageDbId).imageName("New Name");
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-			ApiResponse<BrAPIImageSingleResponse> response = api.imagesImageDbIdPut(imageDbId, body);
-		});
+		ApiResponse<BrAPIImageSingleResponse> response = api.imagesImageDbIdPut(imageDbId, body);
 
-		// TODO: test validations
+		assertEquals(imageDbId, response.getBody().getResult().getImageDbId());
+		assertEquals(body.getImageName(), response.getBody().getResult().getImageName());
 	}
 
 	/**
@@ -180,13 +165,14 @@ public void imagesImageDbIdPutTest() throws ApiException {
 	 */
 	@Test
 	public void imagesPostTest() throws ApiException {
-		List<BrAPIImage> body = null;
+		BrAPIImage img = new BrAPIImage().imageName("New Name");
+		List<BrAPIImage> body = Arrays.asList(img);
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-			ApiResponse<BrAPIImageListResponse> response = api.imagesPost(body);
-		});
+		ApiResponse<BrAPIImageListResponse> response = api.imagesPost(body);
 
-		// TODO: test validations
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertNotNull(response.getBody().getResult().getData().get(0).getImageDbId());
+		assertEquals(img.getImageName(), response.getBody().getResult().getData().get(0).getImageName());
 	}
 
 	/**
@@ -205,13 +191,20 @@ public void imagesPostTest() throws ApiException {
 	 */
 	@Test
 	public void searchImagesPostTest() throws ApiException {
-		BrAPIImageSearchRequest body = null;
+		BrAPIImageSearchRequest body = new BrAPIImageSearchRequest().addImageDbIdsItem("image1")
+				.addImageDbIdsItem("image2");
+
+		ApiResponse<Pair<Optional<BrAPIImageListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api
+				.searchImagesPost(body);
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-			ApiResponse<Pair<Optional<BrAPIImageListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api.searchImagesPost(body);
-		});
+		Optional<BrAPIImageListResponse> listResponse = response.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+		// only results are returned
+		assertTrue(listResponse.isPresent());
+		assertFalse(searchIdResponse.isPresent());
 
-		// TODO: test validations
+		assertEquals(2, listResponse.get().getResult().getData().size(),
+				"unexpected number of element returned");
 	}
 
 	/**
@@ -229,15 +222,28 @@ public void searchImagesPostTest() throws ApiException {
 	 */
 	@Test
 	public void searchImagesSearchResultsDbIdGetTest() throws ApiException {
-		String searchResultsDbId = null;
-		Integer page = null;
-		Integer pageSize = null;
-
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-			ApiResponse<Pair<Optional<BrAPIImageListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response =
-					api.searchImagesSearchResultsDbIdGet(searchResultsDbId, page, pageSize);
-		});
-
-		// TODO: test validations
+		BrAPIImageSearchRequest baseRequest = new BrAPIImageSearchRequest().addImageDbIdsItem("image1")
+				.addImageDbIdsItem("image2").addImageDbIdsItem("image1").addImageDbIdsItem("image2")
+				.addImageDbIdsItem("image1").addImageDbIdsItem("image2");
+
+		ApiResponse<Pair<Optional<BrAPIImageListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = this.api
+				.searchImagesPost(baseRequest);
+		Optional<BrAPIImageListResponse> listResponse = response.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+		// only search ID is returned
+		assertFalse(listResponse.isPresent());
+		assertTrue(searchIdResponse.isPresent());
+
+		// Get results from search ID
+		ApiResponse<Pair<Optional<BrAPIImageListResponse>, Optional<BrAPIAcceptedSearchResponse>>> searchResponse = this.api
+				.searchImagesSearchResultsDbIdGet(searchIdResponse.get().getResult().getSearchResultsDbId(), 0, 10);
+		Optional<BrAPIImageListResponse> listResponse2 = searchResponse.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse2 = searchResponse.getBody().getRight();
+		// only results are returned
+		assertTrue(listResponse2.isPresent());
+		assertFalse(searchIdResponse2.isPresent());
+
+		assertEquals(2, listResponse2.get().getResult().getData().size(),
+				"unexpected number of elements returned");
 	}
 }
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ObservationsApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ObservationsApiTest.java
index d3e02326..8b31bf78 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ObservationsApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ObservationsApiTest.java
@@ -1,6 +1,6 @@
 /*
  * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/URL_Structure.md\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Response_Structure.md\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Date_Time_Encoding.md\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Location_Encoding.md\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Error_Handling.md\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Search_Services.md\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/URL_Structure.md\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Response_Structure.md\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Date_Time_Encoding.md\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Location_Encoding.md\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Error_Handling.md\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Search_Services.md\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Observations</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
  *
  * OpenAPI spec version: 2.0
  * 
@@ -14,6 +14,7 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.brapi.client.v2.ApiResponse;
+import org.brapi.client.v2.BrAPIClientTest;
 import org.brapi.client.v2.model.exceptions.ApiException;
 import org.brapi.client.v2.model.queryParams.phenotype.ObservationQueryParams;
 import org.brapi.client.v2.model.queryParams.phenotype.ObservationTableQueryParams;
@@ -21,15 +22,18 @@
 import org.brapi.v2.model.BrAPIWSMIMEDataTypes;
 import org.brapi.v2.model.pheno.BrAPIObservation;
 import org.brapi.v2.model.pheno.response.BrAPIObservationListResponse;
-import org.brapi.v2.model.pheno.request.BrAPIObservationSearchRequest;
 import org.brapi.v2.model.pheno.response.BrAPIObservationSingleResponse;
+import org.brapi.v2.model.pheno.request.BrAPIObservationSearchRequest;
 import org.brapi.v2.model.pheno.response.BrAPIObservationTableResponse;
-import org.brapi.v2.model.pheno.response.BrAPIObservationUnitListResponse;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import java.time.OffsetDateTime;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -37,9 +41,10 @@
 /**
  * API tests for ObservationsApi
  */
-public class ObservationsApiTest {
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ObservationsApiTest extends BrAPIClientTest {
 
-	private final ObservationsApi api = new ObservationsApi();
+	private final ObservationsApi api = new ObservationsApi(this.apiClient);
 
 	/**
 	 * Get a filtered set of Observations
@@ -52,29 +57,13 @@ public class ObservationsApiTest {
 	 */
 	@Test
 	public void observationsGetTest() throws ApiException {
-		String observationDbId = null;
-		String observationUnitDbId = null;
-		String germplasmDbId = null;
-		String observationVariableDbId = null;
-		String studyDbId = null;
-		String locationDbId = null;
-		String trialDbId = null;
-		String programDbId = null;
-		String seasonDbId = null;
-		String observationUnitLevelName = null;
-		String observationUnitLevelOrder = null;
-		String observationUnitLevelCode = null;
-		OffsetDateTime observationTimeStampRangeStart = null;
-		OffsetDateTime observationTimeStampRangeEnd = null;
-		String externalReferenceID = null;
-		String externalReferenceSource = null;
-		Integer page = null;
-		Integer pageSize = null;
+		String observationDbId = "observation1";
 
-		ObservationQueryParams queryParams = new ObservationQueryParams();
+		ObservationQueryParams queryParams = new ObservationQueryParams().observationDbId(observationDbId);
 		ApiResponse<BrAPIObservationListResponse> response = api.observationsGet(queryParams);
 
-		// TODO: test validations
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(observationDbId, response.getBody().getResult().getData().get(0).getObservationDbId());
 	}
 
 	/**
@@ -87,13 +76,11 @@ public void observationsGetTest() throws ApiException {
 	 */
 	@Test
 	public void observationsObservationDbIdGetTest() throws ApiException {
-		String observationDbId = null;
+		String observationDbId = "observation1";
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-			ApiResponse<BrAPIObservationSingleResponse> response = api.observationsObservationDbIdGet(observationDbId);
-		});
+		ApiResponse<BrAPIObservationSingleResponse> response = api.observationsObservationDbIdGet(observationDbId);
 
-		// TODO: test validations
+		assertEquals(observationDbId, response.getBody().getResult().getObservationDbId());
 	}
 
 	/**
@@ -105,15 +92,14 @@ public void observationsObservationDbIdGetTest() throws ApiException {
 	 */
 	@Test
 	public void observationsObservationDbIdPutTest() throws ApiException {
-		String observationDbId = null;
-		BrAPIObservation body = null;
+		String observationDbId = "observation1";
+		BrAPIObservation body = new BrAPIObservation().observationDbId(observationDbId).value("New value");
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-			ApiResponse<BrAPIObservationSingleResponse> response = api.observationsObservationDbIdPut(observationDbId,
-					body);
-		});
+		ApiResponse<BrAPIObservationSingleResponse> response = api.observationsObservationDbIdPut(observationDbId,
+				body);
 
-		// TODO: test validations
+		assertEquals(observationDbId, response.getBody().getResult().getObservationDbId());
+		assertEquals(body.getValue(), response.getBody().getResult().getValue());
 	}
 
 	/**
@@ -125,13 +111,15 @@ public void observationsObservationDbIdPutTest() throws ApiException {
 	 */
 	@Test
 	public void observationsPostTest() throws ApiException {
-		List<BrAPIObservation> body = null;
+		BrAPIObservation obs = new BrAPIObservation().value("New value").observationUnitDbId("observation_unit1")
+				.observationVariableDbId("variable1");
+		List<BrAPIObservation> body = Arrays.asList(obs);
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-			ApiResponse<BrAPIObservationListResponse> response = api.observationsPost(body);
-		});
+		ApiResponse<BrAPIObservationListResponse> response = api.observationsPost(body);
 
-		// TODO: test validations
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertNotNull(response.getBody().getResult().getData().get(0).getObservationDbId());
+		assertEquals(obs.getValue(), response.getBody().getResult().getData().get(0).getValue());
 	}
 
 	/**
@@ -146,13 +134,16 @@ public void observationsPostTest() throws ApiException {
 	 */
 	@Test
 	public void observationsPutTest() throws ApiException {
-		Map<String, BrAPIObservation> body = null;
+		String observationDbId = "observation1";
+		BrAPIObservation obs = new BrAPIObservation().observationDbId(observationDbId).value("New Name");
+		Map<String, BrAPIObservation> body = new HashMap<String, BrAPIObservation>();
+		body.put(observationDbId, obs);
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-			ApiResponse<BrAPIObservationListResponse> response = api.observationsPut(body);
-		});
+		ApiResponse<BrAPIObservationListResponse> response = api.observationsPut(body);
 
-		// TODO: test validations
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(observationDbId, response.getBody().getResult().getData().get(0).getObservationDbId());
+		assertEquals(obs.getValue(), response.getBody().getResult().getData().get(0).getValue());
 	}
 
 	/**
@@ -199,24 +190,14 @@ public void observationsPutTest() throws ApiException {
 	 */
 	@Test
 	public void observationsTableGetTest() throws ApiException {
-		BrAPIWSMIMEDataTypes accept = null;
-		String observationUnitDbId = null;
-		String germplasmDbId = null;
-		String observationVariableDbId = null;
-		String studyDbId = null;
-		String locationDbId = null;
-		String trialDbId = null;
-		String programDbId = null;
-		String seasonDbId = null;
-		String observationLevel = null;
-		String searchResultsDbId = null;
-		OffsetDateTime observationTimeStampRangeStart = null;
-		OffsetDateTime observationTimeStampRangeEnd = null;
+		BrAPIWSMIMEDataTypes accept = BrAPIWSMIMEDataTypes.APPLICATION_JSON;
+		String observationUnitDbId = "observation_unit1";
 
-		ObservationTableQueryParams queryParams = new ObservationTableQueryParams();
+		ObservationTableQueryParams queryParams = new ObservationTableQueryParams()
+				.observationUnitDbId(observationUnitDbId);
 		ApiResponse<BrAPIObservationTableResponse> response = api.observationsTableGet(accept, queryParams);
 
-		// TODO: test validations
+		assertEquals(2, response.getBody().getResult().getData().size());
 	}
 
 	/**
@@ -229,13 +210,20 @@ public void observationsTableGetTest() throws ApiException {
 	 */
 	@Test
 	public void searchObservationsPostTest() throws ApiException {
-		BrAPIObservationSearchRequest body = null;
+		BrAPIObservationSearchRequest body = new BrAPIObservationSearchRequest()
+				.addObservationDbIdsItem("observation1")
+				.addObservationDbIdsItem("observation2");
+
+		ApiResponse<Pair<Optional<BrAPIObservationListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api
+				.searchObservationsPost(body);
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-			ApiResponse<Pair<Optional<BrAPIObservationListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api.searchObservationsPost(body);
-		});
+		Optional<BrAPIObservationListResponse> listResponse = response.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+		// only results are returned
+		assertTrue(listResponse.isPresent());
+		assertFalse(searchIdResponse.isPresent());
 
-		// TODO: test validations
+		assertEquals(2, listResponse.get().getResult().getData().size(), "unexpected number of element returned");
 	}
 
 	/**
@@ -248,17 +236,29 @@ public void searchObservationsPostTest() throws ApiException {
 	 */
 	@Test
 	public void searchObservationsSearchResultsDbIdGetTest() throws ApiException {
-		BrAPIWSMIMEDataTypes accept = null;
-		String searchResultsDbId = null;
+		BrAPIObservationSearchRequest baseRequest = new BrAPIObservationSearchRequest()
+				.addObservationDbIdsItem("observation1").addObservationDbIdsItem("observation2")
+				.addObservationDbIdsItem("observation3").addObservationDbIdsItem("observation4")
+				.addObservationDbIdsItem("observation1").addObservationDbIdsItem("observation2");
 
-		Integer page = null;
-		Integer pageSize = null;
+		ApiResponse<Pair<Optional<BrAPIObservationListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = this.api
+				.searchObservationsPost(baseRequest);
+		Optional<BrAPIObservationListResponse> listResponse = response.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+		// only search ID is returned
+		assertFalse(listResponse.isPresent());
+		assertTrue(searchIdResponse.isPresent());
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-			ApiResponse<Pair<Optional<BrAPIObservationListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api.searchObservationsSearchResultsDbIdGet(accept,
-					searchResultsDbId, page, pageSize);
-		});
+		// Get results from search ID
+		ApiResponse<Pair<Optional<BrAPIObservationListResponse>, Optional<BrAPIAcceptedSearchResponse>>> searchResponse = this.api
+				.searchObservationsSearchResultsDbIdGet(BrAPIWSMIMEDataTypes.APPLICATION_JSON, searchIdResponse.get().getResult().getSearchResultsDbId(), 0,
+						10);
+		Optional<BrAPIObservationListResponse> listResponse2 = searchResponse.getBody().getLeft();
+		Optional<BrAPIAcceptedSearchResponse> searchIdResponse2 = searchResponse.getBody().getRight();
+		// only results are returned
+		assertTrue(listResponse2.isPresent());
+		assertFalse(searchIdResponse2.isPresent());
 
-		// TODO: test validations
+		assertEquals(4, listResponse2.get().getResult().getData().size(), "unexpected number of elements returned");
 	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservation.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservation.java
index b7a6f15b..6ca10222 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservation.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservation.java
@@ -1,9 +1,7 @@
 package org.brapi.v2.model.pheno;
 
 import java.time.OffsetDateTime;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
 import com.google.gson.Gson;
@@ -11,429 +9,431 @@
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.JsonAdapter;
 import org.brapi.v2.model.BrAPIExternalReference;
+import org.brapi.v2.model.BrApiGeoJSON;
 import org.brapi.v2.model.NullableJsonElementTypeAdapterFactory;
 import org.brapi.v2.model.core.BrAPISeason;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import javax.validation.Valid;
-
-
 /**
  * Observation
  */
 
+public class BrAPIObservation {
+	@JsonProperty("additionalInfo")
+	@JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
+	private JsonObject additionalInfo = null;
 
-public class BrAPIObservation  {
-  @JsonProperty("observationDbId")
-  private String observationDbId = null;
-
-  @JsonProperty("additionalInfo")
-  @Valid
-  @JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
-  private JsonObject additionalInfo = null;
-
-  @JsonProperty("collector")
-  private String collector = null;
-
-  @JsonProperty("externalReferences")
-  private List<BrAPIExternalReference> externalReferences = null;
-
-  @JsonProperty("germplasmDbId")
-  private String germplasmDbId = null;
-
-  @JsonProperty("germplasmName")
-  private String germplasmName = null;
-
-  @JsonProperty("observationTimeStamp")
-  private OffsetDateTime observationTimeStamp = null;
-
-  @JsonProperty("observationUnitDbId")
-  private String observationUnitDbId = null;
-
-  @JsonProperty("observationUnitName")
-  private String observationUnitName = null;
-
-  @JsonProperty("observationVariableDbId")
-  private String observationVariableDbId = null;
-
-  @JsonProperty("observationVariableName")
-  private String observationVariableName = null;
-
-  @JsonProperty("season")
-  private BrAPISeason season = null;
-
-  @JsonProperty("studyDbId")
-  private String studyDbId = null;
-
-  @JsonProperty("uploadedBy")
-  private String uploadedBy = null;
-
-  @JsonProperty("value")
-  private String value = null;
-
-  private final transient Gson gson = new Gson();
-
-  public BrAPIObservation observationDbId(String observationDbId) {
-    this.observationDbId = observationDbId;
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies an observation
-   * @return observationDbId
-   **/
-
-
-  public String getObservationDbId() {
-    return observationDbId;
-  }
-
-  public void setObservationDbId(String observationDbId) {
-    this.observationDbId = observationDbId;
-  }
-
-  public BrAPIObservation additionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-    return this;
-  }
-
-  public BrAPIObservation putAdditionalInfoItem(String key, Object additionalInfoItem) {
-    if (this.additionalInfo == null) {
-      this.additionalInfo = new JsonObject();
-    }
-    JsonElement newElement = gson.toJsonTree(additionalInfoItem);
-    this.additionalInfo.add(key, newElement);
-    return this;
-  }
-
-  /**
-   * Additional arbitrary info
-   * @return additionalInfo
-   **/
-
-
-  public JsonObject getAdditionalInfo() {
-    return additionalInfo;
-  }
-
-  public void setAdditionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-  }
-
-  public BrAPIObservation collector(String collector) {
-    this.collector = collector;
-    return this;
-  }
-
-  /**
-   * The name or identifier of the entity which collected the observation
-   * @return collector
-   **/
-
-
-  public String getCollector() {
-    return collector;
-  }
-
-  public void setCollector(String collector) {
-    this.collector = collector;
-  }
-
-  public BrAPIObservation externalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-    return this;
-  }
-
-  /**
-   * Get externalReferences
-   * @return externalReferences
-   **/
-
-
-  @Valid
-  public List<BrAPIExternalReference> getExternalReferences() {
-    return externalReferences;
-  }
-
-  public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-  }
-
-  public BrAPIObservation germplasmDbId(String germplasmDbId) {
-    this.germplasmDbId = germplasmDbId;
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies a germplasm
-   * @return germplasmDbId
-   **/
-
-
-  public String getGermplasmDbId() {
-    return germplasmDbId;
-  }
-
-  public void setGermplasmDbId(String germplasmDbId) {
-    this.germplasmDbId = germplasmDbId;
-  }
-
-  public BrAPIObservation germplasmName(String germplasmName) {
-    this.germplasmName = germplasmName;
-    return this;
-  }
-
-  /**
-   * Name of the germplasm. It can be the preferred name and does not have to be unique.
-   * @return germplasmName
-   **/
-
-
-  public String getGermplasmName() {
-    return germplasmName;
-  }
-
-  public void setGermplasmName(String germplasmName) {
-    this.germplasmName = germplasmName;
-  }
-
-  public BrAPIObservation observationTimeStamp(OffsetDateTime observationTimeStamp) {
-    this.observationTimeStamp = observationTimeStamp;
-    return this;
-  }
-
-  /**
-   * The date and time when this observation was made
-   * @return observationTimeStamp
-   **/
-
-
-  @Valid
-  public OffsetDateTime getObservationTimeStamp() {
-    return observationTimeStamp;
-  }
-
-  public void setObservationTimeStamp(OffsetDateTime observationTimeStamp) {
-    this.observationTimeStamp = observationTimeStamp;
-  }
-
-  public BrAPIObservation observationUnitDbId(String observationUnitDbId) {
-    this.observationUnitDbId = observationUnitDbId;
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies an observation unit
-   * @return observationUnitDbId
-   **/
+	@JsonProperty("collector")
+	private String collector = null;
 
+	@JsonProperty("externalReferences")
+	private List<BrAPIExternalReference> externalReferences = null;
 
-  public String getObservationUnitDbId() {
-    return observationUnitDbId;
-  }
+	@JsonProperty("geoCoordinates")
+	private BrApiGeoJSON geoCoordinates = null;
 
-  public void setObservationUnitDbId(String observationUnitDbId) {
-    this.observationUnitDbId = observationUnitDbId;
-  }
+	@JsonProperty("germplasmDbId")
+	private String germplasmDbId = null;
 
-  public BrAPIObservation observationUnitName(String observationUnitName) {
-    this.observationUnitName = observationUnitName;
-    return this;
-  }
+	@JsonProperty("germplasmName")
+	private String germplasmName = null;
 
-  /**
-   * A human readable name for an observation unit
-   * @return observationUnitName
-   **/
+	@JsonProperty("observationDbId")
+	private String observationDbId = null;
 
+	@JsonProperty("observationTimeStamp")
+	private OffsetDateTime observationTimeStamp = null;
 
-  public String getObservationUnitName() {
-    return observationUnitName;
-  }
+	@JsonProperty("observationUnitDbId")
+	private String observationUnitDbId = null;
 
-  public void setObservationUnitName(String observationUnitName) {
-    this.observationUnitName = observationUnitName;
-  }
+	@JsonProperty("observationUnitName")
+	private String observationUnitName = null;
 
-  public BrAPIObservation observationVariableDbId(String observationVariableDbId) {
-    this.observationVariableDbId = observationVariableDbId;
-    return this;
-  }
+	@JsonProperty("observationVariableDbId")
+	private String observationVariableDbId = null;
 
-  /**
-   * The ID which uniquely identifies an observation variable
-   * @return observationVariableDbId
-   **/
+	@JsonProperty("observationVariableName")
+	private String observationVariableName = null;
 
+	@JsonProperty("season")
+	private BrAPISeason season = null;
 
-  public String getObservationVariableDbId() {
-    return observationVariableDbId;
-  }
+	@JsonProperty("studyDbId")
+	private String studyDbId = null;
 
-  public void setObservationVariableDbId(String observationVariableDbId) {
-    this.observationVariableDbId = observationVariableDbId;
-  }
+	@JsonProperty("uploadedBy")
+	private String uploadedBy = null;
+
+	@JsonProperty("value")
+	private String value = null;
 
-  public BrAPIObservation observationVariableName(String observationVariableName) {
-    this.observationVariableName = observationVariableName;
-    return this;
-  }
+	private final transient Gson gson = new Gson();
 
-  /**
-   * A human readable name for an observation variable
-   * @return observationVariableName
-   **/
+	public BrAPIObservation observationDbId(String observationDbId) {
+		this.observationDbId = observationDbId;
+		return this;
+	}
 
+	/**
+	 * The ID which uniquely identifies an observation
+	 * 
+	 * @return observationDbId
+	 **/
+
+	public String getObservationDbId() {
+		return observationDbId;
+	}
+
+	public void setObservationDbId(String observationDbId) {
+		this.observationDbId = observationDbId;
+	}
+
+	public BrAPIObservation additionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+		return this;
+	}
+
+	public BrAPIObservation putAdditionalInfoItem(String key, Object additionalInfoItem) {
+		if (this.additionalInfo == null) {
+			this.additionalInfo = new JsonObject();
+		}
+		JsonElement newElement = gson.toJsonTree(additionalInfoItem);
+		this.additionalInfo.add(key, newElement);
+		return this;
+	}
+
+	/**
+	 * Additional arbitrary info
+	 * 
+	 * @return additionalInfo
+	 **/
+
+	public JsonObject getAdditionalInfo() {
+		return additionalInfo;
+	}
+
+	public void setAdditionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+	}
+
+	public BrAPIObservation collector(String collector) {
+		this.collector = collector;
+		return this;
+	}
+
+	/**
+	 * The name or identifier of the entity which collected the observation
+	 * 
+	 * @return collector
+	 **/
+
+	public String getCollector() {
+		return collector;
+	}
+
+	public void setCollector(String collector) {
+		this.collector = collector;
+	}
+
+	public BrAPIObservation externalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+		return this;
+	}
+
+	/**
+	 * Get externalReferences
+	 * 
+	 * @return externalReferences
+	 **/
+
+	public List<BrAPIExternalReference> getExternalReferences() {
+		return externalReferences;
+	}
+
+	public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+	}
+
+	public BrAPIObservation germplasmDbId(String germplasmDbId) {
+		this.germplasmDbId = germplasmDbId;
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a germplasm
+	 * 
+	 * @return germplasmDbId
+	 **/
+
+	public String getGermplasmDbId() {
+		return germplasmDbId;
+	}
+
+	public void setGermplasmDbId(String germplasmDbId) {
+		this.germplasmDbId = germplasmDbId;
+	}
+
+	public BrAPIObservation germplasmName(String germplasmName) {
+		this.germplasmName = germplasmName;
+		return this;
+	}
+
+	/**
+	 * Name of the germplasm. It can be the preferred name and does not have to be
+	 * unique.
+	 * 
+	 * @return germplasmName
+	 **/
+
+	public String getGermplasmName() {
+		return germplasmName;
+	}
+
+	public void setGermplasmName(String germplasmName) {
+		this.germplasmName = germplasmName;
+	}
+
+	public BrAPIObservation observationTimeStamp(OffsetDateTime observationTimeStamp) {
+		this.observationTimeStamp = observationTimeStamp;
+		return this;
+	}
+
+	/**
+	 * The date and time when this observation was made
+	 * 
+	 * @return observationTimeStamp
+	 **/
+
+	public OffsetDateTime getObservationTimeStamp() {
+		return observationTimeStamp;
+	}
+
+	public void setObservationTimeStamp(OffsetDateTime observationTimeStamp) {
+		this.observationTimeStamp = observationTimeStamp;
+	}
+
+	public BrAPIObservation observationUnitDbId(String observationUnitDbId) {
+		this.observationUnitDbId = observationUnitDbId;
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies an observation unit
+	 * 
+	 * @return observationUnitDbId
+	 **/
+
+	public String getObservationUnitDbId() {
+		return observationUnitDbId;
+	}
+
+	public void setObservationUnitDbId(String observationUnitDbId) {
+		this.observationUnitDbId = observationUnitDbId;
+	}
+
+	public BrAPIObservation observationUnitName(String observationUnitName) {
+		this.observationUnitName = observationUnitName;
+		return this;
+	}
+
+	/**
+	 * A human readable name for an observation unit
+	 * 
+	 * @return observationUnitName
+	 **/
+
+	public String getObservationUnitName() {
+		return observationUnitName;
+	}
+
+	public void setObservationUnitName(String observationUnitName) {
+		this.observationUnitName = observationUnitName;
+	}
+
+	public BrAPIObservation observationVariableDbId(String observationVariableDbId) {
+		this.observationVariableDbId = observationVariableDbId;
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies an observation variable
+	 * 
+	 * @return observationVariableDbId
+	 **/
+
+	public String getObservationVariableDbId() {
+		return observationVariableDbId;
+	}
+
+	public void setObservationVariableDbId(String observationVariableDbId) {
+		this.observationVariableDbId = observationVariableDbId;
+	}
+
+	public BrAPIObservation observationVariableName(String observationVariableName) {
+		this.observationVariableName = observationVariableName;
+		return this;
+	}
+
+	/**
+	 * A human readable name for an observation variable
+	 * 
+	 * @return observationVariableName
+	 **/
+
+	public String getObservationVariableName() {
+		return observationVariableName;
+	}
+
+	public void setObservationVariableName(String observationVariableName) {
+		this.observationVariableName = observationVariableName;
+	}
+
+	public BrAPIObservation season(BrAPISeason season) {
+		this.season = season;
+		return this;
+	}
+
+	/**
+	 * Get season
+	 * 
+	 * @return season
+	 **/
+
+	public BrAPISeason getSeason() {
+		return season;
+	}
+
+	public void setSeason(BrAPISeason season) {
+		this.season = season;
+	}
+
+	public BrAPIObservation studyDbId(String studyDbId) {
+		this.studyDbId = studyDbId;
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a study within the given database server
+	 * 
+	 * @return studyDbId
+	 **/
+
+	public String getStudyDbId() {
+		return studyDbId;
+	}
+
+	public void setStudyDbId(String studyDbId) {
+		this.studyDbId = studyDbId;
+	}
+
+	public BrAPIObservation uploadedBy(String uploadedBy) {
+		this.uploadedBy = uploadedBy;
+		return this;
+	}
+
+	/**
+	 * The name or id of the user who uploaded the observation to the database
+	 * system
+	 * 
+	 * @return uploadedBy
+	 **/
+
+	public String getUploadedBy() {
+		return uploadedBy;
+	}
+
+	public void setUploadedBy(String uploadedBy) {
+		this.uploadedBy = uploadedBy;
+	}
+
+	public BrAPIObservation value(String value) {
+		this.value = value;
+		return this;
+	}
+
+	/**
+	 * The value of the data collected as an observation
+	 * 
+	 * @return value
+	 **/
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIObservation observation = (BrAPIObservation) o;
+		return Objects.equals(this.observationDbId, observation.observationDbId)
+				&& Objects.equals(this.additionalInfo, observation.additionalInfo)
+				&& Objects.equals(this.collector, observation.collector)
+				&& Objects.equals(this.geoCoordinates, observation.geoCoordinates)
+				&& Objects.equals(this.externalReferences, observation.externalReferences)
+				&& Objects.equals(this.germplasmDbId, observation.germplasmDbId)
+				&& Objects.equals(this.germplasmName, observation.germplasmName)
+				&& Objects.equals(this.observationTimeStamp, observation.observationTimeStamp)
+				&& Objects.equals(this.observationUnitDbId, observation.observationUnitDbId)
+				&& Objects.equals(this.observationUnitName, observation.observationUnitName)
+				&& Objects.equals(this.observationVariableDbId, observation.observationVariableDbId)
+				&& Objects.equals(this.observationVariableName, observation.observationVariableName)
+				&& Objects.equals(this.season, observation.season)
+				&& Objects.equals(this.studyDbId, observation.studyDbId)
+				&& Objects.equals(this.uploadedBy, observation.uploadedBy)
+				&& Objects.equals(this.value, observation.value);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(observationDbId, additionalInfo, collector, geoCoordinates, externalReferences, germplasmDbId,
+				germplasmName, observationTimeStamp, observationUnitDbId, observationUnitName, observationVariableDbId,
+				observationVariableName, season, studyDbId, uploadedBy, value);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class Observation {\n");
+		sb.append("    observationDbId: ").append(toIndentedString(observationDbId)).append("\n");
+		sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
+		sb.append("    collector: ").append(toIndentedString(collector)).append("\n");
+		sb.append("    geoCoordinates: ").append(toIndentedString(geoCoordinates)).append("\n");
+		sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
+		sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
+		sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
+		sb.append("    observationTimeStamp: ").append(toIndentedString(observationTimeStamp)).append("\n");
+		sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
+		sb.append("    observationUnitName: ").append(toIndentedString(observationUnitName)).append("\n");
+		sb.append("    observationVariableDbId: ").append(toIndentedString(observationVariableDbId)).append("\n");
+		sb.append("    observationVariableName: ").append(toIndentedString(observationVariableName)).append("\n");
+		sb.append("    season: ").append(toIndentedString(season)).append("\n");
+		sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
+		sb.append("    uploadedBy: ").append(toIndentedString(uploadedBy)).append("\n");
+		sb.append("    value: ").append(toIndentedString(value)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 
-  public String getObservationVariableName() {
-    return observationVariableName;
-  }
-
-  public void setObservationVariableName(String observationVariableName) {
-    this.observationVariableName = observationVariableName;
-  }
-
-  public BrAPIObservation season(BrAPISeason season) {
-    this.season = season;
-    return this;
-  }
-
-  /**
-   * Get season
-   * @return season
-   **/
-
-
-  @Valid
-  public BrAPISeason getSeason() {
-    return season;
-  }
-
-  public void setSeason(BrAPISeason season) {
-    this.season = season;
-  }
-
-  public BrAPIObservation studyDbId(String studyDbId) {
-    this.studyDbId = studyDbId;
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies a study within the given database server
-   * @return studyDbId
-   **/
-
-
-  public String getStudyDbId() {
-    return studyDbId;
-  }
-
-  public void setStudyDbId(String studyDbId) {
-    this.studyDbId = studyDbId;
-  }
-
-  public BrAPIObservation uploadedBy(String uploadedBy) {
-    this.uploadedBy = uploadedBy;
-    return this;
-  }
-
-  /**
-   * The name or id of the user who uploaded the observation to the database system
-   * @return uploadedBy
-   **/
-
-
-  public String getUploadedBy() {
-    return uploadedBy;
-  }
-
-  public void setUploadedBy(String uploadedBy) {
-    this.uploadedBy = uploadedBy;
-  }
-
-  public BrAPIObservation value(String value) {
-    this.value = value;
-    return this;
-  }
-
-  /**
-   * The value of the data collected as an observation
-   * @return value
-   **/
-
-
-  public String getValue() {
-    return value;
-  }
-
-  public void setValue(String value) {
-    this.value = value;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIObservation observation = (BrAPIObservation) o;
-    return Objects.equals(this.observationDbId, observation.observationDbId) &&
-            Objects.equals(this.additionalInfo, observation.additionalInfo) &&
-            Objects.equals(this.collector, observation.collector) &&
-            Objects.equals(this.externalReferences, observation.externalReferences) &&
-            Objects.equals(this.germplasmDbId, observation.germplasmDbId) &&
-            Objects.equals(this.germplasmName, observation.germplasmName) &&
-            Objects.equals(this.observationTimeStamp, observation.observationTimeStamp) &&
-            Objects.equals(this.observationUnitDbId, observation.observationUnitDbId) &&
-            Objects.equals(this.observationUnitName, observation.observationUnitName) &&
-            Objects.equals(this.observationVariableDbId, observation.observationVariableDbId) &&
-            Objects.equals(this.observationVariableName, observation.observationVariableName) &&
-            Objects.equals(this.season, observation.season) &&
-            Objects.equals(this.studyDbId, observation.studyDbId) &&
-            Objects.equals(this.uploadedBy, observation.uploadedBy) &&
-            Objects.equals(this.value, observation.value);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(observationDbId, additionalInfo, collector, externalReferences, germplasmDbId, germplasmName, observationTimeStamp, observationUnitDbId, observationUnitName, observationVariableDbId, observationVariableName, season, studyDbId, uploadedBy, value);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Observation {\n");
-    sb.append("    observationDbId: ").append(toIndentedString(observationDbId)).append("\n");
-    sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-    sb.append("    collector: ").append(toIndentedString(collector)).append("\n");
-    sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-    sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-    sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-    sb.append("    observationTimeStamp: ").append(toIndentedString(observationTimeStamp)).append("\n");
-    sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-    sb.append("    observationUnitName: ").append(toIndentedString(observationUnitName)).append("\n");
-    sb.append("    observationVariableDbId: ").append(toIndentedString(observationVariableDbId)).append("\n");
-    sb.append("    observationVariableName: ").append(toIndentedString(observationVariableName)).append("\n");
-    sb.append("    season: ").append(toIndentedString(season)).append("\n");
-    sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-    sb.append("    uploadedBy: ").append(toIndentedString(uploadedBy)).append("\n");
-    sb.append("    value: ").append(toIndentedString(value)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservationUnitLevelRelationship.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservationUnitLevelRelationship.java
index 32830022..0ef9cacd 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservationUnitLevelRelationship.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservationUnitLevelRelationship.java
@@ -2,76 +2,97 @@
 
 import java.util.Objects;
 
-import org.brapi.v2.model.pheno.BrAPIObservationUnitHierarchyLevel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 /**
  * ObservationUnitLevelRelationship
  */
 
+public class BrAPIObservationUnitLevelRelationship extends BrAPIObservationUnitHierarchyLevel {
+	@JsonProperty("levelCode")
+	private String levelCode = null;
+
+	@JsonProperty("observationUnitDbId")
+	private String observationUnitDbId = null;
+
+	public BrAPIObservationUnitLevelRelationship levelCode(String levelCode) {
+		this.levelCode = levelCode;
+		return this;
+	}
+
+	/**
+	 * An ID code for this level tag. Identify this observation unit by each level
+	 * of the hierarchy where it exists
+	 * 
+	 * @return levelCode
+	 **/
+
+	public String getLevelCode() {
+		return levelCode;
+	}
+
+	public void setLevelCode(String levelCode) {
+		this.levelCode = levelCode;
+	}
+
+	public BrAPIObservationUnitLevelRelationship observationUnitDbId(String observationUnitDbId) {
+		this.observationUnitDbId = observationUnitDbId;
+		return this;
+	}
+
+	/**
+	 * An ID code for this level tag. Identify this observation unit by each level
+	 * of the hierarchy where it exists
+	 * 
+	 * @return levelCode
+	 **/
+
+	public String getObservationUnitDbId() {
+		return observationUnitDbId;
+	}
+
+	public void setObservationUnitDbId(String observationUnitDbId) {
+		this.observationUnitDbId = observationUnitDbId;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIObservationUnitLevelRelationship observationUnitLevelRelationship = (BrAPIObservationUnitLevelRelationship) o;
+		return Objects.equals(this.levelCode, observationUnitLevelRelationship.levelCode) 
+				&& Objects.equals(this.observationUnitDbId, observationUnitLevelRelationship.observationUnitDbId) 
+				&& super.equals(o);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(levelCode, observationUnitDbId, super.hashCode());
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class ObservationUnitLevelRelationship {\n");
+		sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+		sb.append("    levelCode: ").append(toIndentedString(levelCode)).append("\n");
+		sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
 
-public class BrAPIObservationUnitLevelRelationship extends BrAPIObservationUnitHierarchyLevel  {
-  @JsonProperty("levelCode")
-  private String levelCode = null;
-
-  public BrAPIObservationUnitLevelRelationship levelCode(String levelCode) {
-    this.levelCode = levelCode;
-    return this;
-  }
-
-  /**
-   * An ID code for this level tag. Identify this observation unit by each level of the hierarchy where it exists
-   * @return levelCode
-  **/
-  
-  
-    public String getLevelCode() {
-    return levelCode;
-  }
-
-  public void setLevelCode(String levelCode) {
-    this.levelCode = levelCode;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIObservationUnitLevelRelationship observationUnitLevelRelationship = (BrAPIObservationUnitLevelRelationship) o;
-    return Objects.equals(this.levelCode, observationUnitLevelRelationship.levelCode) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(levelCode, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ObservationUnitLevelRelationship {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    levelCode: ").append(toIndentedString(levelCode)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/request/BrAPIImageSearchRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/request/BrAPIImageSearchRequest.java
index eb8e591d..9538a968 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/request/BrAPIImageSearchRequest.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/request/BrAPIImageSearchRequest.java
@@ -7,8 +7,6 @@
 import java.util.List;
 import java.time.OffsetDateTime;
 
-import javax.validation.Valid;
-
 import org.brapi.v2.model.BrApiGeoJSON;
 import org.brapi.v2.model.BrAPISearchRequestParametersPaging;
 
@@ -16,26 +14,28 @@
  * ImageSearchRequest
  */
 
-
 public class BrAPIImageSearchRequest extends BrAPISearchRequestParametersPaging {
+
+	@JsonProperty("commonCropNames")
+	private List<String> commonCropNames = null;
+
+	@JsonProperty("externalReferenceIds")
+	private List<String> externalReferenceIds = null;
+
+	@Deprecated
 	@JsonProperty("externalReferenceIDs")
-	@Valid
 	private List<String> externalReferenceIDs = null;
 
 	@JsonProperty("externalReferenceSources")
-	@Valid
 	private List<String> externalReferenceSources = null;
 
 	@JsonProperty("descriptiveOntologyTerms")
-	@Valid
 	private List<String> descriptiveOntologyTerms = null;
 
 	@JsonProperty("imageDbIds")
-	@Valid
 	private List<String> imageDbIds = null;
 
 	@JsonProperty("imageFileNames")
-	@Valid
 	private List<String> imageFileNames = null;
 
 	@JsonProperty("imageFileSizeMax")
@@ -54,7 +54,6 @@ public class BrAPIImageSearchRequest extends BrAPISearchRequestParametersPaging
 	private BrApiGeoJSON imageLocation = null;
 
 	@JsonProperty("imageNames")
-	@Valid
 	private List<String> imageNames = null;
 
 	@JsonProperty("imageTimeStampRangeEnd")
@@ -70,17 +69,56 @@ public class BrAPIImageSearchRequest extends BrAPISearchRequestParametersPaging
 	private Integer imageWidthMin = null;
 
 	@JsonProperty("mimeTypes")
-	@Valid
 	private List<String> mimeTypes = null;
 
 	@JsonProperty("observationDbIds")
-	@Valid
 	private List<String> observationDbIds = null;
 
 	@JsonProperty("observationUnitDbIds")
-	@Valid
 	private List<String> observationUnitDbIds = null;
 
+	@JsonProperty("programDbIds")
+	private List<String> programDbIds = null;
+
+	@JsonProperty("programNames")
+	private List<String> programNames = null;
+
+	public BrAPIImageSearchRequest commonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+		return this;
+	}
+
+	public BrAPIImageSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
+		if (this.commonCropNames == null) {
+			this.commonCropNames = new ArrayList<String>();
+		}
+		this.commonCropNames.add(commonCropNamesItem);
+		return this;
+	}
+
+	/**
+	 * The BrAPI Common Crop Name is the simple, generalized, widely accepted name
+	 * of the organism being researched. It is most often used in multi-crop systems
+	 * where digital resources need to be divided at a high level. Things like
+	 * &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of
+	 * common crop names. Use this parameter to only return results associated with
+	 * the given crops. Use &#x60;GET /commoncropnames&#x60; to find the list of
+	 * available crops on a server.
+	 *
+	 * @return commonCropNames
+	 **/
+	public List<String> getCommonCropNames() {
+		return commonCropNames;
+	}
+
+	public void setCommonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+	}
+
+	public BrAPIImageSearchRequest imageDbIds(List<String> imageDbIds) {
+		this.imageDbIds = imageDbIds;
+		return this;
+	}
 
 	public BrAPIImageSearchRequest addImageDbIdsItem(String imageDbIdsItem) {
 		if (this.imageDbIds == null) {
@@ -89,7 +127,7 @@ public BrAPIImageSearchRequest addImageDbIdsItem(String imageDbIdsItem) {
 		this.imageDbIds.add(imageDbIdsItem);
 		return this;
 	}
-	
+
 	public List<String> getImageDbIds() {
 		return imageDbIds;
 	}
@@ -98,11 +136,13 @@ public void setImageDbIds(List<String> imageDbIds) {
 		this.imageDbIds = imageDbIds;
 	}
 
+	@Deprecated
 	public BrAPIImageSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
 		this.externalReferenceIDs = externalReferenceIDs;
 		return this;
 	}
 
+	@Deprecated
 	public BrAPIImageSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
 		if (this.externalReferenceIDs == null) {
 			this.externalReferenceIDs = new ArrayList<String>();
@@ -116,12 +156,13 @@ public BrAPIImageSearchRequest addExternalReferenceIDsItem(String externalRefere
 	 * 
 	 * @return externalReferenceIDs
 	 **/
-	
 
+	@Deprecated
 	public List<String> getExternalReferenceIDs() {
 		return externalReferenceIDs;
 	}
 
+	@Deprecated
 	public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
 		this.externalReferenceIDs = externalReferenceIDs;
 	}
@@ -144,7 +185,6 @@ public BrAPIImageSearchRequest addExternalReferenceSourcesItem(String externalRe
 	 * 
 	 * @return externalReferenceSources
 	 **/
-	
 
 	public List<String> getExternalReferenceSources() {
 		return externalReferenceSources;
@@ -173,7 +213,6 @@ public BrAPIImageSearchRequest addDescriptiveOntologyTermsItem(String descriptiv
 	 * 
 	 * @return descriptiveOntologyTerms
 	 **/
-	
 
 	public List<String> getDescriptiveOntologyTerms() {
 		return descriptiveOntologyTerms;
@@ -201,7 +240,6 @@ public BrAPIImageSearchRequest addImageFileNamesItem(String imageFileNamesItem)
 	 * 
 	 * @return imageFileNames
 	 **/
-	
 
 	public List<String> getImageFileNames() {
 		return imageFileNames;
@@ -221,7 +259,6 @@ public BrAPIImageSearchRequest imageFileSizeMax(Integer imageFileSizeMax) {
 	 * 
 	 * @return imageFileSizeMax
 	 **/
-	
 
 	public Integer getImageFileSizeMax() {
 		return imageFileSizeMax;
@@ -241,7 +278,6 @@ public BrAPIImageSearchRequest imageFileSizeMin(Integer imageFileSizeMin) {
 	 * 
 	 * @return imageFileSizeMin
 	 **/
-	
 
 	public Integer getImageFileSizeMin() {
 		return imageFileSizeMin;
@@ -261,7 +297,6 @@ public BrAPIImageSearchRequest imageHeightMax(Integer imageHeightMax) {
 	 * 
 	 * @return imageHeightMax
 	 **/
-	
 
 	public Integer getImageHeightMax() {
 		return imageHeightMax;
@@ -281,7 +316,6 @@ public BrAPIImageSearchRequest imageHeightMin(Integer imageHeightMin) {
 	 * 
 	 * @return imageHeightMin
 	 **/
-	
 
 	public Integer getImageHeightMin() {
 		return imageHeightMin;
@@ -301,9 +335,7 @@ public BrAPIImageSearchRequest imageLocation(BrApiGeoJSON imageLocation) {
 	 * 
 	 * @return imageLocation
 	 **/
-	
 
-	@Valid
 	public BrApiGeoJSON getImageLocation() {
 		return imageLocation;
 	}
@@ -330,7 +362,6 @@ public BrAPIImageSearchRequest addImageNamesItem(String imageNamesItem) {
 	 * 
 	 * @return imageNames
 	 **/
-	
 
 	public List<String> getImageNames() {
 		return imageNames;
@@ -350,9 +381,7 @@ public BrAPIImageSearchRequest imageTimeStampRangeEnd(OffsetDateTime imageTimeSt
 	 * 
 	 * @return imageTimeStampRangeEnd
 	 **/
-	
 
-	@Valid
 	public OffsetDateTime getImageTimeStampRangeEnd() {
 		return imageTimeStampRangeEnd;
 	}
@@ -371,9 +400,7 @@ public BrAPIImageSearchRequest imageTimeStampRangeStart(OffsetDateTime imageTime
 	 * 
 	 * @return imageTimeStampRangeStart
 	 **/
-	
 
-	@Valid
 	public OffsetDateTime getImageTimeStampRangeStart() {
 		return imageTimeStampRangeStart;
 	}
@@ -392,7 +419,6 @@ public BrAPIImageSearchRequest imageWidthMax(Integer imageWidthMax) {
 	 * 
 	 * @return imageWidthMax
 	 **/
-	
 
 	public Integer getImageWidthMax() {
 		return imageWidthMax;
@@ -412,7 +438,6 @@ public BrAPIImageSearchRequest imageWidthMin(Integer imageWidthMin) {
 	 * 
 	 * @return imageWidthMin
 	 **/
-	
 
 	public Integer getImageWidthMin() {
 		return imageWidthMin;
@@ -440,7 +465,6 @@ public BrAPIImageSearchRequest addMimeTypesItem(String mimeTypesItem) {
 	 * 
 	 * @return mimeTypes
 	 **/
-	
 
 	public List<String> getMimeTypes() {
 		return mimeTypes;
@@ -468,7 +492,6 @@ public BrAPIImageSearchRequest addObservationDbIdsItem(String observationDbIdsIt
 	 * 
 	 * @return observationDbIds
 	 **/
-	
 
 	public List<String> getObservationDbIds() {
 		return observationDbIds;
@@ -496,7 +519,6 @@ public BrAPIImageSearchRequest addObservationUnitDbIdsItem(String observationUni
 	 * 
 	 * @return observationUnitDbIds
 	 **/
-	
 
 	public List<String> getObservationUnitDbIds() {
 		return observationUnitDbIds;
@@ -506,6 +528,64 @@ public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
 		this.observationUnitDbIds = observationUnitDbIds;
 	}
 
+	public BrAPIImageSearchRequest programDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+		return this;
+	}
+
+	public BrAPIImageSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
+		if (this.programDbIds == null) {
+			this.programDbIds = new ArrayList<String>();
+		}
+		this.programDbIds.add(programDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * A BrAPI Program represents the high level organization or group who is
+	 * responsible for conducting trials and studies. Things like Breeding Programs
+	 * and Funded Projects are considered BrAPI Programs. Use this parameter to only
+	 * return results associated with the given programs. Use &#x60;GET
+	 * /programs&#x60; to find the list of available programs on a server.
+	 *
+	 * @return programDbIds
+	 **/
+	public List<String> getProgramDbIds() {
+		return programDbIds;
+	}
+
+	public void setProgramDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+	}
+
+	public BrAPIImageSearchRequest programNames(List<String> programNames) {
+		this.programNames = programNames;
+		return this;
+	}
+
+	public BrAPIImageSearchRequest addProgramNamesItem(String programNamesItem) {
+		if (this.programNames == null) {
+			this.programNames = new ArrayList<String>();
+		}
+		this.programNames.add(programNamesItem);
+		return this;
+	}
+
+	/**
+	 * Use this parameter to only return results associated with the given program
+	 * names. Program names are not required to be unique. Use &#x60;GET
+	 * /programs&#x60; to find the list of available programs on a server.
+	 *
+	 * @return programNames
+	 **/
+	public List<String> getProgramNames() {
+		return programNames;
+	}
+
+	public void setProgramNames(List<String> programNames) {
+		this.programNames = programNames;
+	}
+
 	@Override
 	public boolean equals(java.lang.Object o) {
 		if (this == o) {
@@ -515,7 +595,9 @@ public boolean equals(java.lang.Object o) {
 			return false;
 		}
 		BrAPIImageSearchRequest imageSearchRequest = (BrAPIImageSearchRequest) o;
-		return Objects.equals(this.externalReferenceIDs, imageSearchRequest.externalReferenceIDs)
+		return Objects.equals(this.commonCropNames, imageSearchRequest.commonCropNames)
+				&& Objects.equals(this.externalReferenceIds, imageSearchRequest.externalReferenceIds)
+				&& Objects.equals(this.externalReferenceIDs, imageSearchRequest.externalReferenceIDs)
 				&& Objects.equals(this.externalReferenceSources, imageSearchRequest.externalReferenceSources)
 				&& Objects.equals(this.descriptiveOntologyTerms, imageSearchRequest.descriptiveOntologyTerms)
 				&& Objects.equals(this.imageFileNames, imageSearchRequest.imageFileNames)
@@ -532,15 +614,17 @@ public boolean equals(java.lang.Object o) {
 				&& Objects.equals(this.mimeTypes, imageSearchRequest.mimeTypes)
 				&& Objects.equals(this.observationDbIds, imageSearchRequest.observationDbIds)
 				&& Objects.equals(this.observationUnitDbIds, imageSearchRequest.observationUnitDbIds)
-				&& super.equals(o);
+				&& Objects.equals(this.programDbIds, imageSearchRequest.programDbIds)
+				&& Objects.equals(this.programNames, imageSearchRequest.programNames) && super.equals(o);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(externalReferenceIDs, externalReferenceSources, descriptiveOntologyTerms, imageFileNames,
-				imageFileSizeMax, imageFileSizeMin, imageHeightMax, imageHeightMin, imageLocation, imageNames,
-				imageTimeStampRangeEnd, imageTimeStampRangeStart, imageWidthMax, imageWidthMin, mimeTypes,
-				observationDbIds, observationUnitDbIds, super.hashCode());
+		return Objects.hash(commonCropNames, externalReferenceIds, externalReferenceIDs, externalReferenceSources,
+				descriptiveOntologyTerms, imageFileNames, imageFileSizeMax, imageFileSizeMin, imageHeightMax,
+				imageHeightMin, imageLocation, imageNames, imageTimeStampRangeEnd, imageTimeStampRangeStart,
+				imageWidthMax, imageWidthMin, mimeTypes, observationDbIds, observationUnitDbIds, programDbIds,
+				programNames, super.hashCode());
 	}
 
 	@Override
@@ -548,6 +632,8 @@ public String toString() {
 		StringBuilder sb = new StringBuilder();
 		sb.append("class ImageSearchRequest {\n");
 		sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+		sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
+		sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
 		sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
 		sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
 		sb.append("    descriptiveOntologyTerms: ").append(toIndentedString(descriptiveOntologyTerms)).append("\n");
@@ -565,6 +651,8 @@ public String toString() {
 		sb.append("    mimeTypes: ").append(toIndentedString(mimeTypes)).append("\n");
 		sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
 		sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
+		sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
+		sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
 		sb.append("}");
 		return sb.toString();
 	}
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/request/BrAPIObservationSearchRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/request/BrAPIObservationSearchRequest.java
index 60c38dd8..1fedb746 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/request/BrAPIObservationSearchRequest.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/request/BrAPIObservationSearchRequest.java
@@ -7,8 +7,6 @@
 import java.util.List;
 import java.time.OffsetDateTime;
 
-import javax.validation.Valid;
-
 import org.brapi.v2.model.BrAPISearchRequestParametersPaging;
 import org.brapi.v2.model.pheno.BrAPIObservationUnitLevelRelationship;
 
@@ -16,720 +14,815 @@
  * ObservationSearchRequest
  */
 
+public class BrAPIObservationSearchRequest extends BrAPISearchRequestParametersPaging {
+	@JsonProperty("commonCropNames")
+	private List<String> commonCropNames = null;
+
+	@Deprecated
+	@JsonProperty("externalReferenceIDs")
+	private List<String> externalReferenceIDs = null;
+
+	@JsonProperty("externalReferenceIds")
+	private List<String> externalReferenceIds = null;
+
+	@JsonProperty("externalReferenceSources")
+	private List<String> externalReferenceSources = null;
+
+	@JsonProperty("germplasmDbIds")
+	private List<String> germplasmDbIds = null;
+
+	@JsonProperty("germplasmNames")
+	private List<String> germplasmNames = null;
+
+	@JsonProperty("locationDbIds")
+	private List<String> locationDbIds = null;
+
+	@JsonProperty("locationNames")
+	private List<String> locationNames = null;
+
+	@JsonProperty("observationDbIds")
+	private List<String> observationDbIds = null;
+
+	@JsonProperty("observationLevelRelationships")
+	private List<BrAPIObservationUnitLevelRelationship> observationLevelRelationships = null;
+
+	@JsonProperty("observationLevels")
+	private List<BrAPIObservationUnitLevelRelationship> observationLevels = null;
+
+	@JsonProperty("observationTimeStampRangeEnd")
+	private OffsetDateTime observationTimeStampRangeEnd = null;
+
+	@JsonProperty("observationTimeStampRangeStart")
+	private OffsetDateTime observationTimeStampRangeStart = null;
+
+	@JsonProperty("observationUnitDbIds")
+	private List<String> observationUnitDbIds = null;
+
+	@JsonProperty("observationVariableDbIds")
+	private List<String> observationVariableDbIds = null;
+
+	@JsonProperty("observationVariableNames")
+	private List<String> observationVariableNames = null;
+
+	@JsonProperty("observationVariablePUIs")
+	private List<String> observationVariablePUIs = null;
+
+	@JsonProperty("programDbIds")
+	private List<String> programDbIds = null;
+
+	@JsonProperty("programNames")
+	private List<String> programNames = null;
+
+	@JsonProperty("seasonDbIds")
+	private List<String> seasonDbIds = null;
+
+	@JsonProperty("studyDbIds")
+	private List<String> studyDbIds = null;
+
+	@JsonProperty("studyNames")
+	private List<String> studyNames = null;
+
+	@JsonProperty("trialDbIds")
+	private List<String> trialDbIds = null;
+
+	@JsonProperty("trialNames")
+	private List<String> trialNames = null;
+
+	public BrAPIObservationSearchRequest commonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
+		if (this.commonCropNames == null) {
+			this.commonCropNames = new ArrayList<String>();
+		}
+		this.commonCropNames.add(commonCropNamesItem);
+		return this;
+	}
+
+	/**
+	 * A program identifier to search for
+	 * 
+	 * @return commonCropNames
+	 **/
+
+	public List<String> getCommonCropNames() {
+		return commonCropNames;
+	}
+
+	public void setCommonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
+	}
+
+	public BrAPIObservationSearchRequest programDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
+		if (this.programDbIds == null) {
+			this.programDbIds = new ArrayList<String>();
+		}
+		this.programDbIds.add(programDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * A program identifier to search for
+	 * 
+	 * @return programDbIds
+	 **/
+
+	public List<String> getProgramDbIds() {
+		return programDbIds;
+	}
+
+	public void setProgramDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
+	}
+
+	public BrAPIObservationSearchRequest programNames(List<String> programNames) {
+		this.programNames = programNames;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addProgramNamesItem(String programNamesItem) {
+		if (this.programNames == null) {
+			this.programNames = new ArrayList<String>();
+		}
+		this.programNames.add(programNamesItem);
+		return this;
+	}
+
+	/**
+	 * A name of a program to search for
+	 * 
+	 * @return programNames
+	 **/
+
+	public List<String> getProgramNames() {
+		return programNames;
+	}
+
+	public void setProgramNames(List<String> programNames) {
+		this.programNames = programNames;
+	}
+
+	public BrAPIObservationSearchRequest trialDbIds(List<String> trialDbIds) {
+		this.trialDbIds = trialDbIds;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
+		if (this.trialDbIds == null) {
+			this.trialDbIds = new ArrayList<String>();
+		}
+		this.trialDbIds.add(trialDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a trial to search for
+	 * 
+	 * @return trialDbIds
+	 **/
+
+	public List<String> getTrialDbIds() {
+		return trialDbIds;
+	}
+
+	public void setTrialDbIds(List<String> trialDbIds) {
+		this.trialDbIds = trialDbIds;
+	}
+
+	public BrAPIObservationSearchRequest trialNames(List<String> trialNames) {
+		this.trialNames = trialNames;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addTrialNamesItem(String trialNamesItem) {
+		if (this.trialNames == null) {
+			this.trialNames = new ArrayList<String>();
+		}
+		this.trialNames.add(trialNamesItem);
+		return this;
+	}
+
+	/**
+	 * The human readable name of a trial to search for
+	 * 
+	 * @return trialNames
+	 **/
+
+	public List<String> getTrialNames() {
+		return trialNames;
+	}
+
+	public void setTrialNames(List<String> trialNames) {
+		this.trialNames = trialNames;
+	}
+
+	public BrAPIObservationSearchRequest studyDbIds(List<String> studyDbIds) {
+		this.studyDbIds = studyDbIds;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
+		if (this.studyDbIds == null) {
+			this.studyDbIds = new ArrayList<String>();
+		}
+		this.studyDbIds.add(studyDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of study identifiers to search for
+	 * 
+	 * @return studyDbIds
+	 **/
+
+	public List<String> getStudyDbIds() {
+		return studyDbIds;
+	}
+
+	public void setStudyDbIds(List<String> studyDbIds) {
+		this.studyDbIds = studyDbIds;
+	}
+
+	public BrAPIObservationSearchRequest studyNames(List<String> studyNames) {
+		this.studyNames = studyNames;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addStudyNamesItem(String studyNamesItem) {
+		if (this.studyNames == null) {
+			this.studyNames = new ArrayList<String>();
+		}
+		this.studyNames.add(studyNamesItem);
+		return this;
+	}
+
+	/**
+	 * List of study names to filter search results
+	 * 
+	 * @return studyNames
+	 **/
+
+	public List<String> getStudyNames() {
+		return studyNames;
+	}
+
+	public void setStudyNames(List<String> studyNames) {
+		this.studyNames = studyNames;
+	}
+
+	public BrAPIObservationSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
+		this.germplasmDbIds = germplasmDbIds;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
+		if (this.germplasmDbIds == null) {
+			this.germplasmDbIds = new ArrayList<String>();
+		}
+		this.germplasmDbIds.add(germplasmDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of IDs which uniquely identify germplasm to search for
+	 * 
+	 * @return germplasmDbIds
+	 **/
+
+	public List<String> getGermplasmDbIds() {
+		return germplasmDbIds;
+	}
+
+	public void setGermplasmDbIds(List<String> germplasmDbIds) {
+		this.germplasmDbIds = germplasmDbIds;
+	}
+
+	public BrAPIObservationSearchRequest germplasmNames(List<String> germplasmNames) {
+		this.germplasmNames = germplasmNames;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
+		if (this.germplasmNames == null) {
+			this.germplasmNames = new ArrayList<String>();
+		}
+		this.germplasmNames.add(germplasmNamesItem);
+		return this;
+	}
+
+	/**
+	 * List of human readable names to identify germplasm to search for
+	 * 
+	 * @return germplasmNames
+	 **/
+
+	public List<String> getGermplasmNames() {
+		return germplasmNames;
+	}
+
+	public void setGermplasmNames(List<String> germplasmNames) {
+		this.germplasmNames = germplasmNames;
+	}
+
+	public BrAPIObservationSearchRequest locationDbIds(List<String> locationDbIds) {
+		this.locationDbIds = locationDbIds;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addLocationDbIdsItem(String locationDbIdsItem) {
+		if (this.locationDbIds == null) {
+			this.locationDbIds = new ArrayList<String>();
+		}
+		this.locationDbIds.add(locationDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The location ids to search for
+	 * 
+	 * @return locationDbIds
+	 **/
+
+	public List<String> getLocationDbIds() {
+		return locationDbIds;
+	}
+
+	public void setLocationDbIds(List<String> locationDbIds) {
+		this.locationDbIds = locationDbIds;
+	}
+
+	public BrAPIObservationSearchRequest locationNames(List<String> locationNames) {
+		this.locationNames = locationNames;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addLocationNamesItem(String locationNamesItem) {
+		if (this.locationNames == null) {
+			this.locationNames = new ArrayList<String>();
+		}
+		this.locationNames.add(locationNamesItem);
+		return this;
+	}
+
+	/**
+	 * A human readable names to search for
+	 * 
+	 * @return locationNames
+	 **/
+
+	public List<String> getLocationNames() {
+		return locationNames;
+	}
+
+	public void setLocationNames(List<String> locationNames) {
+		this.locationNames = locationNames;
+	}
+
+	public BrAPIObservationSearchRequest observationVariableDbIds(List<String> observationVariableDbIds) {
+		this.observationVariableDbIds = observationVariableDbIds;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
+		if (this.observationVariableDbIds == null) {
+			this.observationVariableDbIds = new ArrayList<String>();
+		}
+		this.observationVariableDbIds.add(observationVariableDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The DbIds of Variables to search for
+	 * 
+	 * @return observationVariableDbIds
+	 **/
+
+	public List<String> getObservationVariableDbIds() {
+		return observationVariableDbIds;
+	}
+
+	public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
+		this.observationVariableDbIds = observationVariableDbIds;
+	}
+
+	public BrAPIObservationSearchRequest observationVariableNames(List<String> observationVariableNames) {
+		this.observationVariableNames = observationVariableNames;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addObservationVariableNamesItem(String observationVariableNamesItem) {
+		if (this.observationVariableNames == null) {
+			this.observationVariableNames = new ArrayList<String>();
+		}
+		this.observationVariableNames.add(observationVariableNamesItem);
+		return this;
+	}
+
+	/**
+	 * The names of Variables to search for
+	 * 
+	 * @return observationVariableNames
+	 **/
+
+	public List<String> getObservationVariableNames() {
+		return observationVariableNames;
+	}
+
+	public void setObservationVariableNames(List<String> observationVariableNames) {
+		this.observationVariableNames = observationVariableNames;
+	}
+
+	public BrAPIObservationSearchRequest observationVariablePUIs(List<String> observationVariablePUIs) {
+		this.observationVariablePUIs = observationVariablePUIs;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addObservationVariablePUIsItem(String observationVariablePUIsItem) {
+		if (this.observationVariablePUIs == null) {
+			this.observationVariablePUIs = new ArrayList<String>();
+		}
+		this.observationVariablePUIs.add(observationVariablePUIsItem);
+		return this;
+	}
+
+	/**
+	 * The names of Variables to search for
+	 * 
+	 * @return observationVariablePUIs
+	 **/
+
+	public List<String> getObservationVariablePUIs() {
+		return observationVariablePUIs;
+	}
+
+	public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
+		this.observationVariablePUIs = observationVariablePUIs;
+	}
+
+	public BrAPIObservationSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
+		if (this.externalReferenceIds == null) {
+			this.externalReferenceIds = new ArrayList<String>();
+		}
+		this.externalReferenceIds.add(externalReferenceIdsItem);
+		return this;
+	}
+
+	/**
+	 * List of external references for the trait to search for
+	 * 
+	 * @return externalReferenceIds
+	 **/
+
+	public List<String> getExternalReferenceIds() {
+		return externalReferenceIds;
+	}
+
+	public void setExternalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
+	}
+
+	@Deprecated
+	public BrAPIObservationSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+		return this;
+	}
+
+	@Deprecated
+	public BrAPIObservationSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
+		if (this.externalReferenceIDs == null) {
+			this.externalReferenceIDs = new ArrayList<String>();
+		}
+		this.externalReferenceIDs.add(externalReferenceIDsItem);
+		return this;
+	}
+
+	/**
+	 * List of external references for the trait to search for
+	 * 
+	 * @return externalReferenceIDs
+	 **/
+
+	@Deprecated
+	public List<String> getExternalReferenceIDs() {
+		return externalReferenceIDs;
+	}
+
+	@Deprecated
+	public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
+	}
+
+	public BrAPIObservationSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
+		if (this.externalReferenceSources == null) {
+			this.externalReferenceSources = new ArrayList<String>();
+		}
+		this.externalReferenceSources.add(externalReferenceSourcesItem);
+		return this;
+	}
+
+	/**
+	 * List of external references sources for the trait to search for
+	 * 
+	 * @return externalReferenceSources
+	 **/
+
+	public List<String> getExternalReferenceSources() {
+		return externalReferenceSources;
+	}
+
+	public void setExternalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
+	}
+
+	public BrAPIObservationSearchRequest observationDbIds(List<String> observationDbIds) {
+		this.observationDbIds = observationDbIds;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addObservationDbIdsItem(String observationDbIdsItem) {
+		if (this.observationDbIds == null) {
+			this.observationDbIds = new ArrayList<String>();
+		}
+		this.observationDbIds.add(observationDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The unique id of an Observation
+	 * 
+	 * @return observationDbIds
+	 **/
+
+	public List<String> getObservationDbIds() {
+		return observationDbIds;
+	}
+
+	public void setObservationDbIds(List<String> observationDbIds) {
+		this.observationDbIds = observationDbIds;
+	}
+
+	public BrAPIObservationSearchRequest observationLevelRelationships(
+			List<BrAPIObservationUnitLevelRelationship> observationLevelRelationships) {
+		this.observationLevelRelationships = observationLevelRelationships;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addObservationLevelRelationshipsItem(
+			BrAPIObservationUnitLevelRelationship observationLevelRelationshipsItem) {
+		if (this.observationLevelRelationships == null) {
+			this.observationLevelRelationships = new ArrayList<BrAPIObservationUnitLevelRelationship>();
+		}
+		this.observationLevelRelationships.add(observationLevelRelationshipsItem);
+		return this;
+	}
+
+	/**
+	 * Searches for values in
+	 * ObservationUnit->observationUnitPosition->observationLevelRelationships
+	 * 
+	 * @return observationLevelRelationships
+	 **/
+
+	public List<BrAPIObservationUnitLevelRelationship> getObservationLevelRelationships() {
+		return observationLevelRelationships;
+	}
+
+	public void setObservationLevelRelationships(
+			List<BrAPIObservationUnitLevelRelationship> observationLevelRelationships) {
+		this.observationLevelRelationships = observationLevelRelationships;
+	}
+
+	public BrAPIObservationSearchRequest observationLevels(
+			List<BrAPIObservationUnitLevelRelationship> observationLevels) {
+		this.observationLevels = observationLevels;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addObservationLevelsItem(
+			BrAPIObservationUnitLevelRelationship observationLevelsItem) {
+		if (this.observationLevels == null) {
+			this.observationLevels = new ArrayList<BrAPIObservationUnitLevelRelationship>();
+		}
+		this.observationLevels.add(observationLevelsItem);
+		return this;
+	}
+
+	/**
+	 * Searches for values in
+	 * ObservationUnit->observationUnitPosition->observationLevel
+	 * 
+	 * @return observationLevels
+	 **/
+
+	public List<BrAPIObservationUnitLevelRelationship> getObservationLevels() {
+		return observationLevels;
+	}
+
+	public void setObservationLevels(List<BrAPIObservationUnitLevelRelationship> observationLevels) {
+		this.observationLevels = observationLevels;
+	}
+
+	public BrAPIObservationSearchRequest observationTimeStampRangeEnd(OffsetDateTime observationTimeStampRangeEnd) {
+		this.observationTimeStampRangeEnd = observationTimeStampRangeEnd;
+		return this;
+	}
+
+	/**
+	 * Timestamp range end
+	 * 
+	 * @return observationTimeStampRangeEnd
+	 **/
+
+	public OffsetDateTime getObservationTimeStampRangeEnd() {
+		return observationTimeStampRangeEnd;
+	}
+
+	public void setObservationTimeStampRangeEnd(OffsetDateTime observationTimeStampRangeEnd) {
+		this.observationTimeStampRangeEnd = observationTimeStampRangeEnd;
+	}
+
+	public BrAPIObservationSearchRequest observationTimeStampRangeStart(OffsetDateTime observationTimeStampRangeStart) {
+		this.observationTimeStampRangeStart = observationTimeStampRangeStart;
+		return this;
+	}
+
+	/**
+	 * Timestamp range start
+	 * 
+	 * @return observationTimeStampRangeStart
+	 **/
+
+	public OffsetDateTime getObservationTimeStampRangeStart() {
+		return observationTimeStampRangeStart;
+	}
+
+	public void setObservationTimeStampRangeStart(OffsetDateTime observationTimeStampRangeStart) {
+		this.observationTimeStampRangeStart = observationTimeStampRangeStart;
+	}
+
+	public BrAPIObservationSearchRequest observationUnitDbIds(List<String> observationUnitDbIds) {
+		this.observationUnitDbIds = observationUnitDbIds;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
+		if (this.observationUnitDbIds == null) {
+			this.observationUnitDbIds = new ArrayList<String>();
+		}
+		this.observationUnitDbIds.add(observationUnitDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The unique id of an Observation Unit
+	 * 
+	 * @return observationUnitDbIds
+	 **/
+
+	public List<String> getObservationUnitDbIds() {
+		return observationUnitDbIds;
+	}
+
+	public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
+		this.observationUnitDbIds = observationUnitDbIds;
+	}
+
+	public BrAPIObservationSearchRequest seasonDbIds(List<String> seasonDbIds) {
+		this.seasonDbIds = seasonDbIds;
+		return this;
+	}
+
+	public BrAPIObservationSearchRequest addSeasonDbIdsItem(String seasonDbIdsItem) {
+		if (this.seasonDbIds == null) {
+			this.seasonDbIds = new ArrayList<String>();
+		}
+		this.seasonDbIds.add(seasonDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The year or Phenotyping campaign of a multi-annual study (trees, grape, ...)
+	 * 
+	 * @return seasonDbIds
+	 **/
+
+	public List<String> getSeasonDbIds() {
+		return seasonDbIds;
+	}
+
+	public void setSeasonDbIds(List<String> seasonDbIds) {
+		this.seasonDbIds = seasonDbIds;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIObservationSearchRequest observationSearchRequest = (BrAPIObservationSearchRequest) o;
+		return Objects.equals(this.commonCropNames, observationSearchRequest.commonCropNames)
+				&& Objects.equals(this.programDbIds, observationSearchRequest.programDbIds)
+				&& Objects.equals(this.programNames, observationSearchRequest.programNames)
+				&& Objects.equals(this.trialDbIds, observationSearchRequest.trialDbIds)
+				&& Objects.equals(this.trialNames, observationSearchRequest.trialNames)
+				&& Objects.equals(this.studyDbIds, observationSearchRequest.studyDbIds)
+				&& Objects.equals(this.studyNames, observationSearchRequest.studyNames)
+				&& Objects.equals(this.germplasmDbIds, observationSearchRequest.germplasmDbIds)
+				&& Objects.equals(this.germplasmNames, observationSearchRequest.germplasmNames)
+				&& Objects.equals(this.locationDbIds, observationSearchRequest.locationDbIds)
+				&& Objects.equals(this.locationNames, observationSearchRequest.locationNames)
+				&& Objects.equals(this.observationVariableDbIds, observationSearchRequest.observationVariableDbIds)
+				&& Objects.equals(this.observationVariableNames, observationSearchRequest.observationVariableNames)
+				&& Objects.equals(this.observationVariablePUIs, observationSearchRequest.observationVariablePUIs)
+				&& Objects.equals(this.externalReferenceIds, observationSearchRequest.externalReferenceIds)
+				&& Objects.equals(this.externalReferenceIDs, observationSearchRequest.externalReferenceIDs)
+				&& Objects.equals(this.externalReferenceSources, observationSearchRequest.externalReferenceSources)
+				&& Objects.equals(this.observationDbIds, observationSearchRequest.observationDbIds)
+				&& Objects.equals(this.observationLevelRelationships,
+						observationSearchRequest.observationLevelRelationships)
+				&& Objects.equals(this.observationLevels, observationSearchRequest.observationLevels)
+				&& Objects.equals(this.observationTimeStampRangeEnd,
+						observationSearchRequest.observationTimeStampRangeEnd)
+				&& Objects.equals(this.observationTimeStampRangeStart,
+						observationSearchRequest.observationTimeStampRangeStart)
+				&& Objects.equals(this.observationUnitDbIds, observationSearchRequest.observationUnitDbIds)
+				&& Objects.equals(this.seasonDbIds, observationSearchRequest.seasonDbIds) && super.equals(o);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(commonCropNames, programDbIds, programNames, trialDbIds, trialNames, studyDbIds, studyNames, germplasmDbIds,
+				germplasmNames, locationDbIds, locationNames, observationVariableDbIds, observationVariableNames,
+				observationVariablePUIs, externalReferenceIds, externalReferenceIDs, externalReferenceSources, observationDbIds,
+				observationLevelRelationships, observationLevels, observationTimeStampRangeEnd,
+				observationTimeStampRangeStart, observationUnitDbIds, seasonDbIds, super.hashCode());
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class ObservationSearchRequest {\n");
+		sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+		sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
+		sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
+		sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
+		sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
+		sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
+		sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
+		sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
+		sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
+		sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
+		sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
+		sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
+		sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
+		sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
+		sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
+		sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
+		sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
+		sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
+		sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
+		sb.append("    observationLevelRelationships: ").append(toIndentedString(observationLevelRelationships))
+				.append("\n");
+		sb.append("    observationLevels: ").append(toIndentedString(observationLevels)).append("\n");
+		sb.append("    observationTimeStampRangeEnd: ").append(toIndentedString(observationTimeStampRangeEnd))
+				.append("\n");
+		sb.append("    observationTimeStampRangeStart: ").append(toIndentedString(observationTimeStampRangeStart))
+				.append("\n");
+		sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
+		sb.append("    seasonDbIds: ").append(toIndentedString(seasonDbIds)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 
-public class BrAPIObservationSearchRequest extends BrAPISearchRequestParametersPaging  {
-  @JsonProperty("programDbIds")
-  @Valid
-  private List<String> programDbIds = null;
-
-  @JsonProperty("programNames")
-  @Valid
-  private List<String> programNames = null;
-
-  @JsonProperty("trialDbIds")
-  @Valid
-  private List<String> trialDbIds = null;
-
-  @JsonProperty("trialNames")
-  @Valid
-  private List<String> trialNames = null;
-
-  @JsonProperty("studyDbIds")
-  @Valid
-  private List<String> studyDbIds = null;
-
-  @JsonProperty("studyNames")
-  @Valid
-  private List<String> studyNames = null;
-
-  @JsonProperty("germplasmDbIds")
-  @Valid
-  private List<String> germplasmDbIds = null;
-
-  @JsonProperty("germplasmNames")
-  @Valid
-  private List<String> germplasmNames = null;
-
-  @JsonProperty("locationDbIds")
-  @Valid
-  private List<String> locationDbIds = null;
-
-  @JsonProperty("locationNames")
-  @Valid
-  private List<String> locationNames = null;
-
-  @JsonProperty("observationVariableDbIds")
-  @Valid
-  private List<String> observationVariableDbIds = null;
-
-  @JsonProperty("observationVariableNames")
-  @Valid
-  private List<String> observationVariableNames = null;
-
-  @JsonProperty("externalReferenceIDs")
-  @Valid
-  private List<String> externalReferenceIDs = null;
-
-  @JsonProperty("externalReferenceSources")
-  @Valid
-  private List<String> externalReferenceSources = null;
-
-  @JsonProperty("observationDbIds")
-  @Valid
-  private List<String> observationDbIds = null;
-
-  @JsonProperty("observationLevelRelationships")
-  @Valid
-  private List<BrAPIObservationUnitLevelRelationship> observationLevelRelationships = null;
-
-  @JsonProperty("observationLevels")
-  @Valid
-  private List<BrAPIObservationUnitLevelRelationship> observationLevels = null;
-
-  @JsonProperty("observationTimeStampRangeEnd")
-  private OffsetDateTime observationTimeStampRangeEnd = null;
-
-  @JsonProperty("observationTimeStampRangeStart")
-  private OffsetDateTime observationTimeStampRangeStart = null;
-
-  @JsonProperty("observationUnitDbIds")
-  @Valid
-  private List<String> observationUnitDbIds = null;
-
-  @JsonProperty("seasonDbIds")
-  @Valid
-  private List<String> seasonDbIds = null;
-
-  public BrAPIObservationSearchRequest programDbIds(List<String> programDbIds) {
-    this.programDbIds = programDbIds;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-    if (this.programDbIds == null) {
-      this.programDbIds = new ArrayList<String>();
-    }
-    this.programDbIds.add(programDbIdsItem);
-    return this;
-  }
-
-  /**
-   * A program identifier to search for
-   * @return programDbIds
-  **/
-  
-  
-    public List<String> getProgramDbIds() {
-    return programDbIds;
-  }
-
-  public void setProgramDbIds(List<String> programDbIds) {
-    this.programDbIds = programDbIds;
-  }
-
-  public BrAPIObservationSearchRequest programNames(List<String> programNames) {
-    this.programNames = programNames;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addProgramNamesItem(String programNamesItem) {
-    if (this.programNames == null) {
-      this.programNames = new ArrayList<String>();
-    }
-    this.programNames.add(programNamesItem);
-    return this;
-  }
-
-  /**
-   * A name of a program to search for
-   * @return programNames
-  **/
-  
-  
-    public List<String> getProgramNames() {
-    return programNames;
-  }
-
-  public void setProgramNames(List<String> programNames) {
-    this.programNames = programNames;
-  }
-
-  public BrAPIObservationSearchRequest trialDbIds(List<String> trialDbIds) {
-    this.trialDbIds = trialDbIds;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-    if (this.trialDbIds == null) {
-      this.trialDbIds = new ArrayList<String>();
-    }
-    this.trialDbIds.add(trialDbIdsItem);
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies a trial to search for
-   * @return trialDbIds
-  **/
-  
-  
-    public List<String> getTrialDbIds() {
-    return trialDbIds;
-  }
-
-  public void setTrialDbIds(List<String> trialDbIds) {
-    this.trialDbIds = trialDbIds;
-  }
-
-  public BrAPIObservationSearchRequest trialNames(List<String> trialNames) {
-    this.trialNames = trialNames;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addTrialNamesItem(String trialNamesItem) {
-    if (this.trialNames == null) {
-      this.trialNames = new ArrayList<String>();
-    }
-    this.trialNames.add(trialNamesItem);
-    return this;
-  }
-
-  /**
-   * The human readable name of a trial to search for
-   * @return trialNames
-  **/
-  
-  
-    public List<String> getTrialNames() {
-    return trialNames;
-  }
-
-  public void setTrialNames(List<String> trialNames) {
-    this.trialNames = trialNames;
-  }
-
-  public BrAPIObservationSearchRequest studyDbIds(List<String> studyDbIds) {
-    this.studyDbIds = studyDbIds;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-    if (this.studyDbIds == null) {
-      this.studyDbIds = new ArrayList<String>();
-    }
-    this.studyDbIds.add(studyDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of study identifiers to search for
-   * @return studyDbIds
-  **/
-  
-  
-    public List<String> getStudyDbIds() {
-    return studyDbIds;
-  }
-
-  public void setStudyDbIds(List<String> studyDbIds) {
-    this.studyDbIds = studyDbIds;
-  }
-
-  public BrAPIObservationSearchRequest studyNames(List<String> studyNames) {
-    this.studyNames = studyNames;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addStudyNamesItem(String studyNamesItem) {
-    if (this.studyNames == null) {
-      this.studyNames = new ArrayList<String>();
-    }
-    this.studyNames.add(studyNamesItem);
-    return this;
-  }
-
-  /**
-   * List of study names to filter search results
-   * @return studyNames
-  **/
-  
-  
-    public List<String> getStudyNames() {
-    return studyNames;
-  }
-
-  public void setStudyNames(List<String> studyNames) {
-    this.studyNames = studyNames;
-  }
-
-  public BrAPIObservationSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-    this.germplasmDbIds = germplasmDbIds;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-    if (this.germplasmDbIds == null) {
-      this.germplasmDbIds = new ArrayList<String>();
-    }
-    this.germplasmDbIds.add(germplasmDbIdsItem);
-    return this;
-  }
-
-  /**
-   * List of IDs which uniquely identify germplasm to search for
-   * @return germplasmDbIds
-  **/
-  
-  
-    public List<String> getGermplasmDbIds() {
-    return germplasmDbIds;
-  }
-
-  public void setGermplasmDbIds(List<String> germplasmDbIds) {
-    this.germplasmDbIds = germplasmDbIds;
-  }
-
-  public BrAPIObservationSearchRequest germplasmNames(List<String> germplasmNames) {
-    this.germplasmNames = germplasmNames;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-    if (this.germplasmNames == null) {
-      this.germplasmNames = new ArrayList<String>();
-    }
-    this.germplasmNames.add(germplasmNamesItem);
-    return this;
-  }
-
-  /**
-   * List of human readable names to identify germplasm to search for
-   * @return germplasmNames
-  **/
-  
-  
-    public List<String> getGermplasmNames() {
-    return germplasmNames;
-  }
-
-  public void setGermplasmNames(List<String> germplasmNames) {
-    this.germplasmNames = germplasmNames;
-  }
-
-  public BrAPIObservationSearchRequest locationDbIds(List<String> locationDbIds) {
-    this.locationDbIds = locationDbIds;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addLocationDbIdsItem(String locationDbIdsItem) {
-    if (this.locationDbIds == null) {
-      this.locationDbIds = new ArrayList<String>();
-    }
-    this.locationDbIds.add(locationDbIdsItem);
-    return this;
-  }
-
-  /**
-   * The location ids to search for
-   * @return locationDbIds
-  **/
-  
-  
-    public List<String> getLocationDbIds() {
-    return locationDbIds;
-  }
-
-  public void setLocationDbIds(List<String> locationDbIds) {
-    this.locationDbIds = locationDbIds;
-  }
-
-  public BrAPIObservationSearchRequest locationNames(List<String> locationNames) {
-    this.locationNames = locationNames;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addLocationNamesItem(String locationNamesItem) {
-    if (this.locationNames == null) {
-      this.locationNames = new ArrayList<String>();
-    }
-    this.locationNames.add(locationNamesItem);
-    return this;
-  }
-
-  /**
-   * A human readable names to search for
-   * @return locationNames
-  **/
-  
-  
-    public List<String> getLocationNames() {
-    return locationNames;
-  }
-
-  public void setLocationNames(List<String> locationNames) {
-    this.locationNames = locationNames;
-  }
-
-  public BrAPIObservationSearchRequest observationVariableDbIds(List<String> observationVariableDbIds) {
-    this.observationVariableDbIds = observationVariableDbIds;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-    if (this.observationVariableDbIds == null) {
-      this.observationVariableDbIds = new ArrayList<String>();
-    }
-    this.observationVariableDbIds.add(observationVariableDbIdsItem);
-    return this;
-  }
-
-  /**
-   * The DbIds of Variables to search for
-   * @return observationVariableDbIds
-  **/
-  
-  
-    public List<String> getObservationVariableDbIds() {
-    return observationVariableDbIds;
-  }
-
-  public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-    this.observationVariableDbIds = observationVariableDbIds;
-  }
-
-  public BrAPIObservationSearchRequest observationVariableNames(List<String> observationVariableNames) {
-    this.observationVariableNames = observationVariableNames;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addObservationVariableNamesItem(String observationVariableNamesItem) {
-    if (this.observationVariableNames == null) {
-      this.observationVariableNames = new ArrayList<String>();
-    }
-    this.observationVariableNames.add(observationVariableNamesItem);
-    return this;
-  }
-
-  /**
-   * The names of Variables to search for
-   * @return observationVariableNames
-  **/
-  
-  
-    public List<String> getObservationVariableNames() {
-    return observationVariableNames;
-  }
-
-  public void setObservationVariableNames(List<String> observationVariableNames) {
-    this.observationVariableNames = observationVariableNames;
-  }
-
-  public BrAPIObservationSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-    if (this.externalReferenceIDs == null) {
-      this.externalReferenceIDs = new ArrayList<String>();
-    }
-    this.externalReferenceIDs.add(externalReferenceIDsItem);
-    return this;
-  }
-
-  /**
-   * List of external references for the trait to search for
-   * @return externalReferenceIDs
-  **/
-  
-  
-    public List<String> getExternalReferenceIDs() {
-    return externalReferenceIDs;
-  }
-
-  public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-    this.externalReferenceIDs = externalReferenceIDs;
-  }
-
-  public BrAPIObservationSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-    if (this.externalReferenceSources == null) {
-      this.externalReferenceSources = new ArrayList<String>();
-    }
-    this.externalReferenceSources.add(externalReferenceSourcesItem);
-    return this;
-  }
-
-  /**
-   * List of external references sources for the trait to search for
-   * @return externalReferenceSources
-  **/
-  
-  
-    public List<String> getExternalReferenceSources() {
-    return externalReferenceSources;
-  }
-
-  public void setExternalReferenceSources(List<String> externalReferenceSources) {
-    this.externalReferenceSources = externalReferenceSources;
-  }
-
-  public BrAPIObservationSearchRequest observationDbIds(List<String> observationDbIds) {
-    this.observationDbIds = observationDbIds;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addObservationDbIdsItem(String observationDbIdsItem) {
-    if (this.observationDbIds == null) {
-      this.observationDbIds = new ArrayList<String>();
-    }
-    this.observationDbIds.add(observationDbIdsItem);
-    return this;
-  }
-
-  /**
-   * The unique id of an Observation
-   * @return observationDbIds
-  **/
-  
-  
-    public List<String> getObservationDbIds() {
-    return observationDbIds;
-  }
-
-  public void setObservationDbIds(List<String> observationDbIds) {
-    this.observationDbIds = observationDbIds;
-  }
-
-  public BrAPIObservationSearchRequest observationLevelRelationships(List<BrAPIObservationUnitLevelRelationship> observationLevelRelationships) {
-    this.observationLevelRelationships = observationLevelRelationships;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addObservationLevelRelationshipsItem(BrAPIObservationUnitLevelRelationship observationLevelRelationshipsItem) {
-    if (this.observationLevelRelationships == null) {
-      this.observationLevelRelationships = new ArrayList<BrAPIObservationUnitLevelRelationship>();
-    }
-    this.observationLevelRelationships.add(observationLevelRelationshipsItem);
-    return this;
-  }
-
-  /**
-   * Searches for values in ObservationUnit->observationUnitPosition->observationLevelRelationships
-   * @return observationLevelRelationships
-  **/
-  
-      @Valid
-    public List<BrAPIObservationUnitLevelRelationship> getObservationLevelRelationships() {
-    return observationLevelRelationships;
-  }
-
-  public void setObservationLevelRelationships(List<BrAPIObservationUnitLevelRelationship> observationLevelRelationships) {
-    this.observationLevelRelationships = observationLevelRelationships;
-  }
-
-  public BrAPIObservationSearchRequest observationLevels(List<BrAPIObservationUnitLevelRelationship> observationLevels) {
-    this.observationLevels = observationLevels;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addObservationLevelsItem(BrAPIObservationUnitLevelRelationship observationLevelsItem) {
-    if (this.observationLevels == null) {
-      this.observationLevels = new ArrayList<BrAPIObservationUnitLevelRelationship>();
-    }
-    this.observationLevels.add(observationLevelsItem);
-    return this;
-  }
-
-  /**
-   * Searches for values in ObservationUnit->observationUnitPosition->observationLevel
-   * @return observationLevels
-  **/
-  
-      @Valid
-    public List<BrAPIObservationUnitLevelRelationship> getObservationLevels() {
-    return observationLevels;
-  }
-
-  public void setObservationLevels(List<BrAPIObservationUnitLevelRelationship> observationLevels) {
-    this.observationLevels = observationLevels;
-  }
-
-  public BrAPIObservationSearchRequest observationTimeStampRangeEnd(OffsetDateTime observationTimeStampRangeEnd) {
-    this.observationTimeStampRangeEnd = observationTimeStampRangeEnd;
-    return this;
-  }
-
-  /**
-   * Timestamp range end
-   * @return observationTimeStampRangeEnd
-  **/
-  
-  
-    @Valid
-    public OffsetDateTime getObservationTimeStampRangeEnd() {
-    return observationTimeStampRangeEnd;
-  }
-
-  public void setObservationTimeStampRangeEnd(OffsetDateTime observationTimeStampRangeEnd) {
-    this.observationTimeStampRangeEnd = observationTimeStampRangeEnd;
-  }
-
-  public BrAPIObservationSearchRequest observationTimeStampRangeStart(OffsetDateTime observationTimeStampRangeStart) {
-    this.observationTimeStampRangeStart = observationTimeStampRangeStart;
-    return this;
-  }
-
-  /**
-   * Timestamp range start
-   * @return observationTimeStampRangeStart
-  **/
-  
-  
-    @Valid
-    public OffsetDateTime getObservationTimeStampRangeStart() {
-    return observationTimeStampRangeStart;
-  }
-
-  public void setObservationTimeStampRangeStart(OffsetDateTime observationTimeStampRangeStart) {
-    this.observationTimeStampRangeStart = observationTimeStampRangeStart;
-  }
-
-  public BrAPIObservationSearchRequest observationUnitDbIds(List<String> observationUnitDbIds) {
-    this.observationUnitDbIds = observationUnitDbIds;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-    if (this.observationUnitDbIds == null) {
-      this.observationUnitDbIds = new ArrayList<String>();
-    }
-    this.observationUnitDbIds.add(observationUnitDbIdsItem);
-    return this;
-  }
-
-  /**
-   * The unique id of an Observation Unit
-   * @return observationUnitDbIds
-  **/
-  
-  
-    public List<String> getObservationUnitDbIds() {
-    return observationUnitDbIds;
-  }
-
-  public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-    this.observationUnitDbIds = observationUnitDbIds;
-  }
-
-  public BrAPIObservationSearchRequest seasonDbIds(List<String> seasonDbIds) {
-    this.seasonDbIds = seasonDbIds;
-    return this;
-  }
-
-  public BrAPIObservationSearchRequest addSeasonDbIdsItem(String seasonDbIdsItem) {
-    if (this.seasonDbIds == null) {
-      this.seasonDbIds = new ArrayList<String>();
-    }
-    this.seasonDbIds.add(seasonDbIdsItem);
-    return this;
-  }
-
-  /**
-   * The year or Phenotyping campaign of a multi-annual study (trees, grape, ...)
-   * @return seasonDbIds
-  **/
-  
-  
-    public List<String> getSeasonDbIds() {
-    return seasonDbIds;
-  }
-
-  public void setSeasonDbIds(List<String> seasonDbIds) {
-    this.seasonDbIds = seasonDbIds;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIObservationSearchRequest observationSearchRequest = (BrAPIObservationSearchRequest) o;
-    return Objects.equals(this.programDbIds, observationSearchRequest.programDbIds) &&
-        Objects.equals(this.programNames, observationSearchRequest.programNames) &&
-        Objects.equals(this.trialDbIds, observationSearchRequest.trialDbIds) &&
-        Objects.equals(this.trialNames, observationSearchRequest.trialNames) &&
-        Objects.equals(this.studyDbIds, observationSearchRequest.studyDbIds) &&
-        Objects.equals(this.studyNames, observationSearchRequest.studyNames) &&
-        Objects.equals(this.germplasmDbIds, observationSearchRequest.germplasmDbIds) &&
-        Objects.equals(this.germplasmNames, observationSearchRequest.germplasmNames) &&
-        Objects.equals(this.locationDbIds, observationSearchRequest.locationDbIds) &&
-        Objects.equals(this.locationNames, observationSearchRequest.locationNames) &&
-        Objects.equals(this.observationVariableDbIds, observationSearchRequest.observationVariableDbIds) &&
-        Objects.equals(this.observationVariableNames, observationSearchRequest.observationVariableNames) &&
-        Objects.equals(this.externalReferenceIDs, observationSearchRequest.externalReferenceIDs) &&
-        Objects.equals(this.externalReferenceSources, observationSearchRequest.externalReferenceSources) &&
-        Objects.equals(this.observationDbIds, observationSearchRequest.observationDbIds) &&
-        Objects.equals(this.observationLevelRelationships, observationSearchRequest.observationLevelRelationships) &&
-        Objects.equals(this.observationLevels, observationSearchRequest.observationLevels) &&
-        Objects.equals(this.observationTimeStampRangeEnd, observationSearchRequest.observationTimeStampRangeEnd) &&
-        Objects.equals(this.observationTimeStampRangeStart, observationSearchRequest.observationTimeStampRangeStart) &&
-        Objects.equals(this.observationUnitDbIds, observationSearchRequest.observationUnitDbIds) &&
-        Objects.equals(this.seasonDbIds, observationSearchRequest.seasonDbIds) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(programDbIds, programNames, trialDbIds, trialNames, studyDbIds, studyNames, germplasmDbIds, germplasmNames, locationDbIds, locationNames, observationVariableDbIds, observationVariableNames, externalReferenceIDs, externalReferenceSources, observationDbIds, observationLevelRelationships, observationLevels, observationTimeStampRangeEnd, observationTimeStampRangeStart, observationUnitDbIds, seasonDbIds, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ObservationSearchRequest {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-    sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-    sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-    sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-    sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-    sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-    sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-    sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-    sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-    sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-    sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-    sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
-    sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-    sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-    sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
-    sb.append("    observationLevelRelationships: ").append(toIndentedString(observationLevelRelationships)).append("\n");
-    sb.append("    observationLevels: ").append(toIndentedString(observationLevels)).append("\n");
-    sb.append("    observationTimeStampRangeEnd: ").append(toIndentedString(observationTimeStampRangeEnd)).append("\n");
-    sb.append("    observationTimeStampRangeStart: ").append(toIndentedString(observationTimeStampRangeStart)).append("\n");
-    sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-    sb.append("    seasonDbIds: ").append(toIndentedString(seasonDbIds)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
 }

From 6f33afe5cb2455effe20eedffd7a358572c63f80 Mon Sep 17 00:00:00 2001
From: Peter Selby <ps664@cornell.edu>
Date: Mon, 21 Aug 2023 16:06:51 -0400
Subject: [PATCH 21/28] fixes issues #151, #152, #117, #118, #119, #120, #121,
 #115, #116. Dependent on #199

---
 .../phenotype/ObservationUnitQueryParams.java |    7 +
 .../ObservationUnitTableQueryParams.java      |    7 +
 .../phenotype/OntologyQueryParams.java        |    1 +
 .../phenotype/ObservationUnitsApiTest.java    |  190 ++-
 .../modules/phenotype/OntologiesApiTest.java  |   18 +-
 .../v2/model/pheno/BrAPIObservationUnit.java  | 1092 +++++++++--------
 .../BrAPIObservationUnitSearchRequest.java    |  731 ++++++-----
 7 files changed, 1107 insertions(+), 939 deletions(-)

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationUnitQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationUnitQueryParams.java
index 9cb3fc82..58a3e4a5 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationUnitQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationUnitQueryParams.java
@@ -49,6 +49,13 @@ public class ObservationUnitQueryParams extends BrAPIQueryParams {
     private String externalReferenceId;
     @Deprecated
     private String externalReferenceID;
+    private String observationUnitName;
+    private String observationUnitLevelRelationshipDbId;
+    private String observationUnitLevelRelationshipCode;
+    private String commonCropName;
+    private String observationUnitLevelRelationshipOrder;
+    private String observationUnitLevelRelationshipName;
+
     
     public String getExternalReferenceId() {
 		return externalReferenceId;
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationUnitTableQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationUnitTableQueryParams.java
index 418e9647..c1bd3a16 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationUnitTableQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationUnitTableQueryParams.java
@@ -43,5 +43,12 @@ public class ObservationUnitTableQueryParams extends BrAPIQueryParams {
     protected String seasonDbId;
     protected String observationLevel;
     protected String observationVariableDbId;
+    protected String observationUnitLevelRelationshipDbId;
+    protected String observationUnitLevelRelationshipCode;
+    protected String observationUnitLevelRelationshipOrder;
+    protected String observationUnitLevelOrder;
+    protected String observationUnitLevelCode;
+    protected String observationUnitLevelRelationshipName;
+    protected String observationUnitLevelName;
 
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/OntologyQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/OntologyQueryParams.java
index b72d1ed7..35c06aa0 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/OntologyQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/OntologyQueryParams.java
@@ -35,5 +35,6 @@
 public class OntologyQueryParams extends BrAPIQueryParams {
 
     protected String ontologyDbId;
+    protected String ontologyName;
 
 }
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ObservationUnitsApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ObservationUnitsApiTest.java
index c3e1dcb4..c02c2f22 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ObservationUnitsApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ObservationUnitsApiTest.java
@@ -1,6 +1,6 @@
 /*
  * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/URL_Structure.md\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Response_Structure.md\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Date_Time_Encoding.md\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Location_Encoding.md\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Error_Handling.md\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Search_Services.md\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
+ * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/URL_Structure.md\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Response_Structure.md\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Date_Time_Encoding.md\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Location_Encoding.md\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Error_Handling.md\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Search_Services.md\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm ObservationUnits, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
  *
  * OpenAPI spec version: 2.0
  * 
@@ -14,21 +14,22 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.brapi.client.v2.ApiResponse;
+import org.brapi.client.v2.BrAPIClientTest;
 import org.brapi.client.v2.JSON;
 import org.brapi.client.v2.model.exceptions.ApiException;
 import org.brapi.client.v2.model.queryParams.phenotype.ObservationUnitQueryParams;
 import org.brapi.client.v2.model.queryParams.phenotype.ObservationUnitTableQueryParams;
 import org.brapi.v2.model.BrAPIAcceptedSearchResponse;
-import org.brapi.v2.model.BrAPIAcceptedSearchResponseResult;
 import org.brapi.v2.model.BrAPIWSMIMEDataTypes;
 import org.brapi.v2.model.pheno.BrAPIEntryTypeEnum;
 import org.brapi.v2.model.pheno.BrAPIObservationUnit;
 import org.brapi.v2.model.pheno.response.*;
 import org.brapi.v2.model.pheno.request.BrAPIObservationUnitSearchRequest;
-import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -39,14 +40,13 @@
  * API tests for ObservationUnitsApi
  */
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class ObservationUnitsApiTest {
+public class ObservationUnitsApiTest extends BrAPIClientTest {
 
-	private final ObservationUnitsApi api = new ObservationUnitsApi();
-	private String searchResultDbId;
+	private final ObservationUnitsApi api = new ObservationUnitsApi(this.apiClient);
 
 	@Test
 	public void observationlevelsGetTest() throws ApiException {
-		String studyDbId = null;
+		String studyDbId = "study1";
 		String trialDbId = null;
 		String programDbId = null;
 		Integer page = null;
@@ -55,7 +55,7 @@ public void observationlevelsGetTest() throws ApiException {
 		ApiResponse<BrAPIObservationLevelListResponse> response = api.observationlevelsGet(studyDbId, trialDbId,
 				programDbId, page, pageSize);
 
-		// TODO: test validations
+		assertEquals(4, response.getBody().getResult().getData().size());
 	}
 
 	/**
@@ -67,26 +67,15 @@ public void observationlevelsGetTest() throws ApiException {
 	 */
 	@Test
 	public void observationunitsGetTest() throws ApiException {
-		String observationUnitDbId = null;
-		String germplasmDbId = null;
-		String studyDbId = null;
-		String locationDbId = null;
-		String trialDbId = null;
-		String programDbId = null;
-		String seasonDbId = null;
-		String observationUnitLevelName = null;
-		String observationUnitLevelOrder = null;
-		String observationUnitLevelCode = null;
-		Boolean includeObservations = null;
-		String externalReferenceID = null;
-		String externalReferenceSource = null;
-		Integer page = null;
-		Integer pageSize = null;
+		String observationUnitDbId = "observation_unit1";
 
-		ObservationUnitQueryParams queryParams = new ObservationUnitQueryParams();
+		ObservationUnitQueryParams queryParams = new ObservationUnitQueryParams()
+				.observationUnitDbId(observationUnitDbId);
 		ApiResponse<BrAPIObservationUnitListResponse> response = api.observationunitsGet(queryParams);
 
-		// TODO: test validations
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(observationUnitDbId, response.getBody().getResult().getData().get(0).getObservationUnitDbId());
+
 	}
 
 	/**
@@ -98,14 +87,12 @@ public void observationunitsGetTest() throws ApiException {
 	 */
 	@Test
 	public void observationunitsObservationUnitDbIdGetTest() throws ApiException {
-		String observationUnitDbId = null;
+		String observationUnitDbId = "observation_unit1";
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-			ApiResponse<BrAPIObservationUnitSingleResponse> response = api
-					.observationunitsObservationUnitDbIdGet(observationUnitDbId);
-		});
+		ApiResponse<BrAPIObservationUnitSingleResponse> response = api
+				.observationunitsObservationUnitDbIdGet(observationUnitDbId);
 
-		// TODO: test validations
+		assertEquals(observationUnitDbId, response.getBody().getResult().getObservationUnitDbId());
 	}
 
 	/**
@@ -117,15 +104,15 @@ public void observationunitsObservationUnitDbIdGetTest() throws ApiException {
 	 */
 	@Test
 	public void observationunitsObservationUnitDbIdPutTest() throws ApiException {
-		String observationUnitDbId = null;
-		BrAPIObservationUnit body = null;
+		String observationUnitDbId = "observation_unit1";
+		BrAPIObservationUnit body = new BrAPIObservationUnit().observationUnitDbId(observationUnitDbId)
+				.observationUnitName("New Value");
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-			ApiResponse<BrAPIObservationUnitSingleResponse> response = api
-					.observationunitsObservationUnitDbIdPut(observationUnitDbId, body);
-		});
+		ApiResponse<BrAPIObservationUnitSingleResponse> response = api
+				.observationunitsObservationUnitDbIdPut(observationUnitDbId, body);
 
-		// TODO: test validations
+		assertEquals(observationUnitDbId, response.getBody().getResult().getObservationUnitDbId());
+		assertEquals(body.getObservationUnitName(), response.getBody().getResult().getObservationUnitName());
 	}
 
 	/**
@@ -137,13 +124,15 @@ public void observationunitsObservationUnitDbIdPutTest() throws ApiException {
 	 */
 	@Test
 	public void observationunitsPostTest() throws ApiException {
-		List<BrAPIObservationUnit> body = null;
+		BrAPIObservationUnit obsUnit = new BrAPIObservationUnit().observationUnitName("New Value");
+		List<BrAPIObservationUnit> body = Arrays.asList(obsUnit);
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-			ApiResponse<BrAPIObservationUnitListResponse> response = api.observationunitsPost(body);
-		});
+		ApiResponse<BrAPIObservationUnitListResponse> response = api.observationunitsPost(body);
 
-		// TODO: test validations
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(obsUnit.getObservationUnitName(),
+				response.getBody().getResult().getData().get(0).getObservationUnitName());
+		assertNotNull(response.getBody().getResult().getData().get(0).getObservationUnitDbId());
 	}
 
 	/**
@@ -157,13 +146,19 @@ public void observationunitsPostTest() throws ApiException {
 	 */
 	@Test
 	public void observationunitsPutTest() throws ApiException {
-		Map<String, BrAPIObservationUnit> body = null;
+		BrAPIObservationUnit obsUnit = new BrAPIObservationUnit().observationUnitDbId("observation_unit1")
+				.observationUnitName("New Value");
+		Map<String, BrAPIObservationUnit> body = new HashMap<String, BrAPIObservationUnit>();
+		body.put(obsUnit.getObservationUnitDbId(), obsUnit);
+
+		ApiResponse<BrAPIObservationUnitListResponse> response = api.observationunitsPut(body);
 
-		IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
-			ApiResponse<BrAPIObservationUnitListResponse> response = api.observationunitsPut(body);
-		});
+		assertEquals(1, response.getBody().getResult().getData().size());
+		assertEquals(obsUnit.getObservationUnitName(),
+				response.getBody().getResult().getData().get(0).getObservationUnitName());
+		assertEquals(obsUnit.getObservationUnitDbId(),
+				response.getBody().getResult().getData().get(0).getObservationUnitDbId());
 
-		// TODO: test validations
 	}
 
 	/**
@@ -206,21 +201,13 @@ public void observationunitsPutTest() throws ApiException {
 	 */
 	@Test
 	public void observationunitsTableGetTest() throws ApiException {
-		BrAPIWSMIMEDataTypes accept = null;
-		String observationUnitDbId = null;
-		String germplasmDbId = null;
-		String observationVariableDbId = null;
-		String studyDbId = null;
-		String locationDbId = null;
-		String trialDbId = null;
-		String programDbId = null;
-		String seasonDbId = null;
-		String observationLevel = null;
+		BrAPIWSMIMEDataTypes accept = BrAPIWSMIMEDataTypes.APPLICATION_JSON;
+		String observationUnitDbId = "observation_unit1";
 
-		ObservationUnitTableQueryParams queryParams = new ObservationUnitTableQueryParams();
+		ObservationUnitTableQueryParams queryParams = new ObservationUnitTableQueryParams().observationUnitDbId(observationUnitDbId);
 		ApiResponse<BrAPIObservationUnitTableResponse> response = api.observationunitsTableGet(accept, queryParams);
 
-		// TODO: test validations
+		assertEquals(1, response.getBody().getResult().getData().size());
 	}
 
 	/**
@@ -239,29 +226,21 @@ public void observationunitsTableGetTest() throws ApiException {
 	 * @throws ApiException if the Api call fails
 	 */
 	@Test
-	@Order(1)
 	public void searchObservationunitsPostTest() throws ApiException {
-		// Likely isn't going to return anything. Just testing whether search result vs data result is parsed correctly.
-		BrAPIObservationUnitSearchRequest body = new BrAPIObservationUnitSearchRequest();
-		body.addProgramDbIdsItem("1");
-
-		ApiResponse<Pair<Optional<BrAPIObservationUnitListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api.searchObservationunitsPost(body);
-
-		Pair<Optional<BrAPIObservationUnitListResponse>, Optional<BrAPIAcceptedSearchResponse>> responseBody = response.getBody();
-		Optional<BrAPIObservationUnitListResponse> listResponse = responseBody.getLeft();
-		Optional<BrAPIAcceptedSearchResponse> searchResponse = responseBody.getRight();
-		if (listResponse.isPresent()) {
-			assertTrue(listResponse.get() != null, "data body was null");
-			BrAPIObservationUnitListResponseResult result = listResponse.get().getResult();
-			assertTrue(result.getData() != null, "No data object was returned in body");
-		} else {
-			// Check our searchResultDbId was passed
-			assertTrue(searchResponse.get() != null, "search body was null");
-			BrAPIAcceptedSearchResponse resp = searchResponse.get();
-			BrAPIAcceptedSearchResponseResult result = resp.getResult();
-			assertTrue(result.getSearchResultsDbId() != null, "No search id was returned in body");
-			searchResultDbId = result.getSearchResultsDbId();
-		}
+		BrAPIObservationUnitSearchRequest body = new BrAPIObservationUnitSearchRequest()
+				.addObservationUnitDbIdsItem("observation_unit1")
+				.addObservationUnitDbIdsItem("observation_unit2");
+
+		ApiResponse<Pair<Optional<BrAPIObservationUnitListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api
+				.searchObservationunitsPost(body);
+
+        Optional<BrAPIObservationUnitListResponse> listResponse = response.getBody().getLeft();
+        Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+        // only results are returned
+        assertTrue(listResponse.isPresent());
+        assertFalse(searchIdResponse.isPresent());
+
+        assertEquals(2, listResponse.get().getResult().getData().size(), "unexpected number of elements returned");
 	}
 
 	/**
@@ -273,30 +252,31 @@ public void searchObservationunitsPostTest() throws ApiException {
 	 * @throws ApiException if the Api call fails
 	 */
 	@Test
-	@Order(2)
 	public void searchObservationunitsGetTest() throws ApiException {
-		Integer page = null;
-		Integer pageSize = null;
-
-		if (searchResultDbId != null) {
-			ApiResponse<Pair<Optional<BrAPIObservationUnitListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api
-					.searchObservationunitsSearchResultsDbIdGet(searchResultDbId, page, pageSize);
-
-			Pair<Optional<BrAPIObservationUnitListResponse>, Optional<BrAPIAcceptedSearchResponse>> responseBody = response.getBody();
-			Optional<BrAPIObservationUnitListResponse> listResponse = responseBody.getLeft();
-			Optional<BrAPIAcceptedSearchResponse> searchResponse = responseBody.getRight();
-			if (listResponse.isPresent()) {
-				assertTrue(listResponse.get() != null, "data body was null");
-				BrAPIObservationUnitListResponseResult result = listResponse.get().getResult();
-				assertTrue(result.getData() != null, "No data object was returned in body");
-			} else {
-				// Check our searchResultDbId was passed
-				assertTrue(searchResponse.get() != null, "search body was null");
-				BrAPIAcceptedSearchResponse resp = searchResponse.get();
-				BrAPIAcceptedSearchResponseResult result = resp.getResult();
-				assertTrue(result.getSearchResultsDbId() != null, "No search id was returned in body");
-			}
-		}
+		BrAPIObservationUnitSearchRequest baseRequest = new BrAPIObservationUnitSearchRequest()
+				.addObservationUnitDbIdsItem("observation_unit1")
+				.addObservationUnitDbIdsItem("observation_unit2")
+				.addObservationUnitDbIdsItem("observation_unit3")
+				.addObservationUnitDbIdsItem("observation_unit1")
+				.addObservationUnitDbIdsItem("observation_unit2")
+				.addObservationUnitDbIdsItem("observation_unit3");
+
+        ApiResponse<Pair<Optional<BrAPIObservationUnitListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = this.api.searchObservationunitsPost(baseRequest);
+        Optional<BrAPIObservationUnitListResponse> listResponse = response.getBody().getLeft();
+        Optional<BrAPIAcceptedSearchResponse> searchIdResponse = response.getBody().getRight();
+        // only search ID is returned
+        assertFalse(listResponse.isPresent());
+        assertTrue(searchIdResponse.isPresent());
+
+        // Get results from search ID
+    	ApiResponse<Pair<Optional<BrAPIObservationUnitListResponse>, Optional<BrAPIAcceptedSearchResponse>>> searchResponse = this.api.searchObservationunitsSearchResultsDbIdGet(searchIdResponse.get().getResult().getSearchResultsDbId(), 0, 10);
+        Optional<BrAPIObservationUnitListResponse> listResponse2 = searchResponse.getBody().getLeft();
+        Optional<BrAPIAcceptedSearchResponse> searchIdResponse2 = searchResponse.getBody().getRight();
+        // only results are returned
+        assertTrue(listResponse2.isPresent());
+        assertFalse(searchIdResponse2.isPresent());
+
+        assertEquals(3, listResponse2.get().getResult().getData().size(), "unexpected number of elements returned");
 
 	}
 
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/OntologiesApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/OntologiesApiTest.java
index e2f553ea..dc0cc2dd 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/OntologiesApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/OntologiesApiTest.java
@@ -12,18 +12,23 @@
 
 package org.brapi.client.v2.modules.phenotype;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.brapi.client.v2.ApiResponse;
+import org.brapi.client.v2.BrAPIClientTest;
 import org.brapi.client.v2.model.exceptions.ApiException;
 import org.brapi.client.v2.model.queryParams.phenotype.OntologyQueryParams;
 import org.brapi.v2.model.pheno.response.BrAPIOntologyListResponse;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 /**
  * API tests for OntologiesApi
  */
-public class OntologiesApiTest {
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class OntologiesApiTest extends BrAPIClientTest {
 
-    private final OntologiesApi api = new OntologiesApi();
+    private final OntologiesApi api = new OntologiesApi(this.apiClient);
 
     /**
      * Get the Ontologies
@@ -35,13 +40,12 @@ public class OntologiesApiTest {
      */
     @Test
     public void ontologiesGetTest() throws ApiException {
-        String ontologyDbId = null;
-        Integer page = null;
-        Integer pageSize = null;
+        String ontologyDbId = "ontology_variable1";
         
-        OntologyQueryParams queryParams = new OntologyQueryParams();
+        OntologyQueryParams queryParams = new OntologyQueryParams().ontologyDbId(ontologyDbId);
         ApiResponse<BrAPIOntologyListResponse> response = api.ontologiesGet(queryParams);
 
-        // TODO: test validations
+        assertEquals(1, response.getBody().getResult().getData().size());
+        assertEquals(ontologyDbId, response.getBody().getResult().getData().get(0).getOntologyDbId());
     }
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservationUnit.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservationUnit.java
index f5e6db1e..4609b2b2 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservationUnit.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservationUnit.java
@@ -17,530 +17,610 @@
  * ObservationUnit
  */
 
-
 public class BrAPIObservationUnit {
-  @JsonProperty("observationUnitDbId")
-  private String observationUnitDbId = null;
-
-  @JsonProperty("additionalInfo")
-  @Valid
-  @JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
-  private JsonObject additionalInfo = null;
-
-  @JsonProperty("externalReferences")
-  private List<BrAPIExternalReference> externalReferences = null;
-
-  @JsonProperty("germplasmDbId")
-  private String germplasmDbId = null;
-
-  @JsonProperty("germplasmName")
-  private String germplasmName = null;
-
-  @JsonProperty("locationDbId")
-  private String locationDbId = null;
-
-  @JsonProperty("locationName")
-  private String locationName = null;
-
-  @JsonProperty("observationUnitName")
-  private String observationUnitName = null;
-
-  @JsonProperty("observationUnitPUI")
-  private String observationUnitPUI = null;
-
-  @JsonProperty("observationUnitPosition")
-  private BrAPIObservationUnitPosition observationUnitPosition = null;
-
-  @JsonProperty("programDbId")
-  private String programDbId = null;
-
-  @JsonProperty("programName")
-  private String programName = null;
-
-  @JsonProperty("seedLotDbId")
-  private String seedLotDbId = null;
-
-  @JsonProperty("studyDbId")
-  private String studyDbId = null;
-
-  @JsonProperty("studyName")
-  private String studyName = null;
-
-  @JsonProperty("treatments")
-  @Valid
-  private List<BrAPIObservationTreatment> treatments = null;
-
-  @JsonProperty("trialDbId")
-  private String trialDbId = null;
-
-  @JsonProperty("trialName")
-  private String trialName = null;
-
-  @JsonProperty("observations")
-  @Valid
-  private List<BrAPIObservation> observations = null;
-
-  private final transient Gson gson = new Gson();
-
-  public BrAPIObservationUnit observationUnitDbId(String observationUnitDbId) {
-    this.observationUnitDbId = observationUnitDbId;
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies an observation unit  MIAPPE V1.1 (DM-70) Observation unit ID - Identifier used to identify the observation unit in data files containing the values observed or measured on that unit. Must be locally unique. 
-   * @return observationUnitDbId
-  **/
-  
-  
-    public String getObservationUnitDbId() {
-    return observationUnitDbId;
-  }
-
-  public void setObservationUnitDbId(String observationUnitDbId) {
-    this.observationUnitDbId = observationUnitDbId;
-  }
-
-  public BrAPIObservationUnit observations(List<BrAPIObservation> observations) {
-    this.observations = observations;
-    return this;
-  }
-
-  public BrAPIObservationUnit addObservationsItem(BrAPIObservation observationsItem) {
-    if (this.observations == null) {
-      this.observations = new ArrayList<BrAPIObservation>();
-    }
-    this.observations.add(observationsItem);
-    return this;
-  }
-
-  /**
-   * All observations attached to this observation unit.   Default for this field is null or omitted. Do NOT include data in this field unless the 'includeObservations' flag is explicitly set to True.
-   * @return observations
-  **/
-  
-      @Valid
-    public List<BrAPIObservation> getObservations() {
-    return observations;
-  }
-
-  public void setObservations(List<BrAPIObservation> observations) {
-    this.observations = observations;
-  }
-
-  public BrAPIObservationUnit additionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-    return this;
-  }
-
-  public BrAPIObservationUnit putAdditionalInfoItem(String key, Object additionalInfoItem) {
-    if (this.additionalInfo == null) {
-      this.additionalInfo = new JsonObject();
-    }
-    JsonElement newElement = gson.toJsonTree(additionalInfoItem);
-    this.additionalInfo.add(key, newElement);
-    return this;
-  }
-
-  /**
-   * Additional arbitrary info
-   * @return additionalInfo
-   **/
-
-
-  public JsonObject getAdditionalInfo() {
-    return additionalInfo;
-  }
-
-  public void setAdditionalInfo(JsonObject additionalInfo) {
-    this.additionalInfo = additionalInfo;
-  }
-
-  public BrAPIObservationUnit externalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-    return this;
-  }
-
-  /**
-   * Get externalReferences
-   * @return externalReferences
-   **/
-
-
-  @Valid
-  public List<BrAPIExternalReference> getExternalReferences() {
-    return externalReferences;
-  }
-
-  public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
-    this.externalReferences = externalReferences;
-  }
-
-  public BrAPIObservationUnit germplasmDbId(String germplasmDbId) {
-    this.germplasmDbId = germplasmDbId;
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies a germplasm
-   * @return germplasmDbId
-   **/
-
-
-  public String getGermplasmDbId() {
-    return germplasmDbId;
-  }
-
-  public void setGermplasmDbId(String germplasmDbId) {
-    this.germplasmDbId = germplasmDbId;
-  }
-
-  public BrAPIObservationUnit germplasmName(String germplasmName) {
-    this.germplasmName = germplasmName;
-    return this;
-  }
-
-  /**
-   * Name of the germplasm. It can be the preferred name and does not have to be unique.
-   * @return germplasmName
-   **/
-
-
-  public String getGermplasmName() {
-    return germplasmName;
-  }
-
-  public void setGermplasmName(String germplasmName) {
-    this.germplasmName = germplasmName;
-  }
-
-  public BrAPIObservationUnit locationDbId(String locationDbId) {
-    this.locationDbId = locationDbId;
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies a location, associated with this study
-   * @return locationDbId
-   **/
-
-
-  public String getLocationDbId() {
-    return locationDbId;
-  }
-
-  public void setLocationDbId(String locationDbId) {
-    this.locationDbId = locationDbId;
-  }
-
-  public BrAPIObservationUnit locationName(String locationName) {
-    this.locationName = locationName;
-    return this;
-  }
-
-  /**
-   * The human readable name of a location associated with this study
-   * @return locationName
-   **/
-
-
-  public String getLocationName() {
-    return locationName;
-  }
-
-  public void setLocationName(String locationName) {
-    this.locationName = locationName;
-  }
-
-  public BrAPIObservationUnit observationUnitName(String observationUnitName) {
-    this.observationUnitName = observationUnitName;
-    return this;
-  }
-
-  /**
-   * A human readable name for an observation unit
-   * @return observationUnitName
-   **/
-
-
-  public String getObservationUnitName() {
-    return observationUnitName;
-  }
-
-  public void setObservationUnitName(String observationUnitName) {
-    this.observationUnitName = observationUnitName;
-  }
-
-  public BrAPIObservationUnit observationUnitPUI(String observationUnitPUI) {
-    this.observationUnitPUI = observationUnitPUI;
-    return this;
-  }
-
-  /**
-   * A Permanent Unique Identifier for an observation unit  MIAPPE V1.1 (DM-72) External ID - Identifier for the observation unit in a persistent repository, comprises the name of the repository and the identifier of the observation unit therein. The EBI Biosamples repository can be used. URI are recommended when possible.
-   * @return observationUnitPUI
-   **/
-
-
-  public String getObservationUnitPUI() {
-    return observationUnitPUI;
-  }
-
-  public void setObservationUnitPUI(String observationUnitPUI) {
-    this.observationUnitPUI = observationUnitPUI;
-  }
-
-  public BrAPIObservationUnit observationUnitPosition(BrAPIObservationUnitPosition observationUnitPosition) {
-    this.observationUnitPosition = observationUnitPosition;
-    return this;
-  }
-
-  /**
-   * Get observationUnitPosition
-   * @return observationUnitPosition
-   **/
-
-
-  @Valid
-  public BrAPIObservationUnitPosition getObservationUnitPosition() {
-    return observationUnitPosition;
-  }
-
-  public void setObservationUnitPosition(BrAPIObservationUnitPosition observationUnitPosition) {
-    this.observationUnitPosition = observationUnitPosition;
-  }
+	@JsonProperty("observationUnitDbId")
+	private String observationUnitDbId = null;
 
-  public BrAPIObservationUnit programDbId(String programDbId) {
-    this.programDbId = programDbId;
-    return this;
-  }
+	@JsonProperty("additionalInfo")
+	@JsonAdapter(NullableJsonElementTypeAdapterFactory.class)
+	private JsonObject additionalInfo = null;
 
-  /**
-   * The ID which uniquely identifies a program
-   * @return programDbId
-   **/
+	@JsonProperty("externalReferences")
+	private List<BrAPIExternalReference> externalReferences = null;
 
+	@JsonProperty("germplasmDbId")
+	private String germplasmDbId = null;
 
-  public String getProgramDbId() {
-    return programDbId;
-  }
+	@JsonProperty("germplasmName")
+	private String germplasmName = null;
 
-  public void setProgramDbId(String programDbId) {
-    this.programDbId = programDbId;
-  }
+	@JsonProperty("locationDbId")
+	private String locationDbId = null;
 
-  public BrAPIObservationUnit programName(String programName) {
-    this.programName = programName;
-    return this;
-  }
+	@JsonProperty("locationName")
+	private String locationName = null;
 
-  /**
-   * The human readable name of a program
-   * @return programName
-   **/
+	@JsonProperty("observationUnitName")
+	private String observationUnitName = null;
 
+	@JsonProperty("observationUnitPUI")
+	private String observationUnitPUI = null;
 
-  public String getProgramName() {
-    return programName;
-  }
+	@JsonProperty("observationUnitPosition")
+	private BrAPIObservationUnitPosition observationUnitPosition = null;
 
-  public void setProgramName(String programName) {
-    this.programName = programName;
-  }
+	@JsonProperty("programDbId")
+	private String programDbId = null;
 
-  public BrAPIObservationUnit seedLotDbId(String seedLotDbId) {
-    this.seedLotDbId = seedLotDbId;
-    return this;
-  }
+	@JsonProperty("programName")
+	private String programName = null;
 
-  /**
-   * The unique identifier for the originating Seed Lot
-   * @return seedLotDbId
-   **/
+	@JsonProperty("seedLotDbId")
+	private String seedLotDbId = null;
 
+	@JsonProperty("seedLotName")
+	private String seedLotName = null;
 
-  public String getSeedLotDbId() {
-    return seedLotDbId;
-  }
+	@JsonProperty("studyDbId")
+	private String studyDbId = null;
 
-  public void setSeedLotDbId(String seedLotDbId) {
-    this.seedLotDbId = seedLotDbId;
-  }
+	@JsonProperty("studyName")
+	private String studyName = null;
 
-  public BrAPIObservationUnit studyDbId(String studyDbId) {
-    this.studyDbId = studyDbId;
-    return this;
-  }
+	@JsonProperty("treatments")
 
-  /**
-   * The ID which uniquely identifies a study within the given database server
-   * @return studyDbId
-   **/
+	private List<BrAPIObservationTreatment> treatments = null;
+	@JsonProperty("trialDbId")
+	private String trialDbId = null;
 
+	@JsonProperty("trialName")
+	private String trialName = null;
+
+	@JsonProperty("observations")
+	private List<BrAPIObservation> observations = null;
+
+	@JsonProperty("crossName")
+	private String crossName = null;
+
+	@JsonProperty("crossDbId")
+	private String crossDbId = null;
 
-  public String getStudyDbId() {
-    return studyDbId;
-  }
-
-  public void setStudyDbId(String studyDbId) {
-    this.studyDbId = studyDbId;
-  }
-
-  public BrAPIObservationUnit studyName(String studyName) {
-    this.studyName = studyName;
-    return this;
-  }
-
-  /**
-   * The human readable name for a study
-   * @return studyName
-   **/
-
-
-  public String getStudyName() {
-    return studyName;
-  }
-
-  public void setStudyName(String studyName) {
-    this.studyName = studyName;
-  }
-
-  public BrAPIObservationUnit treatments(List<BrAPIObservationTreatment> treatments) {
-    this.treatments = treatments;
-    return this;
-  }
-
-  public BrAPIObservationUnit addTreatmentsItem(BrAPIObservationTreatment treatmentsItem) {
-    if (this.treatments == null) {
-      this.treatments = new ArrayList<BrAPIObservationTreatment>();
-    }
-    this.treatments.add(treatmentsItem);
-    return this;
-  }
-
-  /**
-   * List of treatments applied to an observation unit.  MIAPPE V1.1 (DM-74) Observation Unit factor value - List of values for each factor applied to the observation unit.
-   * @return treatments
-   **/
-
-  @Valid
-  public List<BrAPIObservationTreatment> getTreatments() {
-    return treatments;
-  }
-
-  public void setTreatments(List<BrAPIObservationTreatment> treatments) {
-    this.treatments = treatments;
-  }
-
-  public BrAPIObservationUnit trialDbId(String trialDbId) {
-    this.trialDbId = trialDbId;
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies a trial
-   * @return trialDbId
-   **/
-
-
-  public String getTrialDbId() {
-    return trialDbId;
-  }
-
-  public void setTrialDbId(String trialDbId) {
-    this.trialDbId = trialDbId;
-  }
-
-  public BrAPIObservationUnit trialName(String trialName) {
-    this.trialName = trialName;
-    return this;
-  }
-
-  /**
-   * The human readable name of a trial
-   * @return trialName
-   **/
-
-
-  public String getTrialName() {
-    return trialName;
-  }
-
-  public void setTrialName(String trialName) {
-    this.trialName = trialName;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIObservationUnit observationUnit = (BrAPIObservationUnit) o;
-    return Objects.equals(this.observationUnitDbId, observationUnit.observationUnitDbId) &&
-            Objects.equals(this.observations, observationUnit.observations) &&
-            Objects.equals(this.additionalInfo, observationUnit.additionalInfo) &&
-            Objects.equals(this.externalReferences, observationUnit.externalReferences) &&
-            Objects.equals(this.germplasmDbId, observationUnit.germplasmDbId) &&
-            Objects.equals(this.germplasmName, observationUnit.germplasmName) &&
-            Objects.equals(this.locationDbId, observationUnit.locationDbId) &&
-            Objects.equals(this.locationName, observationUnit.locationName) &&
-            Objects.equals(this.observationUnitName, observationUnit.observationUnitName) &&
-            Objects.equals(this.observationUnitPUI, observationUnit.observationUnitPUI) &&
-            Objects.equals(this.observationUnitPosition, observationUnit.observationUnitPosition) &&
-            Objects.equals(this.programDbId, observationUnit.programDbId) &&
-            Objects.equals(this.programName, observationUnit.programName) &&
-            Objects.equals(this.seedLotDbId, observationUnit.seedLotDbId) &&
-            Objects.equals(this.studyDbId, observationUnit.studyDbId) &&
-            Objects.equals(this.studyName, observationUnit.studyName) &&
-            Objects.equals(this.treatments, observationUnit.treatments) &&
-            Objects.equals(this.trialDbId, observationUnit.trialDbId) &&
-            Objects.equals(this.trialName, observationUnit.trialName);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(observationUnitDbId, observations, additionalInfo, externalReferences, germplasmDbId, germplasmName, locationDbId, locationName, observationUnitName, observationUnitPUI, observationUnitPosition, programDbId, programName, seedLotDbId, studyDbId, studyName, treatments, trialDbId, trialName);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ObservationUnit {\n");
-    sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-    sb.append("    observations: ").append(toIndentedString(observations)).append("\n");
-    sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-    sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-    sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-    sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-    sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
-    sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
-    sb.append("    observationUnitName: ").append(toIndentedString(observationUnitName)).append("\n");
-    sb.append("    observationUnitPUI: ").append(toIndentedString(observationUnitPUI)).append("\n");
-    sb.append("    observationUnitPosition: ").append(toIndentedString(observationUnitPosition)).append("\n");
-    sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-    sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
-    sb.append("    seedLotDbId: ").append(toIndentedString(seedLotDbId)).append("\n");
-    sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-    sb.append("    studyName: ").append(toIndentedString(studyName)).append("\n");
-    sb.append("    treatments: ").append(toIndentedString(treatments)).append("\n");
-    sb.append("    trialDbId: ").append(toIndentedString(trialDbId)).append("\n");
-    sb.append("    trialName: ").append(toIndentedString(trialName)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
+	private final transient Gson gson = new Gson();
+
+	public BrAPIObservationUnit observationUnitDbId(String observationUnitDbId) {
+		this.observationUnitDbId = observationUnitDbId;
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies an observation unit MIAPPE V1.1 (DM-70)
+	 * Observation unit ID - Identifier used to identify the observation unit in
+	 * data files containing the values observed or measured on that unit. Must be
+	 * locally unique.
+	 * 
+	 * @return observationUnitDbId
+	 **/
+
+	public String getObservationUnitDbId() {
+		return observationUnitDbId;
+	}
+
+	public void setObservationUnitDbId(String observationUnitDbId) {
+		this.observationUnitDbId = observationUnitDbId;
+	}
+
+	public BrAPIObservationUnit observations(List<BrAPIObservation> observations) {
+		this.observations = observations;
+		return this;
+	}
+
+	public BrAPIObservationUnit addObservationsItem(BrAPIObservation observationsItem) {
+		if (this.observations == null) {
+			this.observations = new ArrayList<BrAPIObservation>();
+		}
+		this.observations.add(observationsItem);
+		return this;
+	}
+
+	/**
+	 * All observations attached to this observation unit. Default for this field is
+	 * null or omitted. Do NOT include data in this field unless the
+	 * 'includeObservations' flag is explicitly set to True.
+	 * 
+	 * @return observations
+	 **/
+
+	public List<BrAPIObservation> getObservations() {
+		return observations;
+	}
+
+	public void setObservations(List<BrAPIObservation> observations) {
+		this.observations = observations;
+	}
+
+	public BrAPIObservationUnit additionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+		return this;
+	}
+
+	public BrAPIObservationUnit putAdditionalInfoItem(String key, Object additionalInfoItem) {
+		if (this.additionalInfo == null) {
+			this.additionalInfo = new JsonObject();
+		}
+		JsonElement newElement = gson.toJsonTree(additionalInfoItem);
+		this.additionalInfo.add(key, newElement);
+		return this;
+	}
+
+	/**
+	 * Additional arbitrary info
+	 * 
+	 * @return additionalInfo
+	 **/
+
+	public JsonObject getAdditionalInfo() {
+		return additionalInfo;
+	}
+
+	public void setAdditionalInfo(JsonObject additionalInfo) {
+		this.additionalInfo = additionalInfo;
+	}
+
+	public BrAPIObservationUnit externalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+		return this;
+	}
+
+	/**
+	 * Get externalReferences
+	 * 
+	 * @return externalReferences
+	 **/
+
+	public List<BrAPIExternalReference> getExternalReferences() {
+		return externalReferences;
+	}
+
+	public void setExternalReferences(List<BrAPIExternalReference> externalReferences) {
+		this.externalReferences = externalReferences;
+	}
+
+	public BrAPIObservationUnit germplasmDbId(String germplasmDbId) {
+		this.germplasmDbId = germplasmDbId;
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a germplasm
+	 * 
+	 * @return germplasmDbId
+	 **/
+
+	public String getGermplasmDbId() {
+		return germplasmDbId;
+	}
+
+	public void setGermplasmDbId(String germplasmDbId) {
+		this.germplasmDbId = germplasmDbId;
+	}
+
+	public BrAPIObservationUnit germplasmName(String germplasmName) {
+		this.germplasmName = germplasmName;
+		return this;
+	}
+
+	/**
+	 * Name of the germplasm. It can be the preferred name and does not have to be
+	 * unique.
+	 * 
+	 * @return germplasmName
+	 **/
+
+	public String getGermplasmName() {
+		return germplasmName;
+	}
+
+	public void setGermplasmName(String germplasmName) {
+		this.germplasmName = germplasmName;
+	}
+
+	public BrAPIObservationUnit locationDbId(String locationDbId) {
+		this.locationDbId = locationDbId;
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a location, associated with this study
+	 * 
+	 * @return locationDbId
+	 **/
+
+	public String getLocationDbId() {
+		return locationDbId;
+	}
+
+	public void setLocationDbId(String locationDbId) {
+		this.locationDbId = locationDbId;
+	}
+
+	public BrAPIObservationUnit locationName(String locationName) {
+		this.locationName = locationName;
+		return this;
+	}
+
+	/**
+	 * The human readable name of a location associated with this study
+	 * 
+	 * @return locationName
+	 **/
+
+	public String getLocationName() {
+		return locationName;
+	}
+
+	public void setLocationName(String locationName) {
+		this.locationName = locationName;
+	}
+
+	public BrAPIObservationUnit observationUnitName(String observationUnitName) {
+		this.observationUnitName = observationUnitName;
+		return this;
+	}
+
+	/**
+	 * A human readable name for an observation unit
+	 * 
+	 * @return observationUnitName
+	 **/
+
+	public String getObservationUnitName() {
+		return observationUnitName;
+	}
+
+	public void setObservationUnitName(String observationUnitName) {
+		this.observationUnitName = observationUnitName;
+	}
+
+	public BrAPIObservationUnit observationUnitPUI(String observationUnitPUI) {
+		this.observationUnitPUI = observationUnitPUI;
+		return this;
+	}
+
+	/**
+	 * A Permanent Unique Identifier for an observation unit MIAPPE V1.1 (DM-72)
+	 * External ID - Identifier for the observation unit in a persistent repository,
+	 * comprises the name of the repository and the identifier of the observation
+	 * unit therein. The EBI Biosamples repository can be used. URI are recommended
+	 * when possible.
+	 * 
+	 * @return observationUnitPUI
+	 **/
+
+	public String getObservationUnitPUI() {
+		return observationUnitPUI;
+	}
+
+	public void setObservationUnitPUI(String observationUnitPUI) {
+		this.observationUnitPUI = observationUnitPUI;
+	}
+
+	public BrAPIObservationUnit observationUnitPosition(BrAPIObservationUnitPosition observationUnitPosition) {
+		this.observationUnitPosition = observationUnitPosition;
+		return this;
+	}
+
+	/**
+	 * Get observationUnitPosition
+	 * 
+	 * @return observationUnitPosition
+	 **/
+
+	public BrAPIObservationUnitPosition getObservationUnitPosition() {
+		return observationUnitPosition;
+	}
+
+	public void setObservationUnitPosition(BrAPIObservationUnitPosition observationUnitPosition) {
+		this.observationUnitPosition = observationUnitPosition;
+	}
+
+	public BrAPIObservationUnit programDbId(String programDbId) {
+		this.programDbId = programDbId;
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a program
+	 * 
+	 * @return programDbId
+	 **/
+
+	public String getProgramDbId() {
+		return programDbId;
+	}
+
+	public void setProgramDbId(String programDbId) {
+		this.programDbId = programDbId;
+	}
+
+	public BrAPIObservationUnit programName(String programName) {
+		this.programName = programName;
+		return this;
+	}
+
+	/**
+	 * The human readable name of a program
+	 * 
+	 * @return programName
+	 **/
+
+	public String getProgramName() {
+		return programName;
+	}
+
+	public void setProgramName(String programName) {
+		this.programName = programName;
+	}
+
+	public BrAPIObservationUnit seedLotDbId(String seedLotDbId) {
+		this.seedLotDbId = seedLotDbId;
+		return this;
+	}
+
+	/**
+	 * The unique identifier for the originating Seed Lot
+	 * 
+	 * @return seedLotDbId
+	 **/
+
+	public String getSeedLotDbId() {
+		return seedLotDbId;
+	}
+
+	public void setSeedLotDbId(String seedLotDbId) {
+		this.seedLotDbId = seedLotDbId;
+	}
+
+	public BrAPIObservationUnit seedLotName(String seedLotName) {
+		this.seedLotName = seedLotName;
+		return this;
+	}
+
+	/**
+	 * The unique identifier for the originating Seed Lot
+	 * 
+	 * @return seedLotName
+	 **/
+
+	public String getSeedLotName() {
+		return seedLotName;
+	}
+
+	public void setSeedLotName(String seedLotName) {
+		this.seedLotName = seedLotName;
+	}
+
+	public BrAPIObservationUnit crossDbId(String crossDbId) {
+		this.crossDbId = crossDbId;
+		return this;
+	}
+
+	/**
+	 * The unique identifier for the originating Seed Lot
+	 * 
+	 * @return crossDbId
+	 **/
+
+	public String getCrossDbId() {
+		return crossDbId;
+	}
+
+	public void setCrossDbId(String crossDbId) {
+		this.crossDbId = crossDbId;
+	}
+
+	public BrAPIObservationUnit crossName(String crossName) {
+		this.crossName = crossName;
+		return this;
+	}
+
+	/**
+	 * The unique identifier for the originating Seed Lot
+	 * 
+	 * @return crossName
+	 **/
+
+	public String getCrossName() {
+		return crossName;
+	}
+
+	public void setCrossName(String crossName) {
+		this.crossName = crossName;
+	}
+
+	public BrAPIObservationUnit studyDbId(String studyDbId) {
+		this.studyDbId = studyDbId;
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a study within the given database server
+	 * 
+	 * @return studyDbId
+	 **/
+
+	public String getStudyDbId() {
+		return studyDbId;
+	}
+
+	public void setStudyDbId(String studyDbId) {
+		this.studyDbId = studyDbId;
+	}
+
+	public BrAPIObservationUnit studyName(String studyName) {
+		this.studyName = studyName;
+		return this;
+	}
+
+	/**
+	 * The human readable name for a study
+	 * 
+	 * @return studyName
+	 **/
+
+	public String getStudyName() {
+		return studyName;
+	}
+
+	public void setStudyName(String studyName) {
+		this.studyName = studyName;
+	}
+
+	public BrAPIObservationUnit treatments(List<BrAPIObservationTreatment> treatments) {
+		this.treatments = treatments;
+		return this;
+	}
+
+	public BrAPIObservationUnit addTreatmentsItem(BrAPIObservationTreatment treatmentsItem) {
+		if (this.treatments == null) {
+			this.treatments = new ArrayList<BrAPIObservationTreatment>();
+		}
+		this.treatments.add(treatmentsItem);
+		return this;
+	}
+
+	/**
+	 * List of treatments applied to an observation unit. MIAPPE V1.1 (DM-74)
+	 * Observation Unit factor value - List of values for each factor applied to the
+	 * observation unit.
+	 * 
+	 * @return treatments
+	 **/
+
+	public List<BrAPIObservationTreatment> getTreatments() {
+		return treatments;
+	}
+
+	public void setTreatments(List<BrAPIObservationTreatment> treatments) {
+		this.treatments = treatments;
+	}
+
+	public BrAPIObservationUnit trialDbId(String trialDbId) {
+		this.trialDbId = trialDbId;
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a trial
+	 * 
+	 * @return trialDbId
+	 **/
+
+	public String getTrialDbId() {
+		return trialDbId;
+	}
+
+	public void setTrialDbId(String trialDbId) {
+		this.trialDbId = trialDbId;
+	}
+
+	public BrAPIObservationUnit trialName(String trialName) {
+		this.trialName = trialName;
+		return this;
+	}
+
+	/**
+	 * The human readable name of a trial
+	 * 
+	 * @return trialName
+	 **/
+
+	public String getTrialName() {
+		return trialName;
+	}
+
+	public void setTrialName(String trialName) {
+		this.trialName = trialName;
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		BrAPIObservationUnit observationUnit = (BrAPIObservationUnit) o;
+		return Objects.equals(this.observationUnitDbId, observationUnit.observationUnitDbId)
+				&& Objects.equals(this.observations, observationUnit.observations)
+				&& Objects.equals(this.additionalInfo, observationUnit.additionalInfo)
+				&& Objects.equals(this.externalReferences, observationUnit.externalReferences)
+				&& Objects.equals(this.germplasmDbId, observationUnit.germplasmDbId)
+				&& Objects.equals(this.germplasmName, observationUnit.germplasmName)
+				&& Objects.equals(this.locationDbId, observationUnit.locationDbId)
+				&& Objects.equals(this.locationName, observationUnit.locationName)
+				&& Objects.equals(this.observationUnitName, observationUnit.observationUnitName)
+				&& Objects.equals(this.observationUnitPUI, observationUnit.observationUnitPUI)
+				&& Objects.equals(this.observationUnitPosition, observationUnit.observationUnitPosition)
+				&& Objects.equals(this.programDbId, observationUnit.programDbId)
+				&& Objects.equals(this.programName, observationUnit.programName)
+				&& Objects.equals(this.seedLotDbId, observationUnit.seedLotDbId)
+				&& Objects.equals(this.seedLotName, observationUnit.seedLotName)
+				&& Objects.equals(this.crossDbId, observationUnit.crossDbId)
+				&& Objects.equals(this.crossName, observationUnit.crossName)
+				&& Objects.equals(this.studyDbId, observationUnit.studyDbId)
+				&& Objects.equals(this.studyName, observationUnit.studyName)
+				&& Objects.equals(this.treatments, observationUnit.treatments)
+				&& Objects.equals(this.trialDbId, observationUnit.trialDbId)
+				&& Objects.equals(this.trialName, observationUnit.trialName);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(observationUnitDbId, observations, additionalInfo, externalReferences, germplasmDbId,
+				germplasmName, locationDbId, locationName, observationUnitName, observationUnitPUI,
+				observationUnitPosition, programDbId, programName, seedLotDbId, crossDbId, crossName, seedLotName, studyDbId, studyName, treatments,
+				trialDbId, trialName);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("class ObservationUnit {\n");
+		sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
+		sb.append("    observations: ").append(toIndentedString(observations)).append("\n");
+		sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
+		sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
+		sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
+		sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
+		sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
+		sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
+		sb.append("    observationUnitName: ").append(toIndentedString(observationUnitName)).append("\n");
+		sb.append("    observationUnitPUI: ").append(toIndentedString(observationUnitPUI)).append("\n");
+		sb.append("    observationUnitPosition: ").append(toIndentedString(observationUnitPosition)).append("\n");
+		sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
+		sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
+		sb.append("    seedLotDbId: ").append(toIndentedString(seedLotDbId)).append("\n");
+		sb.append("    seedLotName: ").append(toIndentedString(seedLotName)).append("\n");
+		sb.append("    crossDbId: ").append(toIndentedString(crossDbId)).append("\n");
+		sb.append("    crossName: ").append(toIndentedString(crossName)).append("\n");
+		sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
+		sb.append("    studyName: ").append(toIndentedString(studyName)).append("\n");
+		sb.append("    treatments: ").append(toIndentedString(treatments)).append("\n");
+		sb.append("    trialDbId: ").append(toIndentedString(trialDbId)).append("\n");
+		sb.append("    trialName: ").append(toIndentedString(trialName)).append("\n");
+		sb.append("}");
+		return sb.toString();
+	}
+
+	/**
+	 * Convert the given object to string with each line indented by 4 spaces
+	 * (except the first line).
+	 */
+	private String toIndentedString(java.lang.Object o) {
+		if (o == null) {
+			return "null";
+		}
+		return o.toString().replace("\n", "\n    ");
+	}
 }
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/request/BrAPIObservationUnitSearchRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/request/BrAPIObservationUnitSearchRequest.java
index d87708a9..5a620e7f 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/request/BrAPIObservationUnitSearchRequest.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/pheno/request/BrAPIObservationUnitSearchRequest.java
@@ -6,283 +6,281 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-
 import org.brapi.v2.model.BrAPISearchRequestParametersPaging;
+import org.brapi.v2.model.pheno.BrAPIObservationUnitHierarchyLevel;
 import org.brapi.v2.model.pheno.BrAPIObservationUnitLevelRelationship;
 
 /**
- * ObservationUnitSearchRequest
+ * BrAPIObservationUnitSearchRequest
  */
 
-
 public class BrAPIObservationUnitSearchRequest extends BrAPISearchRequestParametersPaging {
-	@JsonProperty("programDbIds")
-	@Valid
-	private List<String> programDbIds = null;
+	@JsonProperty("commonCropNames")
+	private List<String> commonCropNames = null;
 
-	@JsonProperty("programNames")
-	@Valid
-	private List<String> programNames = null;
+	@Deprecated
+	@JsonProperty("externalReferenceIDs")
+	private List<String> externalReferenceIDs = null;
 
-	@JsonProperty("trialDbIds")
-	@Valid
-	private List<String> trialDbIds = null;
+	@JsonProperty("externalReferenceIds")
+	private List<String> externalReferenceIds = null;
 
-	@JsonProperty("trialNames")
-	@Valid
-	private List<String> trialNames = null;
+	@JsonProperty("externalReferenceSources")
+	private List<String> externalReferenceSources = null;
 
-	@JsonProperty("studyDbIds")
-	@Valid
-	private List<String> studyDbIds = null;
+	@JsonProperty("germplasmDbIds")
+	private List<String> germplasmDbIds = null;
 
-	@JsonProperty("studyNames")
-	@Valid
-	private List<String> studyNames = null;
+	@JsonProperty("germplasmNames")
+	private List<String> germplasmNames = null;
 
-	@JsonProperty("seasonDbIds")
-	@Valid
-	private List<String> seasonDbIds = null;
+	@JsonProperty("includeObservations")
+	private Boolean includeObservations = null;
 
 	@JsonProperty("locationDbIds")
-	@Valid
 	private List<String> locationDbIds = null;
 
 	@JsonProperty("locationNames")
-	@Valid
 	private List<String> locationNames = null;
 
-	@JsonProperty("germplasmDbIds")
-	@Valid
-	private List<String> germplasmDbIds = null;
+	@JsonProperty("observationLevelRelationships")
+	private List<BrAPIObservationUnitLevelRelationship> observationLevelRelationships = null;
 
-	@JsonProperty("germplasmNames")
-	@Valid
-	private List<String> germplasmNames = null;
+	@JsonProperty("observationLevels")
+	private List<BrAPIObservationUnitHierarchyLevel> observationLevels = null;
+
+	@JsonProperty("observationUnitDbIds")
+	private List<String> observationUnitDbIds = null;
 
 	@JsonProperty("observationUnitNames")
-	@Valid
 	private List<String> observationUnitNames = null;
 
 	@JsonProperty("observationVariableDbIds")
-	@Valid
 	private List<String> observationVariableDbIds = null;
 
 	@JsonProperty("observationVariableNames")
-	@Valid
 	private List<String> observationVariableNames = null;
 
-	@JsonProperty("externalReferenceIDs")
-	@Valid
-	private List<String> externalReferenceIDs = null;
+	@JsonProperty("observationVariablePUIs")
+	private List<String> observationVariablePUIs = null;
 
-	@JsonProperty("externalReferenceSources")
-	@Valid
-	private List<String> externalReferenceSources = null;
+	@JsonProperty("programDbIds")
+	private List<String> programDbIds = null;
 
-	@JsonProperty("includeObservations")
-	private Boolean includeObservations = null;
+	@JsonProperty("programNames")
+	private List<String> programNames = null;
 
-	@JsonProperty("observationLevelRelationships")
-	@Valid
-	private List<BrAPIObservationUnitLevelRelationship> observationLevelRelationships = null;
+	@JsonProperty("seasonDbIds")
+	private List<String> seasonDbIds = null;
 
-	@JsonProperty("observationLevels")
-	@Valid
-	private List<BrAPIObservationUnitLevelRelationship> observationLevels = null;
+	@JsonProperty("studyDbIds")
+	private List<String> studyDbIds = null;
 
-	@JsonProperty("observationUnitDbIds")
-	@Valid
-	private List<String> observationUnitDbIds = null;
+	@JsonProperty("studyNames")
+	private List<String> studyNames = null;
 
-	public BrAPIObservationUnitSearchRequest seasonDbIds(List<String> seasonDbIds) {
-		this.seasonDbIds = seasonDbIds;
+	@JsonProperty("trialDbIds")
+	private List<String> trialDbIds = null;
+
+	@JsonProperty("trialNames")
+	private List<String> trialNames = null;
+
+	public BrAPIObservationUnitSearchRequest commonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
 		return this;
 	}
 
-	public BrAPIObservationUnitSearchRequest addSeasonDbIdsItem(String seasonDbIdsItem) {
-		if (this.seasonDbIds == null) {
-			this.seasonDbIds = new ArrayList<String>();
+	public BrAPIObservationUnitSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
+		if (this.commonCropNames == null) {
+			this.commonCropNames = new ArrayList<String>();
 		}
-		this.seasonDbIds.add(seasonDbIdsItem);
+		this.commonCropNames.add(commonCropNamesItem);
 		return this;
 	}
 
-	public List<String> getSeasonDbIds() {
-		return seasonDbIds;
+	/**
+	 * The BrAPI Common Crop Name is the simple, generalized, widely accepted name
+	 * of the organism being researched. It is most often used in multi-crop systems
+	 * where digital resources need to be divided at a high level. Things like
+	 * &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of
+	 * common crop names. Use this parameter to only return results associated with
+	 * the given crops. Use &#x60;GET /commoncropnames&#x60; to find the list of
+	 * available crops on a server.
+	 *
+	 * @return commonCropNames
+	 **/
+
+	public List<String> getCommonCropNames() {
+		return commonCropNames;
 	}
 
-	public void setSeasonDbIds(List<String> seasonDbIds) {
-		this.seasonDbIds = seasonDbIds;
+	public void setCommonCropNames(List<String> commonCropNames) {
+		this.commonCropNames = commonCropNames;
 	}
 
-	public BrAPIObservationUnitSearchRequest programDbIds(List<String> programDbIds) {
-		this.programDbIds = programDbIds;
+	@Deprecated
+	public BrAPIObservationUnitSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
 		return this;
 	}
 
-	public BrAPIObservationUnitSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-		if (this.programDbIds == null) {
-			this.programDbIds = new ArrayList<String>();
+	@Deprecated
+	public BrAPIObservationUnitSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
+		if (this.externalReferenceIDs == null) {
+			this.externalReferenceIDs = new ArrayList<String>();
 		}
-		this.programDbIds.add(programDbIdsItem);
+		this.externalReferenceIDs.add(externalReferenceIDsItem);
 		return this;
 	}
 
 	/**
-	 * A program identifier to search for
-	 * 
-	 * @return programDbIds
+	 * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github
+	 * issue number #460 &lt;br&gt;List of external reference IDs. Could be a simple
+	 * strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
+	 *
+	 * @return externalReferenceIDs
 	 **/
-	
 
-	public List<String> getProgramDbIds() {
-		return programDbIds;
+	@Deprecated
+	public List<String> getExternalReferenceIDs() {
+		return externalReferenceIDs;
 	}
 
-	public void setProgramDbIds(List<String> programDbIds) {
-		this.programDbIds = programDbIds;
+	@Deprecated
+	public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
+		this.externalReferenceIDs = externalReferenceIDs;
 	}
 
-	public BrAPIObservationUnitSearchRequest programNames(List<String> programNames) {
-		this.programNames = programNames;
+	public BrAPIObservationUnitSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
 		return this;
 	}
 
-	public BrAPIObservationUnitSearchRequest addProgramNamesItem(String programNamesItem) {
-		if (this.programNames == null) {
-			this.programNames = new ArrayList<String>();
+	public BrAPIObservationUnitSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
+		if (this.externalReferenceIds == null) {
+			this.externalReferenceIds = new ArrayList<String>();
 		}
-		this.programNames.add(programNamesItem);
+		this.externalReferenceIds.add(externalReferenceIdsItem);
 		return this;
 	}
 
 	/**
-	 * A name of a program to search for
-	 * 
-	 * @return programNames
+	 * List of external reference IDs. Could be a simple strings or a URIs. (use
+	 * with &#x60;externalReferenceSources&#x60; parameter)
+	 *
+	 * @return externalReferenceIds
 	 **/
-	
 
-	public List<String> getProgramNames() {
-		return programNames;
+	public List<String> getExternalReferenceIds() {
+		return externalReferenceIds;
 	}
 
-	public void setProgramNames(List<String> programNames) {
-		this.programNames = programNames;
+	public void setExternalReferenceIds(List<String> externalReferenceIds) {
+		this.externalReferenceIds = externalReferenceIds;
 	}
 
-	public BrAPIObservationUnitSearchRequest trialDbIds(List<String> trialDbIds) {
-		this.trialDbIds = trialDbIds;
+	public BrAPIObservationUnitSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
 		return this;
 	}
 
-	public BrAPIObservationUnitSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-		if (this.trialDbIds == null) {
-			this.trialDbIds = new ArrayList<String>();
+	public BrAPIObservationUnitSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
+		if (this.externalReferenceSources == null) {
+			this.externalReferenceSources = new ArrayList<String>();
 		}
-		this.trialDbIds.add(trialDbIdsItem);
+		this.externalReferenceSources.add(externalReferenceSourcesItem);
 		return this;
 	}
 
 	/**
-	 * The ID which uniquely identifies a trial to search for
-	 * 
-	 * @return trialDbIds
+	 * List of identifiers for the source system or database of an external
+	 * reference (use with &#x60;externalReferenceIDs&#x60; parameter)
+	 *
+	 * @return externalReferenceSources
 	 **/
-	
 
-	public List<String> getTrialDbIds() {
-		return trialDbIds;
+	public List<String> getExternalReferenceSources() {
+		return externalReferenceSources;
 	}
 
-	public void setTrialDbIds(List<String> trialDbIds) {
-		this.trialDbIds = trialDbIds;
+	public void setExternalReferenceSources(List<String> externalReferenceSources) {
+		this.externalReferenceSources = externalReferenceSources;
 	}
 
-	public BrAPIObservationUnitSearchRequest trialNames(List<String> trialNames) {
-		this.trialNames = trialNames;
+	public BrAPIObservationUnitSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
+		this.germplasmDbIds = germplasmDbIds;
 		return this;
 	}
 
-	public BrAPIObservationUnitSearchRequest addTrialNamesItem(String trialNamesItem) {
-		if (this.trialNames == null) {
-			this.trialNames = new ArrayList<String>();
+	public BrAPIObservationUnitSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
+		if (this.germplasmDbIds == null) {
+			this.germplasmDbIds = new ArrayList<String>();
 		}
-		this.trialNames.add(trialNamesItem);
+		this.germplasmDbIds.add(germplasmDbIdsItem);
 		return this;
 	}
 
 	/**
-	 * The human readable name of a trial to search for
-	 * 
-	 * @return trialNames
+	 * List of IDs which uniquely identify germplasm to search for
+	 *
+	 * @return germplasmDbIds
 	 **/
-	
 
-	public List<String> getTrialNames() {
-		return trialNames;
+	public List<String> getGermplasmDbIds() {
+		return germplasmDbIds;
 	}
 
-	public void setTrialNames(List<String> trialNames) {
-		this.trialNames = trialNames;
+	public void setGermplasmDbIds(List<String> germplasmDbIds) {
+		this.germplasmDbIds = germplasmDbIds;
 	}
 
-	public BrAPIObservationUnitSearchRequest studyDbIds(List<String> studyDbIds) {
-		this.studyDbIds = studyDbIds;
+	public BrAPIObservationUnitSearchRequest germplasmNames(List<String> germplasmNames) {
+		this.germplasmNames = germplasmNames;
 		return this;
 	}
 
-	public BrAPIObservationUnitSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-		if (this.studyDbIds == null) {
-			this.studyDbIds = new ArrayList<String>();
+	public BrAPIObservationUnitSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
+		if (this.germplasmNames == null) {
+			this.germplasmNames = new ArrayList<String>();
 		}
-		this.studyDbIds.add(studyDbIdsItem);
+		this.germplasmNames.add(germplasmNamesItem);
 		return this;
 	}
 
 	/**
-	 * List of study identifiers to search for
-	 * 
-	 * @return studyDbIds
+	 * List of human readable names to identify germplasm to search for
+	 *
+	 * @return germplasmNames
 	 **/
-	
-
-	public List<String> getStudyDbIds() {
-		return studyDbIds;
-	}
 
-	public void setStudyDbIds(List<String> studyDbIds) {
-		this.studyDbIds = studyDbIds;
+	public List<String> getGermplasmNames() {
+		return germplasmNames;
 	}
 
-	public BrAPIObservationUnitSearchRequest studyNames(List<String> studyNames) {
-		this.studyNames = studyNames;
-		return this;
+	public void setGermplasmNames(List<String> germplasmNames) {
+		this.germplasmNames = germplasmNames;
 	}
 
-	public BrAPIObservationUnitSearchRequest addStudyNamesItem(String studyNamesItem) {
-		if (this.studyNames == null) {
-			this.studyNames = new ArrayList<String>();
-		}
-		this.studyNames.add(studyNamesItem);
+	public BrAPIObservationUnitSearchRequest includeObservations(Boolean includeObservations) {
+		this.includeObservations = includeObservations;
 		return this;
 	}
 
 	/**
-	 * List of study names to filter search results
-	 * 
-	 * @return studyNames
+	 * Use this parameter to include a list of observations embedded in each
+	 * ObservationUnit object. CAUTION - Use this parameter at your own risk. It may
+	 * return large, unpaginated lists of observation data. Only set this value to
+	 * True if you are sure you need to.
+	 *
+	 * @return includeObservations
 	 **/
-	
 
-	public List<String> getStudyNames() {
-		return studyNames;
+	public Boolean isIncludeObservations() {
+		return includeObservations;
 	}
 
-	public void setStudyNames(List<String> studyNames) {
-		this.studyNames = studyNames;
+	public void setIncludeObservations(Boolean includeObservations) {
+		this.includeObservations = includeObservations;
 	}
 
 	public BrAPIObservationUnitSearchRequest locationDbIds(List<String> locationDbIds) {
@@ -300,10 +298,9 @@ public BrAPIObservationUnitSearchRequest addLocationDbIdsItem(String locationDbI
 
 	/**
 	 * The location ids to search for
-	 * 
+	 *
 	 * @return locationDbIds
 	 **/
-	
 
 	public List<String> getLocationDbIds() {
 		return locationDbIds;
@@ -328,10 +325,9 @@ public BrAPIObservationUnitSearchRequest addLocationNamesItem(String locationNam
 
 	/**
 	 * A human readable names to search for
-	 * 
+	 *
 	 * @return locationNames
 	 **/
-	
 
 	public List<String> getLocationNames() {
 		return locationNames;
@@ -341,81 +337,94 @@ public void setLocationNames(List<String> locationNames) {
 		this.locationNames = locationNames;
 	}
 
-	public BrAPIObservationUnitSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-		this.germplasmDbIds = germplasmDbIds;
+	public BrAPIObservationUnitSearchRequest observationLevelRelationships(
+			List<BrAPIObservationUnitLevelRelationship> observationLevelRelationships) {
+		this.observationLevelRelationships = observationLevelRelationships;
 		return this;
 	}
 
-	public BrAPIObservationUnitSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-		if (this.germplasmDbIds == null) {
-			this.germplasmDbIds = new ArrayList<String>();
+	public BrAPIObservationUnitSearchRequest addObservationLevelRelationshipsItem(
+			BrAPIObservationUnitLevelRelationship observationLevelRelationshipsItem) {
+		if (this.observationLevelRelationships == null) {
+			this.observationLevelRelationships = new ArrayList<BrAPIObservationUnitLevelRelationship>();
 		}
-		this.germplasmDbIds.add(germplasmDbIdsItem);
+		this.observationLevelRelationships.add(observationLevelRelationshipsItem);
 		return this;
 	}
 
 	/**
-	 * List of IDs which uniquely identify germplasm to search for
-	 * 
-	 * @return germplasmDbIds
+	 * Searches for values in
+	 * ObservationUnit-&gt;observationUnitPosition-&gt;observationLevelRelationships
+	 *
+	 * @return observationLevelRelationships
 	 **/
-	
 
-	public List<String> getGermplasmDbIds() {
-		return germplasmDbIds;
+	public List<BrAPIObservationUnitLevelRelationship> getObservationLevelRelationships() {
+		return observationLevelRelationships;
 	}
 
-	public void setGermplasmDbIds(List<String> germplasmDbIds) {
-		this.germplasmDbIds = germplasmDbIds;
+	public void setObservationLevelRelationships(
+			List<BrAPIObservationUnitLevelRelationship> observationLevelRelationships) {
+		this.observationLevelRelationships = observationLevelRelationships;
 	}
 
-	public BrAPIObservationUnitSearchRequest germplasmNames(List<String> germplasmNames) {
-		this.germplasmNames = germplasmNames;
+	public BrAPIObservationUnitSearchRequest observationLevels(
+			List<BrAPIObservationUnitHierarchyLevel> observationLevels) {
+		this.observationLevels = observationLevels;
 		return this;
 	}
 
-	public BrAPIObservationUnitSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-		if (this.germplasmNames == null) {
-			this.germplasmNames = new ArrayList<String>();
+	public BrAPIObservationUnitSearchRequest addObservationLevelsItem(
+			BrAPIObservationUnitHierarchyLevel observationLevelsItem) {
+		if (this.observationLevels == null) {
+			this.observationLevels = new ArrayList<BrAPIObservationUnitHierarchyLevel>();
 		}
-		this.germplasmNames.add(germplasmNamesItem);
+		this.observationLevels.add(observationLevelsItem);
 		return this;
 	}
 
 	/**
-	 * List of human readable names to identify germplasm to search for
-	 * 
-	 * @return germplasmNames
-	 **/
-	
+	 * Searches for values in
+	 * ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel
+	 *
+	 * @return observationLevels
+	 **/
 
-	public List<String> getGermplasmNames() {
-		return germplasmNames;
+	public List<BrAPIObservationUnitHierarchyLevel> getObservationLevels() {
+		return observationLevels;
 	}
 
-	public void setGermplasmNames(List<String> germplasmNames) {
-		this.germplasmNames = germplasmNames;
+	public void setObservationLevels(List<BrAPIObservationUnitHierarchyLevel> observationLevels) {
+		this.observationLevels = observationLevels;
 	}
 
-	public BrAPIObservationUnitSearchRequest observationVariableDbIds(List<String> observationVariableDbIds) {
-		this.observationVariableDbIds = observationVariableDbIds;
+	public BrAPIObservationUnitSearchRequest observationUnitDbIds(List<String> observationUnitDbIds) {
+		this.observationUnitDbIds = observationUnitDbIds;
 		return this;
 	}
 
-	public BrAPIObservationUnitSearchRequest addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-		if (this.observationVariableDbIds == null) {
-			this.observationVariableDbIds = new ArrayList<String>();
+	public BrAPIObservationUnitSearchRequest addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
+		if (this.observationUnitDbIds == null) {
+			this.observationUnitDbIds = new ArrayList<String>();
 		}
-		this.observationVariableDbIds.add(observationVariableDbIdsItem);
+		this.observationUnitDbIds.add(observationUnitDbIdsItem);
 		return this;
 	}
 
 	/**
-	 * List of human readable names to identify observation unit to search for
+	 * The unique id of an observation unit
 	 *
-	 * @return observationUnitNames
+	 * @return observationUnitDbIds
 	 **/
 
+	public List<String> getObservationUnitDbIds() {
+		return observationUnitDbIds;
+	}
+
+	public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
+		this.observationUnitDbIds = observationUnitDbIds;
+	}
+
 	public BrAPIObservationUnitSearchRequest observationUnitNames(List<String> observationUnitNames) {
 		this.observationUnitNames = observationUnitNames;
 		return this;
@@ -429,6 +438,11 @@ public BrAPIObservationUnitSearchRequest addObservationUnitNamesItem(String obse
 		return this;
 	}
 
+	/**
+	 * The human readable identifier for an Observation Unit
+	 *
+	 * @return observationUnitNames
+	 **/
 
 	public List<String> getObservationUnitNames() {
 		return observationUnitNames;
@@ -438,12 +452,24 @@ public void setObservationUnitNames(List<String> observationUnitNames) {
 		this.observationUnitNames = observationUnitNames;
 	}
 
+	public BrAPIObservationUnitSearchRequest observationVariableDbIds(List<String> observationVariableDbIds) {
+		this.observationVariableDbIds = observationVariableDbIds;
+		return this;
+	}
+
+	public BrAPIObservationUnitSearchRequest addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
+		if (this.observationVariableDbIds == null) {
+			this.observationVariableDbIds = new ArrayList<String>();
+		}
+		this.observationVariableDbIds.add(observationVariableDbIdsItem);
+		return this;
+	}
+
 	/**
 	 * The DbIds of Variables to search for
-	 * 
+	 *
 	 * @return observationVariableDbIds
 	 **/
-	
 
 	public List<String> getObservationVariableDbIds() {
 		return observationVariableDbIds;
@@ -468,10 +494,9 @@ public BrAPIObservationUnitSearchRequest addObservationVariableNamesItem(String
 
 	/**
 	 * The names of Variables to search for
-	 * 
+	 *
 	 * @return observationVariableNames
 	 **/
-	
 
 	public List<String> getObservationVariableNames() {
 		return observationVariableNames;
@@ -481,176 +506,231 @@ public void setObservationVariableNames(List<String> observationVariableNames) {
 		this.observationVariableNames = observationVariableNames;
 	}
 
-	public BrAPIObservationUnitSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-		this.externalReferenceIDs = externalReferenceIDs;
+	public BrAPIObservationUnitSearchRequest observationVariablePUIs(List<String> observationVariablePUIs) {
+		this.observationVariablePUIs = observationVariablePUIs;
 		return this;
 	}
 
-	public BrAPIObservationUnitSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-		if (this.externalReferenceIDs == null) {
-			this.externalReferenceIDs = new ArrayList<String>();
+	public BrAPIObservationUnitSearchRequest addObservationVariablePUIsItem(String observationVariablePUIsItem) {
+		if (this.observationVariablePUIs == null) {
+			this.observationVariablePUIs = new ArrayList<String>();
 		}
-		this.externalReferenceIDs.add(externalReferenceIDsItem);
+		this.observationVariablePUIs.add(observationVariablePUIsItem);
 		return this;
 	}
 
 	/**
-	 * List of external references for the trait to search for
-	 * 
-	 * @return externalReferenceIDs
+	 * The Permanent Unique Identifier of an Observation Variable, usually in the
+	 * form of a URI
+	 *
+	 * @return observationVariablePUIs
 	 **/
-	
 
-	public List<String> getExternalReferenceIDs() {
-		return externalReferenceIDs;
+	public List<String> getObservationVariablePUIs() {
+		return observationVariablePUIs;
 	}
 
-	public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-		this.externalReferenceIDs = externalReferenceIDs;
+	public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
+		this.observationVariablePUIs = observationVariablePUIs;
 	}
 
-	public BrAPIObservationUnitSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-		this.externalReferenceSources = externalReferenceSources;
+	public BrAPIObservationUnitSearchRequest programDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
 		return this;
 	}
 
-	public BrAPIObservationUnitSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-		if (this.externalReferenceSources == null) {
-			this.externalReferenceSources = new ArrayList<String>();
+	public BrAPIObservationUnitSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
+		if (this.programDbIds == null) {
+			this.programDbIds = new ArrayList<String>();
 		}
-		this.externalReferenceSources.add(externalReferenceSourcesItem);
+		this.programDbIds.add(programDbIdsItem);
 		return this;
 	}
 
 	/**
-	 * List of external references sources for the trait to search for
-	 * 
-	 * @return externalReferenceSources
+	 * A BrAPI Program represents the high level organization or group who is
+	 * responsible for conducting trials and studies. Things like Breeding Programs
+	 * and Funded Projects are considered BrAPI Programs. Use this parameter to only
+	 * return results associated with the given programs. Use &#x60;GET
+	 * /programs&#x60; to find the list of available programs on a server.
+	 *
+	 * @return programDbIds
 	 **/
-	
 
-	public List<String> getExternalReferenceSources() {
-		return externalReferenceSources;
+	public List<String> getProgramDbIds() {
+		return programDbIds;
 	}
 
-	public void setExternalReferenceSources(List<String> externalReferenceSources) {
-		this.externalReferenceSources = externalReferenceSources;
+	public void setProgramDbIds(List<String> programDbIds) {
+		this.programDbIds = programDbIds;
 	}
 
-	public BrAPIObservationUnitSearchRequest includeObservations(Boolean includeObservations) {
-		this.includeObservations = includeObservations;
+	public BrAPIObservationUnitSearchRequest programNames(List<String> programNames) {
+		this.programNames = programNames;
+		return this;
+	}
+
+	public BrAPIObservationUnitSearchRequest addProgramNamesItem(String programNamesItem) {
+		if (this.programNames == null) {
+			this.programNames = new ArrayList<String>();
+		}
+		this.programNames.add(programNamesItem);
 		return this;
 	}
 
 	/**
-	 * Use this parameter to include a list of observations embedded in each
-	 * ObservationUnit object. CAUTION - Use this parameter at your own risk. It may
-	 * return large, unpaginated lists of observation data. Only set this value to
-	 * True if you are sure you need to.
-	 * 
-	 * @return includeObservations
+	 * Use this parameter to only return results associated with the given program
+	 * names. Program names are not required to be unique. Use &#x60;GET
+	 * /programs&#x60; to find the list of available programs on a server.
+	 *
+	 * @return programNames
 	 **/
-	
 
-	public Boolean isIncludeObservations() {
-		return includeObservations;
+	public List<String> getProgramNames() {
+		return programNames;
 	}
 
-	public void setIncludeObservations(Boolean includeObservations) {
-		this.includeObservations = includeObservations;
+	public void setProgramNames(List<String> programNames) {
+		this.programNames = programNames;
 	}
 
-	public BrAPIObservationUnitSearchRequest observationLevelRelationships(
-			List<BrAPIObservationUnitLevelRelationship> observationLevelRelationships) {
-		this.observationLevelRelationships = observationLevelRelationships;
+	public BrAPIObservationUnitSearchRequest seasonDbIds(List<String> seasonDbIds) {
+		this.seasonDbIds = seasonDbIds;
 		return this;
 	}
 
-	public BrAPIObservationUnitSearchRequest addObservationLevelRelationshipsItem(
-			BrAPIObservationUnitLevelRelationship observationLevelRelationshipsItem) {
-		if (this.observationLevelRelationships == null) {
-			this.observationLevelRelationships = new ArrayList<BrAPIObservationUnitLevelRelationship>();
+	public BrAPIObservationUnitSearchRequest addSeasonDbIdsItem(String seasonDbIdsItem) {
+		if (this.seasonDbIds == null) {
+			this.seasonDbIds = new ArrayList<String>();
 		}
-		this.observationLevelRelationships.add(observationLevelRelationshipsItem);
+		this.seasonDbIds.add(seasonDbIdsItem);
 		return this;
 	}
 
 	/**
-	 * Searches for values in
-	 * ObservationUnit->observationUnitPosition->observationLevelRelationships
-	 * 
-	 * @return observationLevelRelationships
+	 * The year or Phenotyping campaign of a multi-annual study (trees, grape, ...)
+	 *
+	 * @return seasonDbIds
 	 **/
-	
-	@Valid
-	public List<BrAPIObservationUnitLevelRelationship> getObservationLevelRelationships() {
-		return observationLevelRelationships;
+
+	public List<String> getSeasonDbIds() {
+		return seasonDbIds;
 	}
 
-	public void setObservationLevelRelationships(List<BrAPIObservationUnitLevelRelationship> observationLevelRelationships) {
-		this.observationLevelRelationships = observationLevelRelationships;
+	public void setSeasonDbIds(List<String> seasonDbIds) {
+		this.seasonDbIds = seasonDbIds;
 	}
 
-	public BrAPIObservationUnitSearchRequest observationLevels(List<BrAPIObservationUnitLevelRelationship> observationLevels) {
-		this.observationLevels = observationLevels;
+	public BrAPIObservationUnitSearchRequest studyDbIds(List<String> studyDbIds) {
+		this.studyDbIds = studyDbIds;
 		return this;
 	}
 
-	public BrAPIObservationUnitSearchRequest addObservationLevelsItem(
-			BrAPIObservationUnitLevelRelationship observationLevelsItem) {
-		if (this.observationLevels == null) {
-			this.observationLevels = new ArrayList<BrAPIObservationUnitLevelRelationship>();
+	public BrAPIObservationUnitSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
+		if (this.studyDbIds == null) {
+			this.studyDbIds = new ArrayList<String>();
 		}
-		this.observationLevels.add(observationLevelsItem);
+		this.studyDbIds.add(studyDbIdsItem);
 		return this;
 	}
 
 	/**
-	 * Searches for values in
-	 * ObservationUnit->observationUnitPosition->observationLevel
-	 * 
-	 * @return observationLevels
+	 * List of study identifiers to search for
+	 *
+	 * @return studyDbIds
 	 **/
-	
-	@Valid
-	public List<BrAPIObservationUnitLevelRelationship> getObservationLevels() {
-		return observationLevels;
+
+	public List<String> getStudyDbIds() {
+		return studyDbIds;
 	}
 
-	public void setObservationLevels(List<BrAPIObservationUnitLevelRelationship> observationLevels) {
-		this.observationLevels = observationLevels;
+	public void setStudyDbIds(List<String> studyDbIds) {
+		this.studyDbIds = studyDbIds;
 	}
 
-	public BrAPIObservationUnitSearchRequest observationUnitDbIds(List<String> observationUnitDbIds) {
-		this.observationUnitDbIds = observationUnitDbIds;
+	public BrAPIObservationUnitSearchRequest studyNames(List<String> studyNames) {
+		this.studyNames = studyNames;
 		return this;
 	}
 
-	public BrAPIObservationUnitSearchRequest addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-		if (this.observationUnitDbIds == null) {
-			this.observationUnitDbIds = new ArrayList<String>();
+	public BrAPIObservationUnitSearchRequest addStudyNamesItem(String studyNamesItem) {
+		if (this.studyNames == null) {
+			this.studyNames = new ArrayList<String>();
 		}
-		this.observationUnitDbIds.add(observationUnitDbIdsItem);
+		this.studyNames.add(studyNamesItem);
 		return this;
 	}
 
 	/**
-	 * The unique id of an observation unit
-	 * 
-	 * @return observationUnitDbIds
+	 * List of study names to filter search results
+	 *
+	 * @return studyNames
 	 **/
-	
 
-	public List<String> getObservationUnitDbIds() {
-		return observationUnitDbIds;
+	public List<String> getStudyNames() {
+		return studyNames;
 	}
 
-	public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-		this.observationUnitDbIds = observationUnitDbIds;
+	public void setStudyNames(List<String> studyNames) {
+		this.studyNames = studyNames;
+	}
+
+	public BrAPIObservationUnitSearchRequest trialDbIds(List<String> trialDbIds) {
+		this.trialDbIds = trialDbIds;
+		return this;
+	}
+
+	public BrAPIObservationUnitSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
+		if (this.trialDbIds == null) {
+			this.trialDbIds = new ArrayList<String>();
+		}
+		this.trialDbIds.add(trialDbIdsItem);
+		return this;
+	}
+
+	/**
+	 * The ID which uniquely identifies a trial to search for
+	 *
+	 * @return trialDbIds
+	 **/
+
+	public List<String> getTrialDbIds() {
+		return trialDbIds;
+	}
+
+	public void setTrialDbIds(List<String> trialDbIds) {
+		this.trialDbIds = trialDbIds;
+	}
+
+	public BrAPIObservationUnitSearchRequest trialNames(List<String> trialNames) {
+		this.trialNames = trialNames;
+		return this;
+	}
+
+	public BrAPIObservationUnitSearchRequest addTrialNamesItem(String trialNamesItem) {
+		if (this.trialNames == null) {
+			this.trialNames = new ArrayList<String>();
+		}
+		this.trialNames.add(trialNamesItem);
+		return this;
+	}
+
+	/**
+	 * The human readable name of a trial to search for
+	 *
+	 * @return trialNames
+	 **/
+
+	public List<String> getTrialNames() {
+		return trialNames;
+	}
+
+	public void setTrialNames(List<String> trialNames) {
+		this.trialNames = trialNames;
 	}
 
 	@Override
-	public boolean equals(java.lang.Object o) {
+	public boolean equals(Object o) {
 		if (this == o) {
 			return true;
 		}
@@ -658,62 +738,70 @@ public boolean equals(java.lang.Object o) {
 			return false;
 		}
 		BrAPIObservationUnitSearchRequest observationUnitSearchRequest = (BrAPIObservationUnitSearchRequest) o;
-		return Objects.equals(this.programDbIds, observationUnitSearchRequest.programDbIds)
-				&& Objects.equals(this.programNames, observationUnitSearchRequest.programNames)
-				&& Objects.equals(this.trialDbIds, observationUnitSearchRequest.trialDbIds)
-				&& Objects.equals(this.trialNames, observationUnitSearchRequest.trialNames)
-				&& Objects.equals(this.studyDbIds, observationUnitSearchRequest.studyDbIds)
-				&& Objects.equals(this.studyNames, observationUnitSearchRequest.studyNames)
-				&& Objects.equals(this.locationDbIds, observationUnitSearchRequest.locationDbIds)
-				&& Objects.equals(this.locationNames, observationUnitSearchRequest.locationNames)
-				&& Objects.equals(this.germplasmDbIds, observationUnitSearchRequest.germplasmDbIds)
-				&& Objects.equals(this.germplasmNames, observationUnitSearchRequest.germplasmNames)
-				&& Objects.equals(this.observationUnitNames, observationUnitSearchRequest.observationUnitNames)
-				&& Objects.equals(this.observationVariableDbIds, observationUnitSearchRequest.observationVariableDbIds)
-				&& Objects.equals(this.observationVariableNames, observationUnitSearchRequest.observationVariableNames)
+		return Objects.equals(this.commonCropNames, observationUnitSearchRequest.commonCropNames)
 				&& Objects.equals(this.externalReferenceIDs, observationUnitSearchRequest.externalReferenceIDs)
+				&& Objects.equals(this.externalReferenceIds, observationUnitSearchRequest.externalReferenceIds)
 				&& Objects.equals(this.externalReferenceSources, observationUnitSearchRequest.externalReferenceSources)
+				&& Objects.equals(this.germplasmDbIds, observationUnitSearchRequest.germplasmDbIds)
+				&& Objects.equals(this.germplasmNames, observationUnitSearchRequest.germplasmNames)
 				&& Objects.equals(this.includeObservations, observationUnitSearchRequest.includeObservations)
+				&& Objects.equals(this.locationDbIds, observationUnitSearchRequest.locationDbIds)
+				&& Objects.equals(this.locationNames, observationUnitSearchRequest.locationNames)
 				&& Objects.equals(this.observationLevelRelationships,
 						observationUnitSearchRequest.observationLevelRelationships)
 				&& Objects.equals(this.observationLevels, observationUnitSearchRequest.observationLevels)
 				&& Objects.equals(this.observationUnitDbIds, observationUnitSearchRequest.observationUnitDbIds)
-				&& super.equals(o);
+				&& Objects.equals(this.observationUnitNames, observationUnitSearchRequest.observationUnitNames)
+				&& Objects.equals(this.observationVariableDbIds, observationUnitSearchRequest.observationVariableDbIds)
+				&& Objects.equals(this.observationVariableNames, observationUnitSearchRequest.observationVariableNames)
+				&& Objects.equals(this.observationVariablePUIs, observationUnitSearchRequest.observationVariablePUIs)
+				&& Objects.equals(this.programDbIds, observationUnitSearchRequest.programDbIds)
+				&& Objects.equals(this.programNames, observationUnitSearchRequest.programNames)
+				&& Objects.equals(this.seasonDbIds, observationUnitSearchRequest.seasonDbIds)
+				&& Objects.equals(this.studyDbIds, observationUnitSearchRequest.studyDbIds)
+				&& Objects.equals(this.studyNames, observationUnitSearchRequest.studyNames)
+				&& Objects.equals(this.trialDbIds, observationUnitSearchRequest.trialDbIds)
+				&& Objects.equals(this.trialNames, observationUnitSearchRequest.trialNames);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(programDbIds, programNames, trialDbIds, trialNames, studyDbIds, studyNames, locationDbIds,
-				locationNames, germplasmDbIds, germplasmNames, observationVariableDbIds, observationVariableNames,
-				externalReferenceIDs, externalReferenceSources, includeObservations, observationLevelRelationships,
-				observationLevels, observationUnitDbIds, super.hashCode());
+		return Objects.hash(commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources,
+				germplasmDbIds, germplasmNames, includeObservations, locationDbIds, locationNames,
+				observationLevelRelationships, observationLevels, observationUnitDbIds, observationUnitNames,
+				observationVariableDbIds, observationVariableNames, observationVariablePUIs, programDbIds, programNames,
+				seasonDbIds, studyDbIds, studyNames, trialDbIds, trialNames);
 	}
 
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
-		sb.append("class ObservationUnitSearchRequest {\n");
-		sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-		sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-		sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-		sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-		sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-		sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-		sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-		sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-		sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-		sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-		sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-		sb.append("    observationUnitNames: ").append(toIndentedString(observationUnitNames)).append("\n");
-		sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-		sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
+		sb.append("class BrAPIObservationUnitSearchRequest {\n");
+
+		sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
 		sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
+		sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
 		sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
+		sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
+		sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
 		sb.append("    includeObservations: ").append(toIndentedString(includeObservations)).append("\n");
+		sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
+		sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
 		sb.append("    observationLevelRelationships: ").append(toIndentedString(observationLevelRelationships))
 				.append("\n");
 		sb.append("    observationLevels: ").append(toIndentedString(observationLevels)).append("\n");
 		sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
+		sb.append("    observationUnitNames: ").append(toIndentedString(observationUnitNames)).append("\n");
+		sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
+		sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
+		sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
+		sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
+		sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
+		sb.append("    seasonDbIds: ").append(toIndentedString(seasonDbIds)).append("\n");
+		sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
+		sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
+		sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
+		sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
 		sb.append("}");
 		return sb.toString();
 	}
@@ -722,10 +810,11 @@ public String toString() {
 	 * Convert the given object to string with each line indented by 4 spaces
 	 * (except the first line).
 	 */
-	private String toIndentedString(java.lang.Object o) {
+	private String toIndentedString(Object o) {
 		if (o == null) {
 			return "null";
 		}
 		return o.toString().replace("\n", "\n    ");
 	}
+
 }

From 9ba33780278eb83858c37d9ab3a70fced813148b Mon Sep 17 00:00:00 2001
From: timparsons <tep46@cornell.edu>
Date: Tue, 10 Oct 2023 14:19:54 -0400
Subject: [PATCH 22/28] Combining models to preserve backwards compatibility
 with 2.0

---
 brapi-java-client/pom.xml                     |   7 +
 .../queryParams/core/ListQueryParams.java     |   5 +
 .../queryParams/core/LocationQueryParams.java |   5 +
 .../queryParams/core/PeopleQueryParams.java   |   5 +
 .../queryParams/core/ProgramQueryParams.java  |   5 +
 .../queryParams/core/StudyQueryParams.java    |   5 +
 .../queryParams/core/TrialQueryParams.java    |   6 +
 .../germplasm/CrossQueryParams.java           |   5 +
 .../germplasm/CrossingProjectQueryParams.java |   5 +
 .../GermplasmAttributeQueryParams.java        |   5 +
 .../GermplasmAttributeValueQueryParams.java   |   5 +
 .../germplasm/GermplasmQueryParams.java       |   5 +
 .../germplasm/PlannedCrossQueryParams.java    |   5 +
 .../germplasm/SeedLotQueryParams.java         |   5 +
 .../SeedLotTransactionQueryParams.java        |   5 +
 .../phenotype/ImageQueryParams.java           |   5 +
 .../phenotype/MethodQueryParams.java          |   5 +
 .../phenotype/ObservationQueryParams.java     |   5 +
 .../ObservationTableQueryParams.java          |   5 +
 .../phenotype/ObservationUnitQueryParams.java |   5 +
 .../phenotype/ScaleQueryParams.java           |   5 +
 .../phenotype/TraitQueryParams.java           |   5 +
 .../phenotype/VariableQueryParams.java        |   5 +
 .../org/brapi/client/v2/BrAPIClientTest.java  |   5 +-
 .../v2/modules/phenotype/ImagesApiTest.java   |   3 +
 .../v2/modules/phenotype/MethodsAPITests.java |   2 +-
 .../v2/modules/phenotype/ScalesAPITests.java  |   2 +-
 .../modules/phenotype/VariablesAPITests.java  |   2 +-
 .../src/test/resources/logback.xml            |  34 ++
 .../v2/model/germ/BrAPIPedigreeNode.java      |  47 ++-
 .../model/germ/BrAPIPedigreeNodeParents.java  | 111 +++++++
 .../model/germ/BrAPIPedigreeNodeSiblings.java |  59 ++++
 .../germ/BrAPIPedigreeNode_Deprecated.java    | 292 ------------------
 .../BrAPIGermplasmPedigreeResponse.java       |  12 +-
 34 files changed, 372 insertions(+), 315 deletions(-)
 create mode 100644 brapi-java-client/src/test/resources/logback.xml
 create mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeParents.java
 create mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeSiblings.java
 delete mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode_Deprecated.java

diff --git a/brapi-java-client/pom.xml b/brapi-java-client/pom.xml
index f90b0b05..4f956fbb 100644
--- a/brapi-java-client/pom.xml
+++ b/brapi-java-client/pom.xml
@@ -33,6 +33,7 @@
         <okhttp.version>4.1.0</okhttp.version>
         <gson.version>2.8.5</gson.version>
         <testcontainers.version>1.16.3</testcontainers.version>
+        <logback.version>1.2.10</logback.version>
     </properties>
 
     <dependencies>
@@ -86,6 +87,12 @@
             <version>4.13</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ListQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ListQueryParams.java
index cf6b9a5a..611b70c8 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ListQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ListQueryParams.java
@@ -67,4 +67,9 @@ public String externalReferenceID() {
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
+	@Deprecated
+	public ListQueryParams externalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+		return this;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/LocationQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/LocationQueryParams.java
index 39a8c98a..3ba38687 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/LocationQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/LocationQueryParams.java
@@ -71,4 +71,9 @@ public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
 
+	@Deprecated
+	public LocationQueryParams externalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+		return this;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/PeopleQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/PeopleQueryParams.java
index 0acb2b8f..75f83e52 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/PeopleQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/PeopleQueryParams.java
@@ -69,4 +69,9 @@ public String externalReferenceID() {
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
+	@Deprecated
+	public PeopleQueryParams externalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+		return this;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ProgramQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ProgramQueryParams.java
index 004915ef..9e3f144c 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ProgramQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ProgramQueryParams.java
@@ -63,4 +63,9 @@ public String externalReferenceID() {
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
+	@Deprecated
+	public ProgramQueryParams externalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+		return this;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/StudyQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/StudyQueryParams.java
index be654f4a..994e15b4 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/StudyQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/StudyQueryParams.java
@@ -74,4 +74,9 @@ public String externalReferenceID() {
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
+    @Deprecated
+    public StudyQueryParams externalReferenceID(String externalReferenceID) {
+        this.externalReferenceID = externalReferenceID;
+        return this;
+    }
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/TrialQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/TrialQueryParams.java
index 745d9896..f3c1ba73 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/TrialQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/TrialQueryParams.java
@@ -72,4 +72,10 @@ public String externalReferenceID() {
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
+
+    @Deprecated
+    public TrialQueryParams externalReferenceID(String externalReferenceID) {
+        this.externalReferenceID = externalReferenceID;
+        return this;
+    }
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossQueryParams.java
index 6fd2f91f..9de88cb1 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossQueryParams.java
@@ -71,4 +71,9 @@ public String externalReferenceID() {
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
+	@Deprecated
+	public CrossQueryParams externalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+		return this;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossingProjectQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossingProjectQueryParams.java
index b82ad8e3..a1f1eb4f 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossingProjectQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossingProjectQueryParams.java
@@ -70,4 +70,9 @@ public String externalReferenceID() {
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
+	@Deprecated
+	public CrossingProjectQueryParams externalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+		return this;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeQueryParams.java
index b9985891..1ff04ee2 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeQueryParams.java
@@ -81,4 +81,9 @@ public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
 
+    @Deprecated
+    public GermplasmAttributeQueryParams externalReferenceID(String externalReferenceID) {
+        this.externalReferenceID = externalReferenceID;
+        return this;
+    }
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java
index 57e57f7f..bce36da5 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java
@@ -72,4 +72,9 @@ public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
 
+	@Deprecated
+	public GermplasmAttributeValueQueryParams externalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+		return this;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmQueryParams.java
index 205b0e02..32ba83c4 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmQueryParams.java
@@ -81,4 +81,9 @@ public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
 
+	@Deprecated
+	public GermplasmQueryParams externalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+		return this;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/PlannedCrossQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/PlannedCrossQueryParams.java
index 6f690b6a..5cc7a767 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/PlannedCrossQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/PlannedCrossQueryParams.java
@@ -72,4 +72,9 @@ public String externalReferenceID() {
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
+	@Deprecated
+	public PlannedCrossQueryParams externalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+		return this;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotQueryParams.java
index 05e16a19..03225e98 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotQueryParams.java
@@ -73,4 +73,9 @@ public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
 
+	@Deprecated
+	public SeedLotQueryParams externalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+		return this;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotTransactionQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotTransactionQueryParams.java
index 4dd4647e..d7cb8df6 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotTransactionQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotTransactionQueryParams.java
@@ -74,4 +74,9 @@ public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
 
+	@Deprecated
+	public SeedLotTransactionQueryParams externalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+		return this;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ImageQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ImageQueryParams.java
index d7214d17..70e2f85e 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ImageQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ImageQueryParams.java
@@ -69,4 +69,9 @@ public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
 
+	@Deprecated
+	public ImageQueryParams externalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+		return this;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/MethodQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/MethodQueryParams.java
index fc2f50b8..3d450f89 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/MethodQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/MethodQueryParams.java
@@ -71,4 +71,9 @@ public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
 
+	@Deprecated
+	public MethodQueryParams externalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+		return this;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationQueryParams.java
index 7c153996..9bd7fbab 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationQueryParams.java
@@ -82,4 +82,9 @@ public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
 
+    @Deprecated
+    public ObservationQueryParams externalReferenceID(String externalReferenceID) {
+        this.externalReferenceID = externalReferenceID;
+        return this;
+    }
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationTableQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationTableQueryParams.java
index f7c01b94..789d501f 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationTableQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationTableQueryParams.java
@@ -84,4 +84,9 @@ public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
 
+    @Deprecated
+    public ObservationTableQueryParams externalReferenceID(String externalReferenceID) {
+        this.externalReferenceID = externalReferenceID;
+        return this;
+    }
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationUnitQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationUnitQueryParams.java
index 58a3e4a5..194c1289 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationUnitQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ObservationUnitQueryParams.java
@@ -79,5 +79,10 @@ public String externalReferenceID() {
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
+    @Deprecated
+    public ObservationUnitQueryParams externalReferenceID(String externalReferenceID) {
+        this.externalReferenceID = externalReferenceID;
+        return this;
+    }
 
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ScaleQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ScaleQueryParams.java
index d3bc2eb8..70153cd1 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ScaleQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/ScaleQueryParams.java
@@ -71,4 +71,9 @@ public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
 
+	@Deprecated
+	public ScaleQueryParams externalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+		return this;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/TraitQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/TraitQueryParams.java
index 7488546b..3bc154ba 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/TraitQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/TraitQueryParams.java
@@ -71,4 +71,9 @@ public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
 
+	@Deprecated
+	public TraitQueryParams externalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+		return this;
+	}
 }
diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/VariableQueryParams.java b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/VariableQueryParams.java
index f85cf0d5..0ba80db1 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/VariableQueryParams.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/model/queryParams/phenotype/VariableQueryParams.java
@@ -84,4 +84,9 @@ public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;
 	}
 
+	@Deprecated
+	public VariableQueryParams externalReferenceID(String externalReferenceID) {
+		this.externalReferenceID = externalReferenceID;
+		return this;
+	}
 }
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/BrAPIClientTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/BrAPIClientTest.java
index 70d152d8..7f65f7c7 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/BrAPIClientTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/BrAPIClientTest.java
@@ -56,10 +56,9 @@ public BrAPIClientTest() {
                 .withEnv("POSTGRES_PASSWORD", dbPassword)
                 .waitingFor(Wait.forLogMessage(".*LOG:  database system is ready to accept connections.*", 1).withStartupTimeout(Duration.of(2, ChronoUnit.MINUTES)));
 
-//        brapiContainer = new GenericContainer<>("breedinginsight/brapi-java-server:develop")
         brapiContainer = new GenericContainer<>("brapicoordinatorselby/brapi-java-server:v2")
                 .withNetwork(network)
-                .withImagePullPolicy(PullPolicy.alwaysPull())
+                .withImagePullPolicy(PullPolicy.ageBased(Duration.ofMinutes(10)))
                 .withExposedPorts(8080)
                 .withEnv("BRAPI_DB_SERVER",
                         String.format("%s:%s",
@@ -70,7 +69,7 @@ public BrAPIClientTest() {
                 .withEnv("BRAPI_DB_PASSWORD", "postgres")
                 .withClasspathResourceMapping("brapi/properties/application.properties", "/home/brapi/properties/application.properties", BindMode.READ_ONLY)
                 .withClasspathResourceMapping("sql/", "/home/brapi/sql/", BindMode.READ_ONLY)
-                .waitingFor(Wait.forLogMessage(".*: Started BrapiTestServer in \\d*.\\d* seconds.*", 1).withStartupTimeout(Duration.ofMinutes(1)));
+                .waitingFor(Wait.forLogMessage(".*Started BrapiTestServer in \\d*.\\d* seconds.*", 1).withStartupTimeout(Duration.ofMinutes(1)));
 
         dbContainer.start();
         brapiContainer.start();
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ImagesApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ImagesApiTest.java
index a4378d8e..d5cf2ad7 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ImagesApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ImagesApiTest.java
@@ -19,6 +19,7 @@
 import org.brapi.client.v2.model.queryParams.phenotype.ImageQueryParams;
 import org.brapi.v2.model.BrAPIAcceptedSearchResponse;
 import org.brapi.v2.model.pheno.BrAPIImage;
+import org.brapi.v2.model.pheno.response.BrAPIImageDeleteResponse;
 import org.brapi.v2.model.pheno.response.BrAPIImageListResponse;
 import org.brapi.v2.model.pheno.request.BrAPIImageSearchRequest;
 import org.brapi.v2.model.pheno.response.BrAPIImageSingleResponse;
@@ -29,6 +30,8 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/MethodsAPITests.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/MethodsAPITests.java
index 11e07878..9d74b27a 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/MethodsAPITests.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/MethodsAPITests.java
@@ -92,7 +92,7 @@ public void createMethodMultipleNull() {
 	@Order(1)
 	@SneakyThrows
 	public void createMethodSuccess() {
-		BrAPIExternalReference brApiExternalReference = new BrAPIExternalReference().referenceID(externalReferenceID)
+		BrAPIExternalReference brApiExternalReference = new BrAPIExternalReference().referenceID(externalReferenceID).referenceId(externalReferenceID)
 				.referenceSource(externalReferenceSource);
 		List<BrAPIExternalReference> externalReferences = new ArrayList<>();
 		externalReferences.add(brApiExternalReference);
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ScalesAPITests.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ScalesAPITests.java
index f470773a..06885e49 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ScalesAPITests.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/ScalesAPITests.java
@@ -97,7 +97,7 @@ public void scalesPostMultipleNull() {
 	@Test
 	@Order(1)
 	public void scalesPostSuccess() throws Exception {
-		BrAPIExternalReference brApiExternalReference = new BrAPIExternalReference().referenceID(externalReferenceID)
+		BrAPIExternalReference brApiExternalReference = new BrAPIExternalReference().referenceID(externalReferenceID).referenceId(externalReferenceID)
 				.referenceSource(externalReferenceSource);
 
 		List<BrAPIExternalReference> externalReferences = new ArrayList<>();
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/VariablesAPITests.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/VariablesAPITests.java
index 22b52201..8ae1a3d9 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/VariablesAPITests.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/phenotype/VariablesAPITests.java
@@ -117,7 +117,7 @@ public void createVariableSuccess() throws Exception {
 
 	private BrAPIObservationVariable buildTestVariable() {
 
-		BrAPIExternalReference brApiExternalReference = new BrAPIExternalReference().referenceID(externalReferenceID)
+		BrAPIExternalReference brApiExternalReference = new BrAPIExternalReference().referenceID(externalReferenceID).referenceId(externalReferenceID)
 				.referenceSource(externalReferenceSource);
 
 		List<BrAPIExternalReference> externalReferences = new ArrayList<>();
diff --git a/brapi-java-client/src/test/resources/logback.xml b/brapi-java-client/src/test/resources/logback.xml
new file mode 100644
index 00000000..753e507d
--- /dev/null
+++ b/brapi-java-client/src/test/resources/logback.xml
@@ -0,0 +1,34 @@
+<!--
+  ~ See the NOTICE file distributed with this work for additional information
+  ~ regarding copyright ownership.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <withJansi>true</withJansi>
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%cyan(%d{yyyy-MM-dd HH:mm:ss.SSSZ}) %gray([%thread]) %highlight(%-5level) %magenta(%logger{36}) - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.brapi" level="DEBUG"/>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode.java
index 25c73231..e6eb46a9 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode.java
@@ -66,6 +66,10 @@ public class BrAPIPedigreeNode {
     @JsonProperty("pedigreeString")
     private String pedigreeString = null;
 
+    @JsonProperty("pedigree")
+    @Deprecated
+    private String pedigree = null;
+
     @JsonProperty("progeny")
     private List<BrAPIPedigreeNodeRelative> progeny = null;
 
@@ -278,8 +282,8 @@ public void setGermplasmPUI(String germplasmPUI) {
         this.germplasmPUI = germplasmPUI;
     }
 
-    public BrAPIPedigreeNode parents(List<BrAPIPedigreeNodeRelative> parents) {
-        this.parents = parents;
+    public BrAPIPedigreeNode parents(List<? extends BrAPIPedigreeNodeRelative> parents) {
+        this.parents = new ArrayList<>(parents);
         return this;
     }
 
@@ -296,12 +300,12 @@ public BrAPIPedigreeNode addParentsItem(BrAPIPedigreeNodeRelative parentsItem) {
      *
      * @return parents
      **/
-    public List<BrAPIPedigreeNodeRelative> getParents() {
+    public List<? extends BrAPIPedigreeNodeRelative> getParents() {
         return parents;
     }
 
-    public void setParents(List<BrAPIPedigreeNodeRelative> parents) {
-        this.parents = parents;
+    public void setParents(List<? extends BrAPIPedigreeNodeRelative> parents) {
+        this.parents = new ArrayList<>(parents);
     }
 
     public BrAPIPedigreeNode pedigreeString(String pedigreeString) {
@@ -322,6 +326,28 @@ public void setPedigreeString(String pedigreeString) {
         this.pedigreeString = pedigreeString;
     }
 
+    @Deprecated
+    public BrAPIPedigreeNode pedigree(String pedigree) {
+        this.pedigree = pedigree;
+        return this;
+    }
+
+    /**
+     * The string representation of the pedigree.
+     *
+     * @return pedigree
+     **/
+
+    @Deprecated
+    public String getPedigree() {
+        return pedigree;
+    }
+
+    @Deprecated
+    public void setPedigree(String pedigree) {
+        this.pedigree = pedigree;
+    }
+
     public BrAPIPedigreeNode progeny(List<BrAPIPedigreeNodeRelative> progeny) {
         this.progeny = progeny;
         return this;
@@ -348,8 +374,8 @@ public void setProgeny(List<BrAPIPedigreeNodeRelative> progeny) {
         this.progeny = progeny;
     }
 
-    public BrAPIPedigreeNode siblings(List<BrAPIPedigreeNodeSibling> siblings) {
-        this.siblings = siblings;
+    public BrAPIPedigreeNode siblings(List<? extends BrAPIPedigreeNodeSibling> siblings) {
+        this.siblings = new ArrayList<>(siblings);
         return this;
     }
 
@@ -366,15 +392,14 @@ public BrAPIPedigreeNode addSiblingsItem(BrAPIPedigreeNodeSibling siblingsItem)
      *
      * @return siblings
      **/
-    public List<BrAPIPedigreeNodeSibling> getSiblings() {
+    public List<? extends BrAPIPedigreeNodeSibling> getSiblings() {
         return siblings;
     }
 
-    public void setSiblings(List<BrAPIPedigreeNodeSibling> siblings) {
-        this.siblings = siblings;
+    public void setSiblings(List<? extends BrAPIPedigreeNodeSibling> siblings) {
+        this.siblings = new ArrayList<>(siblings);
     }
 
-
     @Override
     public boolean equals(Object o) {
         if (this == o) {
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeParents.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeParents.java
new file mode 100644
index 00000000..791642c7
--- /dev/null
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeParents.java
@@ -0,0 +1,111 @@
+package org.brapi.v2.model.germ;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+/**
+ * PedigreeNodeParents
+ */
+
+
+@Deprecated
+public class BrAPIPedigreeNodeParents extends BrAPIPedigreeNodeRelative {
+
+  public BrAPIPedigreeNodeParents germplasmDbId(String germplasmDbId) {
+    super.setGermplasmDbId(germplasmDbId);
+    return this;
+  }
+
+  /**
+   * The germplasm DbId of the parent of this germplasm
+   * @return germplasmDbId
+  **/
+  
+  @Deprecated
+  public String getGermplasmDbId() {
+  return super.getGermplasmDbId();
+  }
+
+  @Deprecated
+  public void setGermplasmDbId(String germplasmDbId) {
+    super.setGermplasmDbId(germplasmDbId);
+  }
+
+  @Deprecated
+  public BrAPIPedigreeNodeParents germplasmName(String germplasmName) {
+    super.setGermplasmName(germplasmName);
+    return this;
+  }
+
+  /**
+   * the human readable name of the parent of this germplasm
+   * @return germplasmName
+  **/
+
+  @Deprecated
+  public String getGermplasmName() {
+    return super.getGermplasmName();
+  }
+
+  @Deprecated
+  public void setGermplasmName(String germplasmName) {
+    super.setGermplasmName(germplasmName);
+  }
+
+  @Deprecated
+  public BrAPIPedigreeNodeParents parentType(BrAPIParentType parentType) {
+    super.setParentType(parentType);
+    return this;
+  }
+
+  /**
+   * The type of parent the parent is. ex. 'MALE', 'FEMALE', 'SELF', 'POPULATION', etc.
+   * @return parentType
+  **/
+
+  @Deprecated
+  public BrAPIParentType getParentType() {
+    return super.getParentType();
+  }
+
+  @Deprecated
+  public void setParentType(BrAPIParentType parentType) {
+    super.setParentType(parentType);
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return super.hashCode();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class PedigreeNodeParents {\n");
+    
+    sb.append("    germplasmDbId: ").append(toIndentedString(super.getGermplasmDbId())).append("\n");
+    sb.append("    germplasmName: ").append(toIndentedString(super.getGermplasmName())).append("\n");
+    sb.append("    parentType: ").append(toIndentedString(super.getParentType())).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeSiblings.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeSiblings.java
new file mode 100644
index 00000000..6ec56d82
--- /dev/null
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNodeSiblings.java
@@ -0,0 +1,59 @@
+package org.brapi.v2.model.germ;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+/**
+ * PedigreeNodeSiblings
+ */
+
+
+@Deprecated
+public class BrAPIPedigreeNodeSiblings extends BrAPIPedigreeNodeSibling {
+
+  @Deprecated
+  public BrAPIPedigreeNodeSiblings germplasmDbId(String germplasmDbId) {
+    super.setGermplasmDbId(germplasmDbId);
+    return this;
+  }
+
+  @Deprecated
+  public BrAPIPedigreeNodeSiblings germplasmName(String germplasmName) {
+    super.setGermplasmName(germplasmName);
+    return this;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return super.hashCode();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class PedigreeNodeSiblings {\n");
+    
+    sb.append("    germplasmDbId: ").append(toIndentedString(super.getGermplasmDbId())).append("\n");
+    sb.append("    germplasmName: ").append(toIndentedString(super.getGermplasmName())).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode_Deprecated.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode_Deprecated.java
deleted file mode 100644
index 942a2d2e..00000000
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode_Deprecated.java
+++ /dev/null
@@ -1,292 +0,0 @@
-package org.brapi.v2.model.germ;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.validation.Valid;
-
-/**
- * PedigreeNode
- */
-
-@Deprecated
-public class BrAPIPedigreeNode_Deprecated {
-	@JsonProperty("crossingProjectDbId")
-	private String crossingProjectDbId = null;
-
-	@JsonProperty("crossingYear")
-	private Integer crossingYear = null;
-
-	@JsonProperty("familyCode")
-	private String familyCode = null;
-
-	@JsonProperty("germplasmDbId")
-	private String germplasmDbId = null;
-
-	@JsonProperty("germplasmName")
-	private String germplasmName = null;
-
-	@JsonProperty("parents")
-	@Valid
-	private List<BrAPIPedigreeNodeRelative> parents = null;
-
-	@JsonProperty("pedigree")
-	private String pedigree = null;
-
-	@JsonProperty("siblings")
-	@Valid
-	private List<BrAPIPedigreeNodeSibling> siblings = null;
-
-	@Deprecated
-	public BrAPIPedigreeNode_Deprecated crossingProjectDbId(String crossingProjectDbId) {
-		this.crossingProjectDbId = crossingProjectDbId;
-		return this;
-	}
-
-	/**
-	 * The crossing project used to generate this germplasm
-	 * 
-	 * @return crossingProjectDbId
-	 **/
-
-	@Deprecated
-	public String getCrossingProjectDbId() {
-		return crossingProjectDbId;
-	}
-
-	@Deprecated
-	public void setCrossingProjectDbId(String crossingProjectDbId) {
-		this.crossingProjectDbId = crossingProjectDbId;
-	}
-
-	@Deprecated
-	public BrAPIPedigreeNode_Deprecated crossingYear(Integer crossingYear) {
-		this.crossingYear = crossingYear;
-		return this;
-	}
-
-	/**
-	 * The year the parents were originally crossed
-	 * 
-	 * @return crossingYear
-	 **/
-
-	@Deprecated
-	public Integer getCrossingYear() {
-		return crossingYear;
-	}
-
-	@Deprecated
-	public void setCrossingYear(Integer crossingYear) {
-		this.crossingYear = crossingYear;
-	}
-
-	@Deprecated
-	public BrAPIPedigreeNode_Deprecated familyCode(String familyCode) {
-		this.familyCode = familyCode;
-		return this;
-	}
-
-	/**
-	 * The code representing the family
-	 * 
-	 * @return familyCode
-	 **/
-
-	@Deprecated
-	public String getFamilyCode() {
-		return familyCode;
-	}
-
-	@Deprecated
-	public void setFamilyCode(String familyCode) {
-		this.familyCode = familyCode;
-	}
-
-	@Deprecated
-	public BrAPIPedigreeNode_Deprecated germplasmDbId(String germplasmDbId) {
-		this.germplasmDbId = germplasmDbId;
-		return this;
-	}
-
-	/**
-	 * The ID which uniquely identifies a germplasm
-	 * 
-	 * @return germplasmDbId
-	 **/
-
-	@Deprecated
-	public String getGermplasmDbId() {
-		return germplasmDbId;
-	}
-
-	@Deprecated
-	public void setGermplasmDbId(String germplasmDbId) {
-		this.germplasmDbId = germplasmDbId;
-	}
-
-	@Deprecated
-	public BrAPIPedigreeNode_Deprecated germplasmName(String germplasmName) {
-		this.germplasmName = germplasmName;
-		return this;
-	}
-
-	/**
-	 * A human readable name for a germplasm
-	 * 
-	 * @return germplasmName
-	 **/
-
-	@Deprecated
-	public String getGermplasmName() {
-		return germplasmName;
-	}
-
-	@Deprecated
-	public void setGermplasmName(String germplasmName) {
-		this.germplasmName = germplasmName;
-	}
-
-	@Deprecated
-	public BrAPIPedigreeNode_Deprecated parents(List<BrAPIPedigreeNodeRelative> parents) {
-		this.parents = parents;
-		return this;
-	}
-
-	@Deprecated
-	public BrAPIPedigreeNode_Deprecated addParentsItem(BrAPIPedigreeNodeRelative parentsItem) {
-		if (this.parents == null) {
-			this.parents = new ArrayList<BrAPIPedigreeNodeRelative>();
-		}
-		this.parents.add(parentsItem);
-		return this;
-	}
-
-	/**
-	 * List of parent nodes in the pedigree tree.
-	 * 
-	 * @return parents
-	 **/
-
-	@Deprecated
-	public List<BrAPIPedigreeNodeRelative> getParents() {
-		return parents;
-	}
-
-	@Deprecated
-	public void setParents(List<BrAPIPedigreeNodeRelative> parents) {
-		this.parents = parents;
-	}
-
-	@Deprecated
-	public BrAPIPedigreeNode_Deprecated pedigree(String pedigree) {
-		this.pedigree = pedigree;
-		return this;
-	}
-
-	/**
-	 * The string representation of the pedigree.
-	 * 
-	 * @return pedigree
-	 **/
-
-	@Deprecated
-	public String getPedigree() {
-		return pedigree;
-	}
-
-	@Deprecated
-	public void setPedigree(String pedigree) {
-		this.pedigree = pedigree;
-	}
-
-	@Deprecated
-	public BrAPIPedigreeNode_Deprecated siblings(List<BrAPIPedigreeNodeSibling> siblings) {
-		this.siblings = siblings;
-		return this;
-	}
-
-	@Deprecated
-	public BrAPIPedigreeNode_Deprecated addSiblingsItem(BrAPIPedigreeNodeSibling siblingsItem) {
-		if (this.siblings == null) {
-			this.siblings = new ArrayList<BrAPIPedigreeNodeSibling>();
-		}
-		this.siblings.add(siblingsItem);
-		return this;
-	}
-
-	/**
-	 * List of sibling germplasm
-	 * 
-	 * @return siblings
-	 **/
-
-	@Deprecated
-	public List<BrAPIPedigreeNodeSibling> getSiblings() {
-		return siblings;
-	}
-
-	@Deprecated
-	public void setSiblings(List<BrAPIPedigreeNodeSibling> siblings) {
-		this.siblings = siblings;
-	}
-
-	@Override
-	@Deprecated
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		BrAPIPedigreeNode_Deprecated pedigreeNode = (BrAPIPedigreeNode_Deprecated) o;
-		return Objects.equals(this.crossingProjectDbId, pedigreeNode.crossingProjectDbId)
-				&& Objects.equals(this.crossingYear, pedigreeNode.crossingYear)
-				&& Objects.equals(this.familyCode, pedigreeNode.familyCode)
-				&& Objects.equals(this.germplasmDbId, pedigreeNode.germplasmDbId)
-				&& Objects.equals(this.germplasmName, pedigreeNode.germplasmName)
-				&& Objects.equals(this.parents, pedigreeNode.parents)
-				&& Objects.equals(this.pedigree, pedigreeNode.pedigree)
-				&& Objects.equals(this.siblings, pedigreeNode.siblings);
-	}
-
-	@Override
-	@Deprecated
-	public int hashCode() {
-		return Objects.hash(crossingProjectDbId, crossingYear, familyCode, germplasmDbId, germplasmName, parents,
-				pedigree, siblings);
-	}
-
-	@Override
-	@Deprecated
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class PedigreeNode {\n");
-
-		sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
-		sb.append("    crossingYear: ").append(toIndentedString(crossingYear)).append("\n");
-		sb.append("    familyCode: ").append(toIndentedString(familyCode)).append("\n");
-		sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-		sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-		sb.append("    parents: ").append(toIndentedString(parents)).append("\n");
-		sb.append("    pedigree: ").append(toIndentedString(pedigree)).append("\n");
-		sb.append("    siblings: ").append(toIndentedString(siblings)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIGermplasmPedigreeResponse.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIGermplasmPedigreeResponse.java
index 7b8ae424..c7b920e0 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIGermplasmPedigreeResponse.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIGermplasmPedigreeResponse.java
@@ -8,7 +8,7 @@
 import org.brapi.v2.model.BrAPIResponse;
 import org.brapi.v2.model.BrAPIContext;
 import org.brapi.v2.model.BrAPIMetadata;
-import org.brapi.v2.model.germ.BrAPIPedigreeNode_Deprecated;
+import org.brapi.v2.model.germ.BrAPIPedigreeNode;
 
 
 /**
@@ -16,7 +16,7 @@
  */
 
 
-public class BrAPIGermplasmPedigreeResponse implements BrAPIResponse<BrAPIPedigreeNode_Deprecated>  {
+public class BrAPIGermplasmPedigreeResponse implements BrAPIResponse<BrAPIPedigreeNode>  {
   @JsonProperty("@context")
   private BrAPIContext _atContext = null;
 
@@ -24,7 +24,7 @@ public class BrAPIGermplasmPedigreeResponse implements BrAPIResponse<BrAPIPedigr
   private BrAPIMetadata metadata = null;
 
   @JsonProperty("result")
-  private BrAPIPedigreeNode_Deprecated result = null;
+  private BrAPIPedigreeNode result = null;
 
   public BrAPIGermplasmPedigreeResponse _atContext(BrAPIContext _atContext) {
     this._atContext = _atContext;
@@ -58,7 +58,7 @@ public void setMetadata(BrAPIMetadata metadata) {
     this.metadata = metadata;
   }
 
-  public BrAPIGermplasmPedigreeResponse result(BrAPIPedigreeNode_Deprecated result) {
+  public BrAPIGermplasmPedigreeResponse result(BrAPIPedigreeNode result) {
     this.result = result;
     return this;
   }
@@ -71,11 +71,11 @@ public BrAPIGermplasmPedigreeResponse result(BrAPIPedigreeNode_Deprecated result
       
 
     @Valid
-    public BrAPIPedigreeNode_Deprecated getResult() {
+    public BrAPIPedigreeNode getResult() {
     return result;
   }
 
-  public void setResult(BrAPIPedigreeNode_Deprecated result) {
+  public void setResult(BrAPIPedigreeNode result) {
     this.result = result;
   }
 

From f80fec96a6a969ddefeb21b128c0dd3828ba4ae0 Mon Sep 17 00:00:00 2001
From: timparsons <tep46@cornell.edu>
Date: Thu, 12 Oct 2023 12:00:37 -0400
Subject: [PATCH 23/28] Cleanup

---
 brapi-java-client-v21/pom.xml                 |   76 -
 .../org/brapi/client/v21/ApiCallback.java     |   59 -
 .../java/org/brapi/client/v21/ApiClient.java  | 1210 ---------------
 .../org/brapi/client/v21/ApiException.java    |   91 --
 .../org/brapi/client/v21/ApiResponse.java     |   58 -
 .../org/brapi/client/v21/Configuration.java   |   38 -
 .../client/v21/GzipRequestInterceptor.java    |   84 -
 .../main/java/org/brapi/client/v21/JSON.java  |  345 -----
 .../main/java/org/brapi/client/v21/Pair.java  |   51 -
 .../brapi/client/v21/ProgressRequestBody.java |   71 -
 .../client/v21/ProgressResponseBody.java      |   70 -
 .../java/org/brapi/client/v21/StringUtil.java |   54 -
 .../org/brapi/client/v21/auth/ApiKeyAuth.java |   74 -
 .../brapi/client/v21/auth/Authentication.java |   28 -
 .../brapi/client/v21/auth/HttpBasicAuth.java  |   50 -
 .../java/org/brapi/client/v21/auth/OAuth.java |   38 -
 .../org/brapi/client/v21/auth/OAuthFlow.java  |   17 -
 .../brapi/client/v21/model/BrAPIRequest.java  |   35 -
 .../brapi/client/v21/model/HttpMethod.java    |   22 -
 .../v21/model/exceptions/ApiException.java    |   90 --
 .../model/queryParams/BrAPIQueryParams.java   |   58 -
 .../queryParams/BrAPISecureQueryParams.java   |   52 -
 .../queryParams/core/CoreQueryParams.java     |   70 -
 .../queryParams/core/ListQueryParams.java     |   65 -
 .../queryParams/core/LocationQueryParams.java |   73 -
 .../queryParams/core/PeopleQueryParams.java   |   64 -
 .../queryParams/core/ProgramQueryParams.java  |   60 -
 .../queryParams/core/SeasonQueryParams.java   |   64 -
 .../queryParams/core/StudyQueryParams.java    |  100 --
 .../queryParams/core/TrialQueryParams.java    |   96 --
 .../queryParams/core/VendorQueryParams.java   |   56 -
 .../genotype/AlleleMatrixQueryParams.java     |  120 --
 .../queryParams/genotype/CallQueryParams.java |   64 -
 .../genotype/CallSetQueryParams.java          |   73 -
 .../genotype/GenomeMapQueryParams.java        |   79 -
 .../genotype/GenotypeQueryParams.java         |   61 -
 .../genotype/PlatesQueryParams.java           |  101 --
 .../genotype/ReferenceQueryParams.java        |   99 --
 .../genotype/ReferenceSetQueryParams.java     |   75 -
 .../genotype/SampleQueryParams.java           |  107 --
 .../genotype/VariantQueryParams.java          |   81 -
 .../genotype/VariantSetQueryParams.java       |   87 --
 .../germplasm/CrossQueryParams.java           |   63 -
 .../germplasm/CrossingProjectQueryParams.java |   59 -
 .../GermplasmAttributeQueryParams.java        |   99 --
 .../GermplasmAttributeValueQueryParams.java   |   59 -
 .../germplasm/GermplasmQueryParams.java       |  120 --
 .../germplasm/PedigreeQueryParams.java        |   99 --
 .../germplasm/SeedLotQueryParams.java         |   59 -
 .../phenotype/EventQueryParams.java           |   62 -
 .../phenotype/ImageQueryParams.java           |   75 -
 .../phenotype/MethodQueryParams.java          |   65 -
 .../phenotype/ObservationQueryParams.java     |  116 --
 .../phenotype/ObservationUnitQueryParams.java |  108 --
 .../phenotype/OntologyQueryParams.java        |   55 -
 .../phenotype/PhenotypeQueryParams.java       |   55 -
 .../phenotype/ScaleQueryParams.java           |   65 -
 .../phenotype/TraitQueryParams.java           |   65 -
 .../phenotype/VariableQueryParams.java        |  115 --
 .../v21/modules/core/CommonCropNamesApi.java  |  166 --
 .../client/v21/modules/core/ListsApi.java     |  997 ------------
 .../client/v21/modules/core/LocationsApi.java |  757 ---------
 .../client/v21/modules/core/PeopleApi.java    |  754 ---------
 .../client/v21/modules/core/ProgramsApi.java  |  752 ---------
 .../client/v21/modules/core/SeasonsApi.java   |  509 ------
 .../v21/modules/core/ServerInfoApi.java       |  167 --
 .../client/v21/modules/core/StudiesApi.java   |  865 -----------
 .../client/v21/modules/core/TrialsApi.java    |  755 ---------
 .../v21/modules/genotype/AlleleMatrixApi.java |  383 -----
 .../v21/modules/genotype/CallSetsApi.java     |  679 --------
 .../client/v21/modules/genotype/CallsApi.java |  516 -------
 .../v21/modules/genotype/GenomeMapsApi.java   |  802 ----------
 .../v21/modules/genotype/PlatesApi.java       |  745 ---------
 .../modules/genotype/ReferenceSetsApi.java    |  520 -------
 .../v21/modules/genotype/ReferencesApi.java   |  658 --------
 .../v21/modules/genotype/SamplesApi.java      |  871 -----------
 .../v21/modules/genotype/VariantSetsApi.java  | 1078 -------------
 .../v21/modules/genotype/VariantsApi.java     |  685 ---------
 .../v21/modules/genotype/VendorApi.java       |  991 ------------
 .../v21/modules/germplasm/CrossesApi.java     |  791 ----------
 .../germplasm/CrossingProjectsApi.java        |  507 ------
 .../v21/modules/germplasm/GermplasmApi.java   | 1369 -----------------
 .../GermplasmAttributeValuesApi.java          |  754 ---------
 .../germplasm/GermplasmAttributesApi.java     |  877 -----------
 .../v21/modules/germplasm/PedigreeApi.java    |  624 --------
 .../v21/modules/germplasm/SeedLotsApi.java    |  953 ------------
 .../v21/modules/phenotype/EventsApi.java      |  151 --
 .../v21/modules/phenotype/ImagesApi.java      |  991 ------------
 .../v21/modules/phenotype/MethodsApi.java     |  511 ------
 .../phenotype/ObservationUnitsApi.java        | 1223 ---------------
 .../phenotype/ObservationVariablesApi.java    |  757 ---------
 .../modules/phenotype/ObservationsApi.java    | 1228 ---------------
 .../v21/modules/phenotype/OntologiesApi.java  |  510 ------
 .../v21/modules/phenotype/ScalesApi.java      |  511 ------
 .../v21/modules/phenotype/TraitsApi.java      |  489 ------
 brapi-java-model-v21/pom.xml                  |   53 -
 .../java/org/brapi/model/v21/Metadata.java    |  155 --
 .../org/brapi/model/v21/MetadataBase.java     |  130 --
 .../brapi/model/v21/MetadataDatafiles.java    |  208 ---
 .../brapi/model/v21/MetadataPagination.java   |  160 --
 .../org/brapi/model/v21/MetadataStatus.java   |  165 --
 .../model/v21/MetadataTokenPagination.java    |  154 --
 .../MetadataTokenPaginationPagination.java    |  232 ---
 .../brapi/model/v21/core/BasePagination.java  |  160 --
 .../org/brapi/model/v21/core/BrAPIEnum.java   |   22 -
 .../brapi/model/v21/core/BrAPIListTypes.java  |   46 -
 .../v21/core/CommonCropNamesResponse.java     |  136 --
 .../core/CommonCropNamesResponseResult.java   |   95 --
 .../org/brapi/model/v21/core/Contact.java     |  208 ---
 .../brapi/model/v21/core/ContentTypes.java    |   68 -
 .../org/brapi/model/v21/core/Context.java     |   64 -
 .../org/brapi/model/v21/core/DataFile.java    |  208 ---
 .../org/brapi/model/v21/core/DataLink.java    |  256 ---
 .../model/v21/core/EnvironmentParameter.java  |  232 ---
 .../java/org/brapi/model/v21/core/Event.java  |  361 -----
 .../model/v21/core/EventEventDateRange.java   |  147 --
 .../model/v21/core/EventEventParameters.java  |  290 ----
 .../brapi/model/v21/core/EventsResponse.java  |  136 --
 .../model/v21/core/EventsResponseResult.java  |   95 --
 .../model/v21/core/ExternalReferences.java    |   64 -
 .../v21/core/ExternalReferencesInner.java     |  136 --
 .../org/brapi/model/v21/core/GeoJSON.java     |  112 --
 .../model/v21/core/GeoJSONSearchArea.java     |  112 --
 .../java/org/brapi/model/v21/core/Image.java  |  505 ------
 .../model/v21/core/ImageDeleteResponse.java   |  136 --
 .../v21/core/ImageDeleteResponseResult.java   |   95 --
 .../model/v21/core/ImageListResponse.java     |  136 --
 .../v21/core/ImageListResponseResult.java     |   95 --
 .../brapi/model/v21/core/ImageNewRequest.java |  481 ------
 .../model/v21/core/ImageSearchRequest.java    |  747 ---------
 .../model/v21/core/ImageSingleResponse.java   |  136 --
 .../org/brapi/model/v21/core/LinearRing.java  |   65 -
 .../brapi/model/v21/core/ListBaseFields.java  |  404 -----
 .../org/brapi/model/v21/core/ListDetails.java |  460 ------
 .../brapi/model/v21/core/ListNewRequest.java  |  436 ------
 .../brapi/model/v21/core/ListResponse.java    |  136 --
 .../model/v21/core/ListSearchRequest.java     |  646 --------
 .../org/brapi/model/v21/core/ListSummary.java |  428 ------
 .../org/brapi/model/v21/core/ListTypes.java   |   74 -
 .../model/v21/core/ListsListResponse.java     |  136 --
 .../v21/core/ListsListResponseResult.java     |   95 --
 .../model/v21/core/ListsSingleResponse.java   |  136 --
 .../org/brapi/model/v21/core/Location.java    |  584 -------
 .../model/v21/core/LocationListResponse.java  |  136 --
 .../v21/core/LocationListResponseResult.java  |   95 --
 .../model/v21/core/LocationNewRequest.java    |  560 -------
 .../model/v21/core/LocationSearchRequest.java |  699 ---------
 .../v21/core/LocationSingleResponse.java      |  136 --
 .../org/brapi/model/v21/core/Metadata.java    |  155 --
 .../brapi/model/v21/core/MetadataBase.java    |  130 --
 .../model/v21/core/MetadataDatafiles.java     |  208 ---
 .../model/v21/core/MetadataPagination.java    |  160 --
 .../brapi/model/v21/core/MetadataStatus.java  |  165 --
 .../v21/core/MetadataTokenPagination.java     |  154 --
 .../MetadataTokenPaginationPagination.java    |  232 ---
 .../java/org/brapi/model/v21/core/Method.java |  320 ----
 .../brapi/model/v21/core/MethodBaseClass.java |  296 ----
 .../MethodBaseClassOntologyReference.java     |  170 --
 ...ssOntologyReferenceDocumentationLinks.java |  164 --
 .../model/v21/core/MethodListResponse.java    |  136 --
 .../v21/core/MethodListResponseResult.java    |   95 --
 .../model/v21/core/MethodNewRequest.java      |   61 -
 .../v21/core/MethodOntologyReference.java     |  170 --
 ...odOntologyReferenceDocumentationLinks.java |  164 --
 .../model/v21/core/MethodSingleResponse.java  |  136 --
 .../core/Model202AcceptedSearchResponse.java  |  136 --
 .../Model202AcceptedSearchResponseResult.java |   88 --
 .../org/brapi/model/v21/core/Observation.java |  465 ------
 .../v21/core/ObservationDeleteResponse.java   |  136 --
 .../core/ObservationDeleteResponseResult.java |   95 --
 .../core/ObservationLevelListResponse.java    |  136 --
 .../ObservationLevelListResponseResult.java   |   95 --
 .../v21/core/ObservationListResponse.java     |  136 --
 .../core/ObservationListResponseResult.java   |   95 --
 .../model/v21/core/ObservationNewRequest.java |  441 ------
 .../v21/core/ObservationSearchRequest.java    |  867 -----------
 .../model/v21/core/ObservationSeason.java     |  160 --
 .../v21/core/ObservationSingleResponse.java   |  136 --
 .../model/v21/core/ObservationTable.java      |  229 ---
 .../ObservationTableObservationVariables.java |  112 --
 .../v21/core/ObservationTableResponse.java    |  136 --
 .../model/v21/core/ObservationTreatment.java  |  112 --
 .../brapi/model/v21/core/ObservationUnit.java |  624 --------
 .../core/ObservationUnitHierarchyLevel.java   |  112 --
 .../core/ObservationUnitHierarchyLevel1.java  |  112 --
 .../model/v21/core/ObservationUnitLevel.java  |  136 --
 .../model/v21/core/ObservationUnitLevel1.java |  136 --
 .../model/v21/core/ObservationUnitLevel2.java |  136 --
 .../ObservationUnitLevelRelationship.java     |  160 --
 .../ObservationUnitLevelRelationship1.java    |  160 --
 .../v21/core/ObservationUnitListResponse.java |  136 --
 .../ObservationUnitListResponseResult.java    |   95 --
 .../v21/core/ObservationUnitNewRequest.java   |  568 -------
 ...bservationUnitObservationUnitPosition.java |  422 -----
 .../v21/core/ObservationUnitObservations.java |  465 ------
 .../v21/core/ObservationUnitPosition.java     |  422 -----
 .../core/ObservationUnitSearchRequest.java    |  842 ----------
 .../core/ObservationUnitSingleResponse.java   |  136 --
 .../model/v21/core/ObservationUnitTable.java  |  228 ---
 .../core/ObservationUnitTableResponse.java    |  136 --
 .../v21/core/ObservationUnitTreatments.java   |  112 --
 .../model/v21/core/ObservationVariable.java   |  553 -------
 .../core/ObservationVariableListResponse.java |  136 --
 ...ObservationVariableListResponseResult.java |   95 --
 .../v21/core/ObservationVariableMethod.java   |  320 ----
 .../core/ObservationVariableNewRequest.java   |  553 -------
 .../v21/core/ObservationVariableScale.java    |  376 -----
 .../ObservationVariableScaleValidValues.java  |  194 ---
 ...ionVariableScaleValidValuesCategories.java |  112 --
 .../ObservationVariableSearchRequest.java     | 1130 --------------
 .../ObservationVariableSingleResponse.java    |  136 --
 .../v21/core/ObservationVariableTrait.java    |  480 ------
 .../model/v21/core/OneOfGeoJSONGeometry.java  |   20 -
 .../core/OneOfGeoJSONSearchAreaGeometry.java  |   20 -
 .../org/brapi/model/v21/core/Ontology.java    |  290 ----
 .../model/v21/core/OntologyListResponse.java  |  136 --
 .../v21/core/OntologyListResponseResult.java  |   95 --
 .../model/v21/core/OntologyNewRequest.java    |  266 ----
 .../model/v21/core/OntologyReference.java     |  170 --
 .../v21/core/OntologySingleResponse.java      |  136 --
 .../java/org/brapi/model/v21/core/Person.java |  344 -----
 .../model/v21/core/PersonListResponse.java    |  136 --
 .../v21/core/PersonListResponseResult.java    |   95 --
 .../model/v21/core/PersonNewRequest.java      |  320 ----
 .../model/v21/core/PersonSearchRequest.java   |  562 -------
 .../model/v21/core/PersonSingleResponse.java  |  136 --
 .../brapi/model/v21/core/PointGeometry.java   |  123 --
 .../org/brapi/model/v21/core/Polygon.java     |   65 -
 .../brapi/model/v21/core/PolygonGeometry.java |  123 --
 .../org/brapi/model/v21/core/Position.java    |   65 -
 .../org/brapi/model/v21/core/Program.java     |  419 -----
 .../model/v21/core/ProgramListResponse.java   |  136 --
 .../v21/core/ProgramListResponseResult.java   |   95 --
 .../model/v21/core/ProgramNewRequest.java     |  395 -----
 .../model/v21/core/ProgramSearchRequest.java  |  517 -------
 .../model/v21/core/ProgramSingleResponse.java |  136 --
 .../java/org/brapi/model/v21/core/Scale.java  |  376 -----
 .../brapi/model/v21/core/ScaleBaseClass.java  |  352 -----
 .../v21/core/ScaleBaseClassValidValues.java   |  194 ---
 .../ScaleBaseClassValidValuesCategories.java  |  112 --
 .../model/v21/core/ScaleListResponse.java     |  136 --
 .../v21/core/ScaleListResponseResult.java     |   95 --
 .../brapi/model/v21/core/ScaleNewRequest.java |   61 -
 .../model/v21/core/ScaleSingleResponse.java   |  136 --
 .../model/v21/core/SearchImagesBody.java      |  747 ---------
 .../v21/core/SearchObservationsBody.java      |  867 -----------
 ...earchRequestParametersCommonCropNames.java |   98 --
 ...chRequestParametersExternalReferences.java |  162 --
 .../SearchRequestParametersGermplasm.java     |  130 --
 .../SearchRequestParametersLocations.java     |  130 --
 ...RequestParametersObservationVariables.java |  162 --
 .../core/SearchRequestParametersPaging.java   |  112 --
 .../core/SearchRequestParametersPrograms.java |  130 --
 .../core/SearchRequestParametersStudies.java  |  130 --
 .../SearchRequestParametersTokenPaging.java   |  136 --
 .../core/SearchRequestParametersTrials.java   |  130 --
 ...rchRequestParametersVariableBaseClass.java | 1034 -------------
 .../java/org/brapi/model/v21/core/Season.java |  136 --
 .../model/v21/core/SeasonListResponse.java    |  136 --
 .../v21/core/SeasonListResponseResult.java    |   95 --
 .../org/brapi/model/v21/core/SeasonObs.java   |  160 --
 .../model/v21/core/SeasonSingleResponse.java  |  136 --
 .../org/brapi/model/v21/core/ServerInfo.java  |  263 ----
 .../model/v21/core/ServerInfoResponse.java    |  136 --
 .../org/brapi/model/v21/core/Service.java     |  312 ----
 .../java/org/brapi/model/v21/core/Status.java |  165 --
 .../java/org/brapi/model/v21/core/Study.java  |  825 ----------
 .../brapi/model/v21/core/StudyContacts.java   |  208 ---
 .../brapi/model/v21/core/StudyDataLinks.java  |  256 ---
 .../v21/core/StudyEnvironmentParameters.java  |  232 ---
 .../v21/core/StudyExperimentalDesign.java     |  112 --
 .../model/v21/core/StudyGrowthFacility.java   |  112 --
 .../brapi/model/v21/core/StudyLastUpdate.java |  113 --
 .../model/v21/core/StudyListResponse.java     |  136 --
 .../v21/core/StudyListResponseResult.java     |   95 --
 .../brapi/model/v21/core/StudyNewRequest.java |  801 ----------
 .../model/v21/core/StudySearchRequest.java    |  964 ------------
 .../model/v21/core/StudySingleResponse.java   |  136 --
 .../model/v21/core/StudyTypesResponse.java    |  136 --
 .../v21/core/StudyTypesResponseResult.java    |   95 --
 .../brapi/model/v21/core/TokenPagination.java |  232 ---
 .../java/org/brapi/model/v21/core/Trait.java  |  480 ------
 .../brapi/model/v21/core/TraitBaseClass.java  |  456 ------
 .../brapi/model/v21/core/TraitDataType.java   |   71 -
 .../model/v21/core/TraitListResponse.java     |  136 --
 .../v21/core/TraitListResponseResult.java     |   95 --
 .../brapi/model/v21/core/TraitNewRequest.java |   61 -
 .../model/v21/core/TraitSingleResponse.java   |  136 --
 .../java/org/brapi/model/v21/core/Trial.java  |  489 ------
 .../v21/core/TrialDatasetAuthorships.java     |  161 --
 .../model/v21/core/TrialListResponse.java     |  136 --
 .../v21/core/TrialListResponseResult.java     |   95 --
 .../brapi/model/v21/core/TrialNewRequest.java |  465 ------
 .../model/v21/core/TrialPublications.java     |  112 --
 .../model/v21/core/TrialSearchRequest.java    |  635 --------
 .../model/v21/core/TrialSingleResponse.java   |  136 --
 .../model/v21/core/VariableBaseClass.java     |  497 ------
 .../v21/core/VariableBaseClassMethod.java     |  320 ----
 .../v21/core/VariableBaseClassScale.java      |  376 -----
 .../v21/core/VariableBaseClassTrait.java      |  480 ------
 .../model/v21/genotype/AlleleMatrix.java      |  322 ----
 .../genotype/AlleleMatrixDataMatrices.java    |  223 ---
 .../v21/genotype/AlleleMatrixPagination.java  |  235 ---
 .../v21/genotype/AlleleMatrixResponse.java    |  137 --
 .../genotype/AlleleMatrixSearchRequest.java   |  538 -------
 .../AlleleMatrixSearchRequestPagination.java  |  187 ---
 .../brapi/model/v21/genotype/Analysis.java    |  243 ---
 .../model/v21/genotype/AvailableFormat.java   |  335 ----
 .../model/v21/genotype/BasePagination.java    |  160 --
 .../org/brapi/model/v21/genotype/Call.java    |  376 -----
 .../v21/genotype/CallGenotypeMetadata.java    |  213 ---
 .../org/brapi/model/v21/genotype/CallSet.java |  297 ----
 .../model/v21/genotype/CallSetResponse.java   |  137 --
 .../v21/genotype/CallSetsListResponse.java    |  137 --
 .../genotype/CallSetsListResponseResult.java  |   95 --
 .../v21/genotype/CallSetsSearchRequest.java   |  658 --------
 .../model/v21/genotype/CallsListResponse.java |  137 --
 .../v21/genotype/CallsListResponseResult.java |  191 ---
 .../v21/genotype/CallsSearchRequest.java      |  330 ----
 .../model/v21/genotype/ContentTypes.java      |   68 -
 .../org/brapi/model/v21/genotype/Context.java |   64 -
 .../brapi/model/v21/genotype/DataFile.java    |  208 ---
 .../v21/genotype/ExternalReferences.java      |   64 -
 .../v21/genotype/ExternalReferencesInner.java |  136 --
 .../brapi/model/v21/genotype/GenomeMap.java   |  387 -----
 .../v21/genotype/GenomeMapListResponse.java   |  137 --
 .../genotype/GenomeMapListResponseResult.java |   95 --
 .../v21/genotype/GenomeMapSingleResponse.java |  137 --
 .../org/brapi/model/v21/genotype/GeoJSON.java |  112 --
 .../model/v21/genotype/GeoJSONSearchArea.java |  112 --
 .../brapi/model/v21/genotype/LinearRing.java  |   65 -
 .../model/v21/genotype/LinkageGroup.java      |  170 --
 .../genotype/LinkageGroupListResponse.java    |  137 --
 .../LinkageGroupListResponseResult.java       |   95 --
 .../brapi/model/v21/genotype/ListValue.java   |   98 --
 .../model/v21/genotype/MarkerPosition.java    |  242 ---
 .../genotype/MarkerPositionListResponse.java  |  137 --
 .../MarkerPositionListResponseResult.java     |   95 --
 .../genotype/MarkerPositionSearchRequest.java |  258 ----
 .../brapi/model/v21/genotype/Measurement.java |  113 --
 .../model/v21/genotype/MethodBaseClass.java   |  296 ----
 .../MethodBaseClassOntologyReference.java     |  170 --
 ...ssOntologyReferenceDocumentationLinks.java |  164 --
 .../Model202AcceptedSearchResponse.java       |  137 --
 .../Model202AcceptedSearchResponseResult.java |   88 --
 .../ObservationUnitHierarchyLevel.java        |  112 --
 .../genotype/OneOfListValueValuesItems.java   |   20 -
 .../v21/genotype/OneOfgeoJSONGeometry.java    |   20 -
 .../OneOfgeoJSONSearchAreaGeometry.java       |   20 -
 .../model/v21/genotype/OntologyReference.java |  170 --
 .../model/v21/genotype/OntologyTerm.java      |  112 --
 .../org/brapi/model/v21/genotype/Plate.java   |  419 -----
 .../brapi/model/v21/genotype/PlateFormat.java |   66 -
 .../model/v21/genotype/PlateListResponse.java |  137 --
 .../v21/genotype/PlateListResponseResult.java |   95 --
 .../model/v21/genotype/PlateNewRequest.java   |  395 -----
 .../v21/genotype/PlateSearchRequest.java      |  722 ---------
 .../v21/genotype/PlateSingleResponse.java     |  137 --
 .../model/v21/genotype/PointGeometry.java     |  123 --
 .../org/brapi/model/v21/genotype/Polygon.java |   65 -
 .../model/v21/genotype/PolygonGeometry.java   |  123 --
 .../brapi/model/v21/genotype/Position.java    |   65 -
 .../brapi/model/v21/genotype/Reference.java   |  448 ------
 .../model/v21/genotype/ReferenceBases.java    |  136 --
 .../v21/genotype/ReferenceBasesResponse.java  |  137 --
 .../model/v21/genotype/ReferenceSet.java      |  400 -----
 .../genotype/ReferenceSetSourceGermplasm.java |  112 --
 .../genotype/ReferenceSetsListResponse.java   |  137 --
 .../ReferenceSetsListResponseResult.java      |   95 --
 .../genotype/ReferenceSetsSearchRequest.java  |  626 --------
 .../genotype/ReferenceSetsSingleResponse.java |  137 --
 .../v21/genotype/ReferenceSingleResponse.java |  137 --
 .../genotype/ReferenceSourceGermplasm.java    |  112 --
 .../v21/genotype/ReferencesListResponse.java  |  137 --
 .../ReferencesListResponseResult.java         |   95 --
 .../v21/genotype/ReferencesSearchRequest.java |  698 ---------
 .../org/brapi/model/v21/genotype/Sample.java  |  611 --------
 .../v21/genotype/SampleListResponse.java      |  137 --
 .../genotype/SampleListResponseResult.java    |   95 --
 .../model/v21/genotype/SampleNewRequest.java  |  587 -------
 .../v21/genotype/SampleSearchRequest.java     |  690 ---------
 .../v21/genotype/SampleSingleResponse.java    |  137 --
 .../model/v21/genotype/ScaleBaseClass.java    |  352 -----
 .../genotype/ScaleBaseClassValidValues.java   |  194 ---
 .../ScaleBaseClassValidValuesCategories.java  |  112 --
 ...earchRequestParametersCommonCropNames.java |   98 --
 ...chRequestParametersExternalReferences.java |  162 --
 .../SearchRequestParametersGermplasm.java     |  130 --
 .../SearchRequestParametersLocations.java     |  130 --
 ...RequestParametersObservationVariables.java |  162 --
 .../SearchRequestParametersPaging.java        |  112 --
 .../SearchRequestParametersPrograms.java      |  130 --
 .../SearchRequestParametersStudies.java       |  130 --
 .../SearchRequestParametersTokenPaging.java   |  136 --
 .../SearchRequestParametersTrials.java        |  130 --
 ...rchRequestParametersVariableBaseClass.java | 1034 -------------
 .../model/v21/genotype/ShipmentForm.java      |  136 --
 .../org/brapi/model/v21/genotype/Status.java  |  165 --
 .../model/v21/genotype/TokenPagination.java   |  232 ---
 .../model/v21/genotype/TraitBaseClass.java    |  456 ------
 .../model/v21/genotype/TraitDataType.java     |   71 -
 .../model/v21/genotype/VariableBaseClass.java |  497 ------
 .../v21/genotype/VariableBaseClassMethod.java |  320 ----
 .../v21/genotype/VariableBaseClassScale.java  |  376 -----
 .../v21/genotype/VariableBaseClassTrait.java  |  480 ------
 .../org/brapi/model/v21/genotype/Variant.java |  655 --------
 .../brapi/model/v21/genotype/VariantSet.java  |  360 -----
 .../genotype/VariantSetMetadataFields.java    |  189 ---
 .../v21/genotype/VariantSetResponse.java      |  137 --
 .../genotype/VariantSetsExtractRequest.java   |  322 ----
 .../v21/genotype/VariantSetsListResponse.java |  137 --
 .../VariantSetsListResponseResult.java        |   95 --
 .../genotype/VariantSetsSearchRequest.java    |  594 -------
 .../v21/genotype/VariantSingleResponse.java   |  137 --
 .../v21/genotype/VariantsListResponse.java    |  137 --
 .../genotype/VariantsListResponseResult.java  |   95 --
 .../v21/genotype/VariantsSearchRequest.java   |  690 ---------
 .../model/v21/genotype/VendorContact.java     |  280 ----
 .../brapi/model/v21/genotype/VendorOrder.java |  197 ---
 .../v21/genotype/VendorOrderListResponse.java |  137 --
 .../VendorOrderListResponseResult.java        |   95 --
 .../genotype/VendorOrderStatusResponse.java   |  137 --
 .../VendorOrderStatusResponseResult.java      |  142 --
 .../v21/genotype/VendorOrderSubmission.java   |  122 --
 .../VendorOrderSubmissionRequest.java         |  284 ----
 ...orOrderSubmissionRequestConcentration.java |  113 --
 .../VendorOrderSubmissionRequestPlates.java   |  221 ---
 .../VendorOrderSubmissionRequestSamples.java  |  378 -----
 .../VendorOrderSubmissionSingleResponse.java  |  137 --
 .../brapi/model/v21/genotype/VendorPlate.java |  170 --
 .../v21/genotype/VendorPlateListResponse.java |  137 --
 .../VendorPlateListResponseResult.java        |   95 --
 .../v21/genotype/VendorPlateSubmission.java   |  143 --
 .../v21/genotype/VendorPlateSubmissionId.java |   88 --
 ...VendorPlateSubmissionIdSingleResponse.java |  137 --
 .../genotype/VendorPlateSubmissionPlates.java |  170 --
 .../VendorPlateSubmissionRequest.java         |  219 ---
 .../VendorPlateSubmissionSingleResponse.java  |  137 --
 .../model/v21/genotype/VendorResultFile.java  |  221 ---
 .../VendorResultFileListResponse.java         |  137 --
 .../VendorResultFileListResponseResult.java   |   95 --
 .../model/v21/genotype/VendorSample.java      |  378 -----
 .../v21/genotype/VendorSpecification.java     |  152 --
 .../genotype/VendorSpecificationService.java  |  269 ----
 ...cificationServiceSpecificRequirements.java |  112 --
 .../VendorSpecificationSingleResponse.java    |  137 --
 .../model/v21/germplasm/BasePagination.java   |  160 --
 .../model/v21/germplasm/BreedingMethod.java   |  160 --
 .../germplasm/BreedingMethodListResponse.java |  137 --
 .../BreedingMethodListResponseResult.java     |   95 --
 .../BreedingMethodSingleResponse.java         |  137 --
 .../model/v21/germplasm/ContentTypes.java     |   68 -
 .../brapi/model/v21/germplasm/Context.java    |   64 -
 .../org/brapi/model/v21/germplasm/Cross.java  |  489 ------
 .../v21/germplasm/CrossCrossAttributes.java   |  112 --
 .../germplasm/CrossExternalReferences.java    |  136 --
 .../model/v21/germplasm/CrossNewRequest.java  |  465 ------
 .../model/v21/germplasm/CrossParent.java      |  237 ---
 .../model/v21/germplasm/CrossParent1.java     |  237 ---
 .../v21/germplasm/CrossPollinationEvents.java |  137 --
 .../v21/germplasm/CrossesListResponse.java    |  137 --
 .../germplasm/CrossesListResponseResult.java  |   95 --
 .../model/v21/germplasm/CrossingProject.java  |  304 ----
 .../germplasm/CrossingProjectNewRequest.java  |  280 ----
 .../CrossingProjectsListResponse.java         |  137 --
 .../CrossingProjectsListResponseResult.java   |   95 --
 .../CrossingProjectsSingleResponse.java       |  137 --
 .../brapi/model/v21/germplasm/DataFile.java   |  208 ---
 .../v21/germplasm/ExternalReferences.java     |   64 -
 .../brapi/model/v21/germplasm/GeoJSON.java    |  112 --
 .../v21/germplasm/GeoJSONSearchArea.java      |  112 --
 .../brapi/model/v21/germplasm/Germplasm.java  |  959 ------------
 .../v21/germplasm/GermplasmAttribute.java     |  625 --------
 ...ermplasmAttributeCategoryListResponse.java |  137 --
 ...smAttributeCategoryListResponseResult.java |   95 --
 .../GermplasmAttributeListResponse.java       |  137 --
 .../GermplasmAttributeListResponseResult.java |   95 --
 .../germplasm/GermplasmAttributeMethod.java   |  320 ----
 ...plasmAttributeMethodOntologyReference.java |  170 --
 ...odOntologyReferenceDocumentationLinks.java |  164 --
 .../GermplasmAttributeNewRequest.java         |  601 --------
 .../germplasm/GermplasmAttributeScale.java    |  376 -----
 .../GermplasmAttributeScaleValidValues.java   |  194 ---
 ...smAttributeScaleValidValuesCategories.java |  112 --
 .../GermplasmAttributeSearchRequest.java      | 1226 ---------------
 .../GermplasmAttributeSingleResponse.java     |  137 --
 .../germplasm/GermplasmAttributeTrait.java    |  480 ------
 .../germplasm/GermplasmAttributeValue.java    |  297 ----
 .../GermplasmAttributeValueListResponse.java  |  137 --
 ...plasmAttributeValueListResponseResult.java |   95 --
 .../GermplasmAttributeValueNewRequest.java    |  273 ----
 .../GermplasmAttributeValueSearchRequest.java |  714 ---------
 ...GermplasmAttributeValueSingleResponse.java |  137 --
 .../model/v21/germplasm/GermplasmDonors.java  |  112 --
 .../germplasm/GermplasmGermplasmOrigin.java   |  112 --
 .../v21/germplasm/GermplasmListResponse.java  |  137 --
 .../GermplasmListResponseResult.java          |   95 --
 .../model/v21/germplasm/GermplasmMCPD.java    |  920 -----------
 .../GermplasmMCPDBreedingInstitutes.java      |  112 --
 .../GermplasmMCPDCollectingInfo.java          |  195 ---
 ...CPDCollectingInfoCollectingInstitutes.java |  136 --
 ...plasmMCPDCollectingInfoCollectingSite.java |  280 ----
 .../v21/germplasm/GermplasmMCPDDonorInfo.java |  136 --
 .../GermplasmMCPDDonorInfoDonorInstitute.java |  112 --
 .../v21/germplasm/GermplasmMCPDResponse.java  |  137 --
 ...ermplasmMCPDSafetyDuplicateInstitutes.java |  112 --
 .../v21/germplasm/GermplasmNewRequest.java    |  935 -----------
 .../model/v21/germplasm/GermplasmOrigin.java  |  112 --
 .../germplasm/GermplasmPedigreeResponse.java  |  137 --
 .../germplasm/GermplasmProgenyResponse.java   |  137 --
 .../v21/germplasm/GermplasmSearchRequest.java |  850 ----------
 .../germplasm/GermplasmSingleResponse.java    |  137 --
 .../v21/germplasm/GermplasmStorageTypes.java  |  170 --
 .../v21/germplasm/GermplasmSynonyms.java      |  112 --
 .../v21/germplasm/GermplasmTaxonIds.java      |  112 --
 .../brapi/model/v21/germplasm/LinearRing.java |   65 -
 .../org/brapi/model/v21/germplasm/Method.java |  320 ----
 .../model/v21/germplasm/MethodBaseClass.java  |  296 ----
 .../Model202AcceptedSearchResponse.java       |  137 --
 .../Model202AcceptedSearchResponseResult.java |   88 --
 .../ObservationUnitHierarchyLevel.java        |  112 --
 .../v21/germplasm/OneOfGeoJSONGeometry.java   |   20 -
 .../OneOfgeoJSONSearchAreaGeometry.java       |   20 -
 .../v21/germplasm/OntologyReference.java      |  170 --
 .../brapi/model/v21/germplasm/ParentType.java |   69 -
 .../model/v21/germplasm/ParentTypeDEP.java    |   69 -
 .../v21/germplasm/PedigreeListResponse.java   |  137 --
 .../germplasm/PedigreeListResponseResult.java |   95 --
 .../model/v21/germplasm/PedigreeNode.java     |  456 ------
 .../model/v21/germplasm/PedigreeNodeDEP.java  |  274 ----
 .../v21/germplasm/PedigreeNodeDEPParents.java |  136 --
 .../germplasm/PedigreeNodeDEPSiblings.java    |  112 --
 .../v21/germplasm/PedigreeNodeParents.java    |  136 --
 .../v21/germplasm/PedigreeNodeSiblings.java   |  112 --
 .../v21/germplasm/PedigreeSearchRequest.java  |  930 -----------
 .../model/v21/germplasm/PlannedCross.java     |  423 -----
 .../v21/germplasm/PlannedCrossNewRequest.java |  399 -----
 .../germplasm/PlannedCrossesListResponse.java |  137 --
 .../PlannedCrossesListResponseResult.java     |   95 --
 .../model/v21/germplasm/PointGeometry.java    |  123 --
 .../brapi/model/v21/germplasm/Polygon.java    |   65 -
 .../model/v21/germplasm/PolygonGeometry.java  |  123 --
 .../brapi/model/v21/germplasm/Position.java   |   65 -
 .../model/v21/germplasm/ProgenyNodeDEP.java   |  143 --
 .../v21/germplasm/ProgenyNodeDEPProgeny.java  |  136 --
 .../org/brapi/model/v21/germplasm/Scale.java  |  376 -----
 .../model/v21/germplasm/ScaleBaseClass.java   |  352 -----
 ...earchRequestParametersCommonCropNames.java |   98 --
 ...chRequestParametersExternalReferences.java |  162 --
 .../SearchRequestParametersGermplasm.java     |  130 --
 .../SearchRequestParametersLocations.java     |  130 --
 ...RequestParametersObservationVariables.java |  162 --
 .../SearchRequestParametersPaging.java        |  112 --
 .../SearchRequestParametersPrograms.java      |  130 --
 .../SearchRequestParametersStudies.java       |  130 --
 .../SearchRequestParametersTokenPaging.java   |  136 --
 .../SearchRequestParametersTrials.java        |  130 --
 ...rchRequestParametersVariableBaseClass.java | 1034 -------------
 .../brapi/model/v21/germplasm/SeedLot.java    |  474 ------
 .../v21/germplasm/SeedLotContentMixture.java  |  184 ---
 .../v21/germplasm/SeedLotListResponse.java    |  137 --
 .../germplasm/SeedLotListResponseResult.java  |   95 --
 .../v21/germplasm/SeedLotNewRequest.java      |  450 ------
 .../v21/germplasm/SeedLotSingleResponse.java  |  137 --
 .../v21/germplasm/SeedLotTransaction.java     |  298 ----
 .../SeedLotTransactionListResponse.java       |  137 --
 .../SeedLotTransactionListResponseResult.java |   95 --
 .../SeedLotTransactionNewRequest.java         |  274 ----
 .../org/brapi/model/v21/germplasm/Status.java |  165 --
 .../brapi/model/v21/germplasm/TaxonID.java    |  112 --
 .../model/v21/germplasm/TokenPagination.java  |  232 ---
 .../org/brapi/model/v21/germplasm/Trait.java  |  480 ------
 .../model/v21/germplasm/TraitBaseClass.java   |  456 ------
 .../model/v21/germplasm/TraitDataType.java    |   71 -
 .../v21/germplasm/VariableBaseClass.java      |  505 ------
 .../model/v21/phenotype/BasePagination.java   |  160 --
 .../model/v21/phenotype/ContentTypes.java     |   68 -
 .../brapi/model/v21/phenotype/Context.java    |   64 -
 .../brapi/model/v21/phenotype/DataFile.java   |  208 ---
 .../org/brapi/model/v21/phenotype/Event.java  |  361 -----
 .../v21/phenotype/EventEventDateRange.java    |  147 --
 .../v21/phenotype/EventEventParameters.java   |  290 ----
 .../model/v21/phenotype/EventsResponse.java   |  137 --
 .../v21/phenotype/EventsResponseResult.java   |   95 --
 .../v21/phenotype/ExternalReferences.java     |   64 -
 .../phenotype/ExternalReferencesInner.java    |  136 --
 .../brapi/model/v21/phenotype/GeoJSON.java    |  112 --
 .../v21/phenotype/GeoJSONSearchArea.java      |  112 --
 .../org/brapi/model/v21/phenotype/Image.java  |  505 ------
 .../v21/phenotype/ImageDeleteResponse.java    |  137 --
 .../phenotype/ImageDeleteResponseResult.java  |   95 --
 .../v21/phenotype/ImageListResponse.java      |  137 --
 .../phenotype/ImageListResponseResult.java    |   95 --
 .../model/v21/phenotype/ImageNewRequest.java  |  481 ------
 .../v21/phenotype/ImageSearchRequest.java     |  747 ---------
 .../v21/phenotype/ImageSingleResponse.java    |  137 --
 .../brapi/model/v21/phenotype/LinearRing.java |   65 -
 .../org/brapi/model/v21/phenotype/Method.java |  320 ----
 .../model/v21/phenotype/MethodBaseClass.java  |  296 ----
 .../v21/phenotype/MethodListResponse.java     |  137 --
 .../phenotype/MethodListResponseResult.java   |   95 --
 .../model/v21/phenotype/MethodNewRequest.java |   61 -
 .../phenotype/MethodOntologyReference.java    |  170 --
 ...odOntologyReferenceDocumentationLinks.java |  164 --
 .../v21/phenotype/MethodSingleResponse.java   |  137 --
 .../Model202AcceptedSearchResponse.java       |  137 --
 .../Model202AcceptedSearchResponseResult.java |   88 --
 .../model/v21/phenotype/Observation.java      |  465 ------
 .../phenotype/ObservationDeleteResponse.java  |  137 --
 .../ObservationDeleteResponseResult.java      |   95 --
 .../ObservationLevelListResponse.java         |  137 --
 .../ObservationLevelListResponseResult.java   |   95 --
 .../phenotype/ObservationListResponse.java    |  137 --
 .../ObservationListResponseResult.java        |   95 --
 .../v21/phenotype/ObservationNewRequest.java  |  441 ------
 .../phenotype/ObservationSearchRequest.java   |  867 -----------
 .../v21/phenotype/ObservationSeason.java      |  160 --
 .../phenotype/ObservationSingleResponse.java  |  137 --
 .../model/v21/phenotype/ObservationTable.java |  229 ---
 .../ObservationTableObservationVariables.java |  112 --
 .../phenotype/ObservationTableResponse.java   |  137 --
 .../v21/phenotype/ObservationTreatment.java   |  112 --
 .../model/v21/phenotype/ObservationUnit.java  |  624 --------
 .../ObservationUnitHierarchyLevel.java        |  112 --
 .../v21/phenotype/ObservationUnitLevel.java   |  136 --
 .../v21/phenotype/ObservationUnitLevel1.java  |  136 --
 .../v21/phenotype/ObservationUnitLevel2.java  |  136 --
 .../ObservationUnitLevelRelationship.java     |  160 --
 .../ObservationUnitLevelRelationship1.java    |  160 --
 .../ObservationUnitListResponse.java          |  137 --
 .../ObservationUnitListResponseResult.java    |   95 --
 .../phenotype/ObservationUnitNewRequest.java  |  568 -------
 ...bservationUnitObservationUnitPosition.java |  422 -----
 .../ObservationUnitObservations.java          |  465 ------
 .../phenotype/ObservationUnitPosition.java    |  422 -----
 .../ObservationUnitSearchRequest.java         |  842 ----------
 .../ObservationUnitSingleResponse.java        |  137 --
 .../v21/phenotype/ObservationUnitTable.java   |  228 ---
 .../ObservationUnitTableResponse.java         |  137 --
 .../phenotype/ObservationUnitTreatments.java  |  112 --
 .../v21/phenotype/ObservationVariable.java    |  553 -------
 .../ObservationVariableListResponse.java      |  137 --
 ...ObservationVariableListResponseResult.java |   95 --
 .../phenotype/ObservationVariableMethod.java  |  320 ----
 .../ObservationVariableNewRequest.java        |  553 -------
 .../phenotype/ObservationVariableScale.java   |  376 -----
 .../ObservationVariableScaleValidValues.java  |  194 ---
 ...ionVariableScaleValidValuesCategories.java |  112 --
 .../ObservationVariableSearchRequest.java     | 1130 --------------
 .../ObservationVariableSingleResponse.java    |  137 --
 .../phenotype/ObservationVariableTrait.java   |  480 ------
 .../v21/phenotype/OneOfGeoJSONGeometry.java   |   20 -
 .../OneOfGeoJSONSearchAreaGeometry.java       |   20 -
 .../brapi/model/v21/phenotype/Ontology.java   |  290 ----
 .../v21/phenotype/OntologyListResponse.java   |  137 --
 .../phenotype/OntologyListResponseResult.java |   95 --
 .../v21/phenotype/OntologyNewRequest.java     |  266 ----
 .../v21/phenotype/OntologyReference.java      |  170 --
 .../v21/phenotype/OntologySingleResponse.java |  137 --
 .../model/v21/phenotype/PointGeometry.java    |  123 --
 .../brapi/model/v21/phenotype/Polygon.java    |   65 -
 .../model/v21/phenotype/PolygonGeometry.java  |  123 --
 .../brapi/model/v21/phenotype/Position.java   |   65 -
 .../org/brapi/model/v21/phenotype/Scale.java  |  376 -----
 .../model/v21/phenotype/ScaleBaseClass.java   |  352 -----
 .../v21/phenotype/ScaleListResponse.java      |  137 --
 .../phenotype/ScaleListResponseResult.java    |   95 --
 .../model/v21/phenotype/ScaleNewRequest.java  |   61 -
 .../v21/phenotype/ScaleSingleResponse.java    |  137 --
 .../model/v21/phenotype/SearchImagesBody.java |  747 ---------
 .../v21/phenotype/SearchObservationsBody.java |  867 -----------
 ...earchRequestParametersCommonCropNames.java |   98 --
 ...chRequestParametersExternalReferences.java |  162 --
 .../SearchRequestParametersGermplasm.java     |  130 --
 .../SearchRequestParametersLocations.java     |  130 --
 ...RequestParametersObservationVariables.java |  162 --
 .../SearchRequestParametersPaging.java        |  112 --
 .../SearchRequestParametersPrograms.java      |  130 --
 .../SearchRequestParametersStudies.java       |  130 --
 .../SearchRequestParametersTokenPaging.java   |  136 --
 .../SearchRequestParametersTrials.java        |  130 --
 ...rchRequestParametersVariableBaseClass.java | 1034 -------------
 .../brapi/model/v21/phenotype/SeasonObs.java  |  160 --
 .../org/brapi/model/v21/phenotype/Status.java |  165 --
 .../model/v21/phenotype/TokenPagination.java  |  232 ---
 .../org/brapi/model/v21/phenotype/Trait.java  |  480 ------
 .../model/v21/phenotype/TraitBaseClass.java   |  456 ------
 .../model/v21/phenotype/TraitDataType.java    |   71 -
 .../v21/phenotype/TraitListResponse.java      |  137 --
 .../phenotype/TraitListResponseResult.java    |   95 --
 .../model/v21/phenotype/TraitNewRequest.java  |   61 -
 .../v21/phenotype/TraitSingleResponse.java    |  137 --
 .../v21/phenotype/VariableBaseClass.java      |  505 ------
 693 files changed, 169577 deletions(-)
 delete mode 100644 brapi-java-client-v21/pom.xml
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/ApiCallback.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/ApiClient.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/ApiException.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/ApiResponse.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/Configuration.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/GzipRequestInterceptor.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/JSON.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/Pair.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/ProgressRequestBody.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/ProgressResponseBody.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/StringUtil.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/ApiKeyAuth.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/Authentication.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/HttpBasicAuth.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/OAuth.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/OAuthFlow.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/BrAPIRequest.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/HttpMethod.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/exceptions/ApiException.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/BrAPIQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/BrAPISecureQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/CoreQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/ListQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/LocationQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/PeopleQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/ProgramQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/SeasonQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/StudyQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/TrialQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/VendorQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/AlleleMatrixQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/CallQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/CallSetQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/GenomeMapQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/GenotypeQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/PlatesQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/ReferenceQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/ReferenceSetQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/SampleQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/VariantQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/VariantSetQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/CrossQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/CrossingProjectQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/GermplasmAttributeQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/GermplasmQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/PedigreeQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/SeedLotQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/EventQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/ImageQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/MethodQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/ObservationQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/ObservationUnitQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/OntologyQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/PhenotypeQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/ScaleQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/TraitQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/VariableQueryParams.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/CommonCropNamesApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/ListsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/LocationsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/PeopleApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/ProgramsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/SeasonsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/ServerInfoApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/StudiesApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/TrialsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/AlleleMatrixApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/CallSetsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/CallsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/GenomeMapsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/PlatesApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/ReferenceSetsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/ReferencesApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/SamplesApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/VariantSetsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/VariantsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/VendorApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/CrossesApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/CrossingProjectsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/GermplasmApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/GermplasmAttributeValuesApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/GermplasmAttributesApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/PedigreeApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/SeedLotsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/EventsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ImagesApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/MethodsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ObservationUnitsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ObservationVariablesApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ObservationsApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/OntologiesApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ScalesApi.java
 delete mode 100644 brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/TraitsApi.java
 delete mode 100644 brapi-java-model-v21/pom.xml
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/Metadata.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataBase.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataDatafiles.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataPagination.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataStatus.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataTokenPagination.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataTokenPaginationPagination.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/BasePagination.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/BrAPIEnum.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/BrAPIListTypes.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/CommonCropNamesResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/CommonCropNamesResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Contact.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ContentTypes.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Context.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/DataFile.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/DataLink.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EnvironmentParameter.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Event.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EventEventDateRange.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EventEventParameters.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EventsResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EventsResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ExternalReferences.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ExternalReferencesInner.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/GeoJSON.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/GeoJSONSearchArea.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Image.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageDeleteResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageDeleteResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LinearRing.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListBaseFields.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListDetails.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListSummary.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListTypes.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListsListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListsListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListsSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Location.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Metadata.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataBase.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataDatafiles.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataPagination.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataStatus.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataTokenPagination.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataTokenPaginationPagination.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Method.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodBaseClassOntologyReference.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodBaseClassOntologyReferenceDocumentationLinks.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodOntologyReference.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodOntologyReferenceDocumentationLinks.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Model202AcceptedSearchResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Model202AcceptedSearchResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Observation.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationDeleteResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationDeleteResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationLevelListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationLevelListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationSeason.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationTable.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationTableObservationVariables.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationTableResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationTreatment.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnit.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitHierarchyLevel.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitHierarchyLevel1.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevel.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevel1.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevel2.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevelRelationship.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevelRelationship1.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitObservationUnitPosition.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitObservations.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitPosition.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitTable.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitTableResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitTreatments.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariable.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableMethod.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableScale.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableScaleValidValues.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableScaleValidValuesCategories.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableTrait.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OneOfGeoJSONGeometry.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OneOfGeoJSONSearchAreaGeometry.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Ontology.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologyListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologyListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologyNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologyReference.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologySingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Person.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PointGeometry.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Polygon.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PolygonGeometry.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Position.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Program.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Scale.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleBaseClassValidValues.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleBaseClassValidValuesCategories.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchImagesBody.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchObservationsBody.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersCommonCropNames.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersExternalReferences.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersGermplasm.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersLocations.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersObservationVariables.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersPaging.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersPrograms.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersStudies.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersTokenPaging.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersTrials.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersVariableBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Season.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SeasonListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SeasonListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SeasonObs.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SeasonSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ServerInfo.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ServerInfoResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Service.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Status.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Study.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyContacts.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyDataLinks.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyEnvironmentParameters.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyExperimentalDesign.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyGrowthFacility.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyLastUpdate.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudySearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudySingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyTypesResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyTypesResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TokenPagination.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Trait.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitDataType.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Trial.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialDatasetAuthorships.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialPublications.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/VariableBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/VariableBaseClassMethod.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/VariableBaseClassScale.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/VariableBaseClassTrait.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrix.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixDataMatrices.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixPagination.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixSearchRequestPagination.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Analysis.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AvailableFormat.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/BasePagination.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Call.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallGenotypeMetadata.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSet.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSetResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSetsListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSetsListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSetsSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallsListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallsListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallsSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ContentTypes.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Context.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/DataFile.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ExternalReferences.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ExternalReferencesInner.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GenomeMap.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GenomeMapListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GenomeMapListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GenomeMapSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GeoJSON.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GeoJSONSearchArea.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/LinearRing.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/LinkageGroup.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/LinkageGroupListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/LinkageGroupListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ListValue.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MarkerPosition.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MarkerPositionListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MarkerPositionListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MarkerPositionSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Measurement.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MethodBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MethodBaseClassOntologyReference.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MethodBaseClassOntologyReferenceDocumentationLinks.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Model202AcceptedSearchResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Model202AcceptedSearchResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ObservationUnitHierarchyLevel.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OneOfListValueValuesItems.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OneOfgeoJSONGeometry.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OneOfgeoJSONSearchAreaGeometry.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OntologyReference.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OntologyTerm.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Plate.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateFormat.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PointGeometry.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Polygon.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PolygonGeometry.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Position.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Reference.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceBases.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceBasesResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSet.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetSourceGermplasm.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetsListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetsListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetsSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetsSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSourceGermplasm.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferencesListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferencesListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferencesSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Sample.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ScaleBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ScaleBaseClassValidValues.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ScaleBaseClassValidValuesCategories.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersCommonCropNames.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersExternalReferences.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersGermplasm.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersLocations.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersObservationVariables.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersPaging.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersPrograms.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersStudies.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersTokenPaging.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersTrials.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersVariableBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ShipmentForm.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Status.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/TokenPagination.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/TraitBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/TraitDataType.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariableBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariableBaseClassMethod.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariableBaseClassScale.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariableBaseClassTrait.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Variant.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSet.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetMetadataFields.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetsExtractRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetsListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetsListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetsSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantsListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantsListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantsSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorContact.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrder.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderStatusResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderStatusResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmission.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionRequestConcentration.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionRequestPlates.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionRequestSamples.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlate.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmission.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionId.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionIdSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionPlates.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorResultFile.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorResultFileListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorResultFileListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSample.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSpecification.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSpecificationService.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSpecificationServiceSpecificRequirements.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSpecificationSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BasePagination.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BreedingMethod.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BreedingMethodListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BreedingMethodListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BreedingMethodSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ContentTypes.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Context.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Cross.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossCrossAttributes.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossExternalReferences.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossParent.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossParent1.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossPollinationEvents.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossesListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossesListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProject.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProjectNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProjectsListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProjectsListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProjectsSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/DataFile.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ExternalReferences.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GeoJSON.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GeoJSONSearchArea.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Germplasm.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttribute.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeCategoryListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeCategoryListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeMethod.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeMethodOntologyReference.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeMethodOntologyReferenceDocumentationLinks.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeScale.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeScaleValidValues.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeScaleValidValuesCategories.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeTrait.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValue.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmDonors.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmGermplasmOrigin.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPD.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDBreedingInstitutes.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDCollectingInfo.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDCollectingInfoCollectingInstitutes.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDCollectingInfoCollectingSite.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDDonorInfo.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDDonorInfoDonorInstitute.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDSafetyDuplicateInstitutes.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmOrigin.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmPedigreeResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmProgenyResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmStorageTypes.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmSynonyms.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmTaxonIds.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/LinearRing.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Method.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/MethodBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Model202AcceptedSearchResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Model202AcceptedSearchResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ObservationUnitHierarchyLevel.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/OneOfGeoJSONGeometry.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/OneOfgeoJSONSearchAreaGeometry.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/OntologyReference.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ParentType.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ParentTypeDEP.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNode.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeDEP.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeDEPParents.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeDEPSiblings.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeParents.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeSiblings.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PlannedCross.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PlannedCrossNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PlannedCrossesListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PlannedCrossesListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PointGeometry.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Polygon.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PolygonGeometry.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Position.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ProgenyNodeDEP.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ProgenyNodeDEPProgeny.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Scale.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ScaleBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersCommonCropNames.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersExternalReferences.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersGermplasm.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersLocations.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersObservationVariables.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersPaging.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersPrograms.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersStudies.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersTokenPaging.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersTrials.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersVariableBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLot.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotContentMixture.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotTransaction.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotTransactionListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotTransactionListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotTransactionNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Status.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/TaxonID.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/TokenPagination.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Trait.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/TraitBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/TraitDataType.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/VariableBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/BasePagination.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ContentTypes.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Context.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/DataFile.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Event.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/EventEventDateRange.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/EventEventParameters.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/EventsResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/EventsResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ExternalReferences.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ExternalReferencesInner.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/GeoJSON.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/GeoJSONSearchArea.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Image.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageDeleteResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageDeleteResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/LinearRing.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Method.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodOntologyReference.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodOntologyReferenceDocumentationLinks.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Model202AcceptedSearchResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Model202AcceptedSearchResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Observation.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationDeleteResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationDeleteResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationLevelListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationLevelListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationSeason.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationTable.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationTableObservationVariables.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationTableResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationTreatment.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnit.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitHierarchyLevel.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevel.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevel1.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevel2.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevelRelationship.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevelRelationship1.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitObservationUnitPosition.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitObservations.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitPosition.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitTable.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitTableResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitTreatments.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariable.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableMethod.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableScale.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableScaleValidValues.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableScaleValidValuesCategories.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableSearchRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableTrait.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OneOfGeoJSONGeometry.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OneOfGeoJSONSearchAreaGeometry.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Ontology.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologyListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologyListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologyNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologyReference.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologySingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/PointGeometry.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Polygon.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/PolygonGeometry.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Position.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Scale.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchImagesBody.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchObservationsBody.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersCommonCropNames.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersExternalReferences.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersGermplasm.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersLocations.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersObservationVariables.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersPaging.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersPrograms.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersStudies.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersTokenPaging.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersTrials.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersVariableBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SeasonObs.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Status.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TokenPagination.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Trait.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitBaseClass.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitDataType.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitListResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitListResponseResult.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitNewRequest.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitSingleResponse.java
 delete mode 100644 brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/VariableBaseClass.java

diff --git a/brapi-java-client-v21/pom.xml b/brapi-java-client-v21/pom.xml
deleted file mode 100644
index 26aa3eff..00000000
--- a/brapi-java-client-v21/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <parent>
-        <artifactId>brapi</artifactId>
-        <groupId>org.brapi</groupId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>brapi-java-client-v21</artifactId>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <gson.version>2.8.5</gson.version>
-        <swagger.core.version>2.2.4</swagger.core.version>
-        <okhttp.version>2.7.5</okhttp.version>
-        <threeten.version>1.5.0</threeten.version>
-        <okio.version>3.2.0</okio.version>
-        <gson.fire.version>1.8.5</gson.fire.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/io.swagger.core.v3/swagger-annotations -->
-        <dependency>
-            <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger.core.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp/okhttp -->
-        <dependency>
-            <groupId>com.squareup.okhttp</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>${okhttp.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.threeten</groupId>
-            <artifactId>threetenbp</artifactId>
-            <version>${threeten.version}</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/com.squareup.okio/okio -->
-        <dependency>
-            <groupId>com.squareup.okio</groupId>
-            <artifactId>okio</artifactId>
-            <version>${okio.version}</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp/logging-interceptor -->
-        <dependency>
-            <groupId>com.squareup.okhttp</groupId>
-            <artifactId>logging-interceptor</artifactId>
-            <version>${okhttp.version}</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/io.gsonfire/gson-fire -->
-        <dependency>
-            <groupId>io.gsonfire</groupId>
-            <artifactId>gson-fire</artifactId>
-            <version>${gson.fire.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.brapi</groupId>
-            <artifactId>brapi-java-model-v21</artifactId>
-            <version>${parent.version}</version>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ApiCallback.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ApiCallback.java
deleted file mode 100644
index 02bcc533..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ApiCallback.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Callback for asynchronous API call.
- *
- * @param <T> The return type
- */
-public interface ApiCallback<T> {
-    /**
-     * This is called when the API call fails.
-     *
-     * @param e               The exception causing the failure
-     * @param statusCode      Status code of the response if available, otherwise it would be 0
-     * @param responseHeaders Headers of the response if available, otherwise it would be null
-     */
-    void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders);
-
-    /**
-     * This is called when the API call succeeded.
-     *
-     * @param result          The result deserialized from response
-     * @param statusCode      Status code of the response
-     * @param responseHeaders Headers of the response
-     */
-    void onSuccess(T result, int statusCode, Map<String, List<String>> responseHeaders);
-
-    /**
-     * This is called when the API upload processing.
-     *
-     * @param bytesWritten  bytes Written
-     * @param contentLength content length of request body
-     * @param done          write end
-     */
-    void onUploadProgress(long bytesWritten, long contentLength, boolean done);
-
-    /**
-     * This is called when the API downlond processing.
-     *
-     * @param bytesRead     bytes Read
-     * @param contentLength content lenngth of the response
-     * @param done          Read end
-     */
-    void onDownloadProgress(long bytesRead, long contentLength, boolean done);
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ApiClient.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ApiClient.java
deleted file mode 100644
index 77e1fbed..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ApiClient.java
+++ /dev/null
@@ -1,1210 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21;
-
-import com.squareup.okhttp.*;
-import com.squareup.okhttp.internal.http.HttpMethod;
-import com.squareup.okhttp.logging.HttpLoggingInterceptor;
-import com.squareup.okhttp.logging.HttpLoggingInterceptor.Level;
-import okio.BufferedSink;
-import okio.Okio;
-import org.brapi.client.v21.auth.ApiKeyAuth;
-import org.brapi.client.v21.auth.Authentication;
-import org.brapi.client.v21.auth.HttpBasicAuth;
-import org.brapi.client.v21.auth.OAuth;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
-import org.threeten.bp.format.DateTimeFormatter;
-
-import javax.net.ssl.*;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Type;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.SecureRandom;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.sql.Date;
-import java.text.DateFormat;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class ApiClient {
-
-    private String basePath = "https://test-server.brapi.org/brapi/v2";
-    private boolean debugging = false;
-    private final Map<String, String> defaultHeaderMap = new HashMap<>();
-    private String tempFolderPath = null;
-
-    private Map<String, Authentication> authentications;
-
-    private DateFormat dateFormat;
-    private DateFormat datetimeFormat;
-    private boolean lenientDatetimeFormat;
-    private int dateLength;
-
-    private InputStream sslCaCert;
-    private boolean verifyingSsl;
-    private KeyManager[] keyManagers;
-
-    private OkHttpClient httpClient;
-    private JSON json;
-
-    private HttpLoggingInterceptor loggingInterceptor;
-
-    /*
-     * Constructor for ApiClient
-     */
-    public ApiClient() {
-        httpClient = new OkHttpClient();
-
-
-        verifyingSsl = true;
-
-        json = new JSON();
-
-        // Set default User-Agent.
-        setUserAgent("Swagger-Codegen/1.0.0/java");
-
-        // Setup authentications (key: authentication name, value: authentication).
-        authentications = new HashMap<>();
-        authentications.put("AuthorizationToken", new OAuth());
-        // Prevent the authentications from being modified.
-        authentications = Collections.unmodifiableMap(authentications);
-    }
-
-    /**
-     * Get base path
-     *
-     * @return Baes path
-     */
-    public String getBasePath() {
-        return basePath;
-    }
-
-    /**
-     * Set base path
-     *
-     * @param basePath Base path of the URL (e.g https://test-server.brapi.org/brapi/v2
-     * @return An instance of OkHttpClient
-     */
-    public ApiClient setBasePath(String basePath) {
-        this.basePath = basePath;
-        return this;
-    }
-
-    /**
-     * Get HTTP client
-     *
-     * @return An instance of OkHttpClient
-     */
-    public OkHttpClient getHttpClient() {
-        return httpClient;
-    }
-
-    /**
-     * Set HTTP client
-     *
-     * @param httpClient An instance of OkHttpClient
-     * @return Api Client
-     */
-    public ApiClient setHttpClient(OkHttpClient httpClient) {
-        this.httpClient = httpClient;
-        return this;
-    }
-
-    /**
-     * Get JSON
-     *
-     * @return JSON object
-     */
-    public JSON getJSON() {
-        return json;
-    }
-
-    /**
-     * Set JSON
-     *
-     * @param json JSON object
-     * @return Api client
-     */
-    public ApiClient setJSON(JSON json) {
-        this.json = json;
-        return this;
-    }
-
-    /**
-     * True if isVerifyingSsl flag is on
-     *
-     * @return True if isVerifySsl flag is on
-     */
-    public boolean isVerifyingSsl() {
-        return verifyingSsl;
-    }
-
-    /**
-     * Configure whether to verify certificate and hostname when making https requests.
-     * Default to true.
-     * NOTE: Do NOT set to false in production code, otherwise you would face multiple types of cryptographic attacks.
-     *
-     * @param verifyingSsl True to verify TLS/SSL connection
-     * @return ApiClient
-     */
-    public ApiClient setVerifyingSsl(boolean verifyingSsl) {
-        this.verifyingSsl = verifyingSsl;
-        applySslSettings();
-        return this;
-    }
-
-    /**
-     * Get SSL CA cert.
-     *
-     * @return Input stream to the SSL CA cert
-     */
-    public InputStream getSslCaCert() {
-        return sslCaCert;
-    }
-
-    /**
-     * Configure the CA certificate to be trusted when making https requests.
-     * Use null to reset to default.
-     *
-     * @param sslCaCert input stream for SSL CA cert
-     * @return ApiClient
-     */
-    public ApiClient setSslCaCert(InputStream sslCaCert) {
-        this.sslCaCert = sslCaCert;
-        applySslSettings();
-        return this;
-    }
-
-    public KeyManager[] getKeyManagers() {
-        return keyManagers;
-    }
-
-    /**
-     * Configure client keys to use for authorization in an SSL session.
-     * Use null to reset to default.
-     *
-     * @param managers The KeyManagers to use
-     * @return ApiClient
-     */
-    public ApiClient setKeyManagers(KeyManager[] managers) {
-        this.keyManagers = managers;
-        applySslSettings();
-        return this;
-    }
-
-    public DateFormat getDateFormat() {
-        return dateFormat;
-    }
-
-    public ApiClient setDateFormat(DateFormat dateFormat) {
-        this.json.setDateFormat(dateFormat);
-        return this;
-    }
-
-    public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-        this.json.setSqlDateFormat(dateFormat);
-        return this;
-    }
-
-    public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        this.json.setOffsetDateTimeFormat(dateFormat);
-        return this;
-    }
-
-    public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-        this.json.setLocalDateFormat(dateFormat);
-        return this;
-    }
-
-    public ApiClient setLenientOnJson(boolean lenientOnJson) {
-        this.json.setLenientOnJson(lenientOnJson);
-        return this;
-    }
-
-    /**
-     * Get authentications (key: authentication name, value: authentication).
-     *
-     * @return Map of authentication objects
-     */
-    public Map<String, Authentication> getAuthentications() {
-        return authentications;
-    }
-
-    /**
-     * Get authentication for the given name.
-     *
-     * @param authName The authentication name
-     * @return The authentication, null if not found
-     */
-    public Authentication getAuthentication(String authName) {
-        return authentications.get(authName);
-    }
-
-    /**
-     * Helper method to set username for the first HTTP basic authentication.
-     *
-     * @param username Username
-     */
-    public void setUsername(String username) {
-        for (Authentication auth : authentications.values()) {
-            if (auth instanceof HttpBasicAuth) {
-                ((HttpBasicAuth) auth).setUsername(username);
-                return;
-            }
-        }
-        throw new RuntimeException("No HTTP basic authentication configured!");
-    }
-
-    /**
-     * Helper method to set password for the first HTTP basic authentication.
-     *
-     * @param password Password
-     */
-    public void setPassword(String password) {
-        for (Authentication auth : authentications.values()) {
-            if (auth instanceof HttpBasicAuth) {
-                ((HttpBasicAuth) auth).setPassword(password);
-                return;
-            }
-        }
-        throw new RuntimeException("No HTTP basic authentication configured!");
-    }
-
-    /**
-     * Helper method to set API key value for the first API key authentication.
-     *
-     * @param apiKey API key
-     */
-    public void setApiKey(String apiKey) {
-        for (Authentication auth : authentications.values()) {
-            if (auth instanceof ApiKeyAuth) {
-                ((ApiKeyAuth) auth).setApiKey(apiKey);
-                return;
-            }
-        }
-        throw new RuntimeException("No API key authentication configured!");
-    }
-
-    /**
-     * Helper method to set API key prefix for the first API key authentication.
-     *
-     * @param apiKeyPrefix API key prefix
-     */
-    public void setApiKeyPrefix(String apiKeyPrefix) {
-        for (Authentication auth : authentications.values()) {
-            if (auth instanceof ApiKeyAuth) {
-                ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix);
-                return;
-            }
-        }
-        throw new RuntimeException("No API key authentication configured!");
-    }
-
-    /**
-     * Helper method to set access token for the first OAuth2 authentication.
-     *
-     * @param accessToken Access token
-     */
-    public void setAccessToken(String accessToken) {
-        for (Authentication auth : authentications.values()) {
-            if (auth instanceof OAuth) {
-                ((OAuth) auth).setAccessToken(accessToken);
-                return;
-            }
-        }
-        throw new RuntimeException("No OAuth2 authentication configured!");
-    }
-
-    /**
-     * Set the User-Agent header's value (by adding to the default header map).
-     *
-     * @param userAgent HTTP request's user agent
-     * @return ApiClient
-     */
-    public ApiClient setUserAgent(String userAgent) {
-        addDefaultHeader("User-Agent", userAgent);
-        return this;
-    }
-
-    /**
-     * Add a default header.
-     *
-     * @param key   The header's key
-     * @param value The header's value
-     * @return ApiClient
-     */
-    public ApiClient addDefaultHeader(String key, String value) {
-        defaultHeaderMap.put(key, value);
-        return this;
-    }
-
-    /**
-     * Check that whether debugging is enabled for this API client.
-     *
-     * @return True if debugging is enabled, false otherwise.
-     */
-    public boolean isDebugging() {
-        return debugging;
-    }
-
-    /**
-     * Enable/disable debugging for this API client.
-     *
-     * @param debugging To enable (true) or disable (false) debugging
-     * @return ApiClient
-     */
-    public ApiClient setDebugging(boolean debugging) {
-        if (debugging != this.debugging) {
-            if (debugging) {
-                loggingInterceptor = new HttpLoggingInterceptor();
-                loggingInterceptor.setLevel(Level.BODY);
-                httpClient.interceptors().add(loggingInterceptor);
-            } else {
-                httpClient.interceptors().remove(loggingInterceptor);
-                loggingInterceptor = null;
-            }
-        }
-        this.debugging = debugging;
-        return this;
-    }
-
-    /**
-     * The path of temporary folder used to store downloaded files from endpoints
-     * with file response. The default value is <code>null</code>, i.e. using
-     * the system's default tempopary folder.
-     *
-     * @return Temporary folder path
-     * @see <a href="https://docs.oracle.com/javase/7/docs/api/java/io/File.html#createTempFile">createTempFile</a>
-     */
-    public String getTempFolderPath() {
-        return tempFolderPath;
-    }
-
-    /**
-     * Set the temporary folder path (for downloading files)
-     *
-     * @param tempFolderPath Temporary folder path
-     * @return ApiClient
-     */
-    public ApiClient setTempFolderPath(String tempFolderPath) {
-        this.tempFolderPath = tempFolderPath;
-        return this;
-    }
-
-    /**
-     * Get connection timeout (in milliseconds).
-     *
-     * @return Timeout in milliseconds
-     */
-    public int getConnectTimeout() {
-        return httpClient.getConnectTimeout();
-    }
-
-    /**
-     * Sets the connect timeout (in milliseconds).
-     * A value of 0 means no timeout, otherwise values must be between 1 and
-     *
-     * @param connectionTimeout connection timeout in milliseconds
-     * @return Api client
-     */
-    public ApiClient setConnectTimeout(int connectionTimeout) {
-        httpClient.setConnectTimeout(connectionTimeout, TimeUnit.MILLISECONDS);
-        return this;
-    }
-
-    /**
-     * Get read timeout (in milliseconds).
-     *
-     * @return Timeout in milliseconds
-     */
-    public int getReadTimeout() {
-        return httpClient.getReadTimeout();
-    }
-
-    /**
-     * Sets the read timeout (in milliseconds).
-     * A value of 0 means no timeout, otherwise values must be between 1 and
-     * {@link Integer#MAX_VALUE}.
-     *
-     * @param readTimeout read timeout in milliseconds
-     * @return Api client
-     */
-    public ApiClient setReadTimeout(int readTimeout) {
-        httpClient.setReadTimeout(readTimeout, TimeUnit.MILLISECONDS);
-        return this;
-    }
-
-    /**
-     * Get write timeout (in milliseconds).
-     *
-     * @return Timeout in milliseconds
-     */
-    public int getWriteTimeout() {
-        return httpClient.getWriteTimeout();
-    }
-
-    /**
-     * Sets the write timeout (in milliseconds).
-     * A value of 0 means no timeout, otherwise values must be between 1 and
-     * {@link Integer#MAX_VALUE}.
-     *
-     * @param writeTimeout connection timeout in milliseconds
-     * @return Api client
-     */
-    public ApiClient setWriteTimeout(int writeTimeout) {
-        httpClient.setWriteTimeout(writeTimeout, TimeUnit.MILLISECONDS);
-        return this;
-    }
-
-    /**
-     * Format the given parameter object into string.
-     *
-     * @param param Parameter
-     * @return String representation of the parameter
-     */
-    public String parameterToString(Object param) {
-        if (param == null) {
-            return "";
-        } else if (param instanceof Date || param instanceof OffsetDateTime || param instanceof LocalDate) {
-            //Serialize to json string and remove the " enclosing characters
-            String jsonStr = json.serialize(param);
-            return jsonStr.substring(1, jsonStr.length() - 1);
-        } else if (param instanceof Collection) {
-            StringBuilder b = new StringBuilder();
-            for (Object o : (Collection) param) {
-                if (b.length() > 0) {
-                    b.append(",");
-                }
-                b.append(o);
-            }
-            return b.toString();
-        } else {
-            return String.valueOf(param);
-        }
-    }
-
-    /**
-     * Formats the specified query parameter to a list containing a single {@code Pair} object.
-     * <p>
-     * Note that {@code value} must not be a collection.
-     *
-     * @param name  The name of the parameter.
-     * @param value The value of the parameter.
-     * @return A list containing a single {@code Pair} object.
-     */
-    public List<Pair> parameterToPair(String name, Object value) {
-        List<Pair> params = new ArrayList<>();
-
-        // preconditions
-        if (name == null || name.isEmpty() || value == null || value instanceof Collection) return params;
-
-        params.add(new Pair(name, parameterToString(value)));
-        return params;
-    }
-
-    /**
-     * Formats the specified collection query parameters to a list of {@code Pair} objects.
-     * <p>
-     * Note that the values of each of the returned Pair objects are percent-encoded.
-     *
-     * @param collectionFormat The collection format of the parameter.
-     * @param name             The name of the parameter.
-     * @param value            The value of the parameter.
-     * @return A list of {@code Pair} objects.
-     */
-    public List<Pair> parameterToPairs(String collectionFormat, String name, Collection value) {
-        List<Pair> params = new ArrayList<>();
-
-        // preconditions
-        if (name == null || name.isEmpty() || value == null || value.isEmpty()) {
-            return params;
-        }
-
-        // create the params based on the collection format
-        if ("multi".equals(collectionFormat)) {
-            for (Object item : value) {
-                params.add(new Pair(name, escapeString(parameterToString(item))));
-            }
-            return params;
-        }
-
-        // collectionFormat is assumed to be "csv" by default
-        String delimiter = ",";
-
-        // escape all delimiters except commas, which are URI reserved
-        // characters
-        if ("ssv".equals(collectionFormat)) {
-            delimiter = escapeString(" ");
-        } else if ("tsv".equals(collectionFormat)) {
-            delimiter = escapeString("\t");
-        } else if ("pipes".equals(collectionFormat)) {
-            delimiter = escapeString("|");
-        }
-
-        StringBuilder sb = new StringBuilder();
-        for (Object item : value) {
-            sb.append(delimiter);
-            sb.append(escapeString(parameterToString(item)));
-        }
-
-        params.add(new Pair(name, sb.substring(delimiter.length())));
-
-        return params;
-    }
-
-    /**
-     * Sanitize filename by removing path.
-     * e.g. ../../sun.gif becomes sun.gif
-     *
-     * @param filename The filename to be sanitized
-     * @return The sanitized filename
-     */
-    public String sanitizeFilename(String filename) {
-        return filename.replaceAll(".*[/\\\\]", "");
-    }
-
-    /**
-     * Check if the given MIME is a JSON MIME.
-     * JSON MIME examples:
-     * application/json
-     * application/json; charset=UTF8
-     * APPLICATION/JSON
-     * application/vnd.company+json
-     * "* / *" is also default to JSON
-     *
-     * @param mime MIME (Multipurpose Internet Mail Extensions)
-     * @return True if the given MIME is JSON, false otherwise.
-     */
-    public boolean isJsonMime(String mime) {
-        String jsonMime = "(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$";
-        return mime != null && (mime.matches(jsonMime) || mime.equals("*/*"));
-    }
-
-    /**
-     * Select the Accept header's value from the given accepts array:
-     * if JSON exists in the given array, use it;
-     * otherwise use all of them (joining into a string)
-     *
-     * @param accepts The accepts array to select from
-     * @return The Accept header to use. If the given array is empty,
-     * null will be returned (not to set the Accept header explicitly).
-     */
-    public String selectHeaderAccept(String[] accepts) {
-        if (accepts.length == 0) {
-            return null;
-        }
-        for (String accept : accepts) {
-            if (isJsonMime(accept)) {
-                return accept;
-            }
-        }
-        return StringUtil.join(accepts, ",");
-    }
-
-    /**
-     * Select the Content-Type header's value from the given array:
-     * if JSON exists in the given array, use it;
-     * otherwise use the first one of the array.
-     *
-     * @param contentTypes The Content-Type array to select from
-     * @return The Content-Type header to use. If the given array is empty,
-     * or matches "any", JSON will be used.
-     */
-    public String selectHeaderContentType(String[] contentTypes) {
-        if (contentTypes.length == 0 || contentTypes[0].equals("*/*")) {
-            return "application/json";
-        }
-        for (String contentType : contentTypes) {
-            if (isJsonMime(contentType)) {
-                return contentType;
-            }
-        }
-        return contentTypes[0];
-    }
-
-    /**
-     * Escape the given string to be used as URL query value.
-     *
-     * @param str String to be escaped
-     * @return Escaped string
-     */
-    public String escapeString(String str) {
-        try {
-            return URLEncoder.encode(str, "utf8").replaceAll("\\+", "%20");
-        } catch (UnsupportedEncodingException e) {
-            return str;
-        }
-    }
-
-    /**
-     * Deserialize response body to Java object, according to the return type and
-     * the Content-Type response header.
-     *
-     * @param <T>        Type
-     * @param response   HTTP response
-     * @param returnType The type of the Java object
-     * @return The deserialized Java object
-     * @throws ApiException If fail to deserialize response body, i.e. cannot read response body
-     *                      or the Content-Type of the response is not supported.
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T deserialize(Response response, Type returnType) throws ApiException {
-        if (response == null || returnType == null) {
-            return null;
-        }
-
-        if ("byte[]".equals(returnType.toString())) {
-            // Handle binary response (byte array).
-            try {
-                return (T) response.body().bytes();
-            } catch (IOException e) {
-                throw new ApiException(e);
-            }
-        } else if (returnType.equals(File.class)) {
-            // Handle file downloading.
-            return (T) downloadFileFromResponse(response);
-        }
-
-        String respBody;
-        try {
-            if (response.body() != null)
-                respBody = response.body().string();
-            else
-                respBody = null;
-        } catch (IOException e) {
-            throw new ApiException(e);
-        }
-
-        if (respBody == null || "".equals(respBody)) {
-            return null;
-        }
-
-        String contentType = response.headers().get("Content-Type");
-        if (contentType == null) {
-            // ensuring a default content type
-            contentType = "application/json";
-        }
-        if (isJsonMime(contentType)) {
-            return json.deserialize(respBody, returnType);
-        } else if (returnType.equals(String.class)) {
-            // Expecting string, return the raw response body.
-            return (T) respBody;
-        } else {
-            throw new ApiException(
-                    "Content type \"" + contentType + "\" is not supported for type: " + returnType,
-                    response.code(),
-                    response.headers().toMultimap(),
-                    respBody);
-        }
-    }
-
-    /**
-     * Serialize the given Java object into request body according to the object's
-     * class and the request Content-Type.
-     *
-     * @param obj         The Java object
-     * @param contentType The request Content-Type
-     * @return The serialized request body
-     * @throws ApiException If fail to serialize the given object
-     */
-    public RequestBody serialize(Object obj, String contentType) throws ApiException {
-        if (obj instanceof byte[]) {
-            // Binary (byte array) body parameter support.
-            return RequestBody.create(MediaType.parse(contentType), (byte[]) obj);
-        } else if (obj instanceof File) {
-            // File body parameter support.
-            return RequestBody.create(MediaType.parse(contentType), (File) obj);
-        } else if (isJsonMime(contentType)) {
-            String content;
-            if (obj != null) {
-                content = json.serialize(obj);
-            } else {
-                content = null;
-            }
-            return RequestBody.create(MediaType.parse(contentType), content);
-        } else {
-            throw new ApiException("Content type \"" + contentType + "\" is not supported");
-        }
-    }
-
-    /**
-     * Download file from the given response.
-     *
-     * @param response An instance of the Response object
-     * @return Downloaded file
-     * @throws ApiException If fail to read file content from response and write to disk
-     */
-    public File downloadFileFromResponse(Response response) throws ApiException {
-        try {
-            File file = prepareDownloadFile(response);
-            BufferedSink sink = Okio.buffer(Okio.sink(file));
-            sink.writeAll(response.body().source());
-            sink.close();
-            return file;
-        } catch (IOException e) {
-            throw new ApiException(e);
-        }
-    }
-
-    /**
-     * Prepare file for download
-     *
-     * @param response An instance of the Response object
-     * @return Prepared file for the download
-     * @throws IOException If fail to prepare file for download
-     */
-    public File prepareDownloadFile(Response response) throws IOException {
-        String filename = null;
-        String contentDisposition = response.header("Content-Disposition");
-        if (contentDisposition != null && !"".equals(contentDisposition)) {
-            // Get filename from the Content-Disposition header.
-            Pattern pattern = Pattern.compile("filename=['\"]?([^'\"\\s]+)['\"]?");
-            Matcher matcher = pattern.matcher(contentDisposition);
-            if (matcher.find()) {
-                filename = sanitizeFilename(matcher.group(1));
-            }
-        }
-
-        String prefix = null;
-        String suffix = null;
-        if (filename == null) {
-            prefix = "download-";
-            suffix = "";
-        } else {
-            int pos = filename.lastIndexOf(".");
-            if (pos == -1) {
-                prefix = filename + "-";
-            } else {
-                prefix = filename.substring(0, pos) + "-";
-                suffix = filename.substring(pos);
-            }
-            // File.createTempFile requires the prefix to be at least three characters long
-            if (prefix.length() < 3)
-                prefix = "download-";
-        }
-
-        if (tempFolderPath == null)
-            return Files.createTempFile(prefix, suffix).toFile();
-        else
-            return Files.createTempFile(Paths.get(tempFolderPath), prefix, suffix).toFile();
-    }
-
-    /**
-     * {@link #execute(Call, Type)}
-     *
-     * @param <T>  Type
-     * @param call An instance of the Call object
-     * @return ApiResponse&lt;T&gt;
-     * @throws ApiException If fail to execute the call
-     */
-    public <T> ApiResponse<T> execute(Call call) throws ApiException {
-        return execute(call, null);
-    }
-
-    /**
-     * Execute HTTP call and deserialize the HTTP response body into the given return type.
-     *
-     * @param returnType The return type used to deserialize HTTP response body
-     * @param <T>        The return type corresponding to (same with) returnType
-     * @param call       Call
-     * @return ApiResponse object containing response status, headers and
-     * data, which is a Java object deserialized from response body and would be null
-     * when returnType is null.
-     * @throws ApiException If fail to execute the call
-     */
-    public <T> ApiResponse<T> execute(Call call, Type returnType) throws ApiException {
-        try {
-            Response response = call.execute();
-            T data = handleResponse(response, returnType);
-            return new ApiResponse<>(response.code(), response.headers().toMultimap(), data);
-        } catch (IOException e) {
-            throw new ApiException(e);
-        }
-    }
-
-    /**
-     * {@link #executeAsync(Call, Type, ApiCallback)}
-     *
-     * @param <T>      Type
-     * @param call     An instance of the Call object
-     * @param callback ApiCallback&lt;T&gt;
-     */
-    public <T> void executeAsync(Call call, ApiCallback<T> callback) {
-        executeAsync(call, null, callback);
-    }
-
-    /**
-     * Execute HTTP call asynchronously.
-     *
-     * @param <T>        Type
-     * @param call       The callback to be executed when the API call finishes
-     * @param returnType Return type
-     * @param callback   ApiCallback
-     * @see #execute(Call, Type)
-     */
-    @SuppressWarnings("unchecked")
-    public <T> void executeAsync(Call call, final Type returnType, final ApiCallback<T> callback) {
-        call.enqueue(new Callback() {
-            @Override
-            public void onFailure(Request request, IOException e) {
-                callback.onFailure(new ApiException(e), 0, null);
-            }
-
-            @Override
-            public void onResponse(Response response) throws IOException {
-                T result;
-                try {
-                    result = handleResponse(response, returnType);
-                } catch (ApiException e) {
-                    callback.onFailure(e, response.code(), response.headers().toMultimap());
-                    return;
-                }
-                callback.onSuccess(result, response.code(), response.headers().toMultimap());
-            }
-        });
-    }
-
-    /**
-     * Handle the given response, return the deserialized object when the response is successful.
-     *
-     * @param <T>        Type
-     * @param response   Response
-     * @param returnType Return type
-     * @return Type
-     * @throws ApiException If the response has a unsuccessful status code or
-     *                      fail to deserialize the response body
-     */
-    public <T> T handleResponse(Response response, Type returnType) throws ApiException {
-        if (response.isSuccessful()) {
-            if (returnType == null || response.code() == 204) {
-                // returning null if the returnType is not defined,
-                // or the status code is 204 (No Content)
-                if (response.body() != null) {
-                    try {
-                        response.body().close();
-                    } catch (IOException e) {
-                        throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
-                    }
-                }
-                return null;
-            } else {
-                return deserialize(response, returnType);
-            }
-        } else {
-            String respBody = null;
-            if (response.body() != null) {
-                try {
-                    respBody = response.body().string();
-                } catch (IOException e) {
-                    throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
-                }
-            }
-            throw new ApiException(response.message(), response.code(), response.headers().toMultimap(), respBody);
-        }
-    }
-
-    /**
-     * Build HTTP call with the given options.
-     *
-     * @param path                    The sub-path of the HTTP URL
-     * @param method                  The request method, one of "GET", "HEAD", "OPTIONS", "POST", "PUT", "PATCH" and "DELETE"
-     * @param queryParams             The query parameters
-     * @param collectionQueryParams   The collection query parameters
-     * @param body                    The request body object
-     * @param headerParams            The header parameters
-     * @param formParams              The form parameters
-     * @param authNames               The authentications to apply
-     * @param progressRequestListener Progress request listener
-     * @return The HTTP call
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public Call buildCall(String path, String method, List<Pair> queryParams, List<Pair> collectionQueryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String[] authNames, ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Request request = buildRequest(path, method, queryParams, collectionQueryParams, body, headerParams, formParams, authNames, progressRequestListener);
-
-        return httpClient.newCall(request);
-    }
-
-    /**
-     * Build an HTTP request with the given options.
-     *
-     * @param path                    The sub-path of the HTTP URL
-     * @param method                  The request method, one of "GET", "HEAD", "OPTIONS", "POST", "PUT", "PATCH" and "DELETE"
-     * @param queryParams             The query parameters
-     * @param collectionQueryParams   The collection query parameters
-     * @param body                    The request body object
-     * @param headerParams            The header parameters
-     * @param formParams              The form parameters
-     * @param authNames               The authentications to apply
-     * @param progressRequestListener Progress request listener
-     * @return The HTTP request
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public Request buildRequest(String path, String method, List<Pair> queryParams, List<Pair> collectionQueryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String[] authNames, ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        updateParamsForAuth(authNames, queryParams, headerParams);
-
-        final String url = buildUrl(path, queryParams, collectionQueryParams);
-        final Request.Builder reqBuilder = new Request.Builder().url(url);
-        processHeaderParams(headerParams, reqBuilder);
-
-        String contentType = headerParams.get("Content-Type");
-        // ensuring a default content type
-        if (contentType == null) {
-            contentType = "application/json";
-        }
-
-        RequestBody reqBody;
-        if (!HttpMethod.permitsRequestBody(method)) {
-            reqBody = null;
-        } else if ("application/x-www-form-urlencoded".equals(contentType)) {
-            reqBody = buildRequestBodyFormEncoding(formParams);
-        } else if ("multipart/form-data".equals(contentType)) {
-            reqBody = buildRequestBodyMultipart(formParams);
-        } else if (body == null) {
-            if ("DELETE".equals(method)) {
-                // allow calling DELETE without sending a request body
-                reqBody = null;
-            } else {
-                // use an empty request body (for POST, PUT and PATCH)
-                reqBody = RequestBody.create(MediaType.parse(contentType), "");
-            }
-        } else {
-            reqBody = serialize(body, contentType);
-        }
-
-        Request request = null;
-
-        if (progressRequestListener != null && reqBody != null) {
-            ProgressRequestBody progressRequestBody = new ProgressRequestBody(reqBody, progressRequestListener);
-            request = reqBuilder.method(method, progressRequestBody).build();
-        } else {
-            request = reqBuilder.method(method, reqBody).build();
-        }
-
-        return request;
-    }
-
-    /**
-     * Build full URL by concatenating base path, the given sub path and query parameters.
-     *
-     * @param path                  The sub path
-     * @param queryParams           The query parameters
-     * @param collectionQueryParams The collection query parameters
-     * @return The full URL
-     */
-    public String buildUrl(String path, List<Pair> queryParams, List<Pair> collectionQueryParams) {
-        final StringBuilder url = new StringBuilder();
-        url.append(basePath).append(path);
-
-        if (queryParams != null && !queryParams.isEmpty()) {
-            // support (constant) query string in `path`, e.g. "/posts?draft=1"
-            String prefix = path.contains("?") ? "&" : "?";
-            for (Pair param : queryParams) {
-                if (param.getValue() != null) {
-                    if (prefix != null) {
-                        url.append(prefix);
-                        prefix = null;
-                    } else {
-                        url.append("&");
-                    }
-                    String value = parameterToString(param.getValue());
-                    url.append(escapeString(param.getName())).append("=").append(escapeString(value));
-                }
-            }
-        }
-
-        if (collectionQueryParams != null && !collectionQueryParams.isEmpty()) {
-            String prefix = url.toString().contains("?") ? "&" : "?";
-            for (Pair param : collectionQueryParams) {
-                if (param.getValue() != null) {
-                    if (prefix != null) {
-                        url.append(prefix);
-                        prefix = null;
-                    } else {
-                        url.append("&");
-                    }
-                    String value = parameterToString(param.getValue());
-                    // collection query parameter value already escaped as part of parameterToPairs
-                    url.append(escapeString(param.getName())).append("=").append(value);
-                }
-            }
-        }
-
-        return url.toString();
-    }
-
-    /**
-     * Set header parameters to the request builder, including default headers.
-     *
-     * @param headerParams Header parameters in the ofrm of Map
-     * @param reqBuilder   Reqeust.Builder
-     */
-    public void processHeaderParams(Map<String, String> headerParams, Request.Builder reqBuilder) {
-        for (Entry<String, String> param : headerParams.entrySet()) {
-            reqBuilder.header(param.getKey(), parameterToString(param.getValue()));
-        }
-        for (Entry<String, String> header : defaultHeaderMap.entrySet()) {
-            if (!headerParams.containsKey(header.getKey())) {
-                reqBuilder.header(header.getKey(), parameterToString(header.getValue()));
-            }
-        }
-    }
-
-    /**
-     * Update query and header parameters based on authentication settings.
-     *
-     * @param authNames    The authentications to apply
-     * @param queryParams  List of query parameters
-     * @param headerParams Map of header parameters
-     */
-    public void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams) {
-        for (String authName : authNames) {
-            Authentication auth = authentications.get(authName);
-            if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
-            auth.applyToParams(queryParams, headerParams);
-        }
-    }
-
-    /**
-     * Build a form-encoding request body with the given form parameters.
-     *
-     * @param formParams Form parameters in the form of Map
-     * @return RequestBody
-     */
-    public RequestBody buildRequestBodyFormEncoding(Map<String, Object> formParams) {
-        FormEncodingBuilder formBuilder = new FormEncodingBuilder();
-        for (Entry<String, Object> param : formParams.entrySet()) {
-            formBuilder.add(param.getKey(), parameterToString(param.getValue()));
-        }
-        return formBuilder.build();
-    }
-
-    /**
-     * Build a multipart (file uploading) request body with the given form parameters,
-     * which could contain text fields and file fields.
-     *
-     * @param formParams Form parameters in the form of Map
-     * @return RequestBody
-     */
-    public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) {
-        MultipartBuilder mpBuilder = new MultipartBuilder().type(MultipartBuilder.FORM);
-        for (Entry<String, Object> param : formParams.entrySet()) {
-            if (param.getValue() instanceof File) {
-                File file = (File) param.getValue();
-                Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"; filename=\"" + file.getName() + "\"");
-                MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
-                mpBuilder.addPart(partHeaders, RequestBody.create(mediaType, file));
-            } else {
-                Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"");
-                mpBuilder.addPart(partHeaders, RequestBody.create(null, parameterToString(param.getValue())));
-            }
-        }
-        return mpBuilder.build();
-    }
-
-    /**
-     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
-     *
-     * @param file The given file
-     * @return The guessed Content-Type
-     */
-    public String guessContentTypeFromFile(File file) {
-        String contentType = URLConnection.guessContentTypeFromName(file.getName());
-        if (contentType == null) {
-            return "application/octet-stream";
-        } else {
-            return contentType;
-        }
-    }
-
-    /**
-     * Apply SSL related settings to httpClient according to the current values of
-     * verifyingSsl and sslCaCert.
-     */
-    private void applySslSettings() {
-        try {
-            TrustManager[] trustManagers = null;
-            HostnameVerifier hostnameVerifier = null;
-            if (!verifyingSsl) {
-                TrustManager trustAll = new X509TrustManager() {
-                    @Override
-                    public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
-                    }
-
-                    @Override
-                    public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
-                    }
-
-                    @Override
-                    public X509Certificate[] getAcceptedIssuers() {
-                        return null;
-                    }
-                };
-                SSLContext sslContext = SSLContext.getInstance("TLS");
-                trustManagers = new TrustManager[]{trustAll};
-                hostnameVerifier = (hostname, session) -> true;
-            } else if (sslCaCert != null) {
-                char[] password = null; // Any password will work.
-                CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
-                Collection<? extends Certificate> certificates = certificateFactory.generateCertificates(sslCaCert);
-                if (certificates.isEmpty()) {
-                    throw new IllegalArgumentException("expected non-empty set of trusted certificates");
-                }
-                KeyStore caKeyStore = newEmptyKeyStore(password);
-                int index = 0;
-                for (Certificate certificate : certificates) {
-                    String certificateAlias = "ca" + index++;
-                    caKeyStore.setCertificateEntry(certificateAlias, certificate);
-                }
-                TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-                trustManagerFactory.init(caKeyStore);
-                trustManagers = trustManagerFactory.getTrustManagers();
-            }
-
-            if (keyManagers != null || trustManagers != null) {
-                SSLContext sslContext = SSLContext.getInstance("TLS");
-                sslContext.init(keyManagers, trustManagers, new SecureRandom());
-                httpClient.setSslSocketFactory(sslContext.getSocketFactory());
-            } else {
-                httpClient.setSslSocketFactory(null);
-            }
-            httpClient.setHostnameVerifier(hostnameVerifier);
-        } catch (GeneralSecurityException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private KeyStore newEmptyKeyStore(char[] password) throws GeneralSecurityException {
-        try {
-            KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-            keyStore.load(null, password);
-            return keyStore;
-        } catch (IOException e) {
-            throw new AssertionError(e);
-        }
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ApiException.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ApiException.java
deleted file mode 100644
index e44fb5a6..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ApiException.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21;
-
-import java.util.List;
-import java.util.Map;
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ApiException extends Exception {
-    private int code = 0;
-    private Map<String, List<String>> responseHeaders = null;
-    private String responseBody = null;
-
-    public ApiException() {
-    }
-
-    public ApiException(Throwable throwable) {
-        super(throwable);
-    }
-
-    public ApiException(String message) {
-        super(message);
-    }
-
-    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        super(message, throwable);
-        this.code = code;
-        this.responseHeaders = responseHeaders;
-        this.responseBody = responseBody;
-    }
-
-    public ApiException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this(message, (Throwable) null, code, responseHeaders, responseBody);
-    }
-
-    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders) {
-        this(message, throwable, code, responseHeaders, null);
-    }
-
-    public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
-    }
-
-    public ApiException(int code, String message) {
-        super(message);
-        this.code = code;
-    }
-
-    public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
-        this(code, message);
-        this.responseHeaders = responseHeaders;
-        this.responseBody = responseBody;
-    }
-
-    /**
-     * Get the HTTP status code.
-     *
-     * @return HTTP status code
-     */
-    public int getCode() {
-        return code;
-    }
-
-    /**
-     * Get the HTTP response headers.
-     *
-     * @return A map of list of string
-     */
-    public Map<String, List<String>> getResponseHeaders() {
-        return responseHeaders;
-    }
-
-    /**
-     * Get the HTTP response body.
-     *
-     * @return Response body in the form of string
-     */
-    public String getResponseBody() {
-        return responseBody;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ApiResponse.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ApiResponse.java
deleted file mode 100644
index a0d73517..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ApiResponse.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * API response returned by API call.
- *
- * @param <T> The type of data that is deserialized from response body
- */
-public class ApiResponse<T> {
-    final private int statusCode;
-    final private Map<String, List<String>> headers;
-    final private T data;
-
-    /**
-     * @param statusCode The status code of HTTP response
-     * @param headers    The headers of HTTP response
-     */
-    public ApiResponse(int statusCode, Map<String, List<String>> headers) {
-        this(statusCode, headers, null);
-    }
-
-    /**
-     * @param statusCode The status code of HTTP response
-     * @param headers    The headers of HTTP response
-     * @param data       The object deserialized from response bod
-     */
-    public ApiResponse(int statusCode, Map<String, List<String>> headers, T data) {
-        this.statusCode = statusCode;
-        this.headers = headers;
-        this.data = data;
-    }
-
-    public int getStatusCode() {
-        return statusCode;
-    }
-
-    public Map<String, List<String>> getHeaders() {
-        return headers;
-    }
-
-    public T getData() {
-        return data;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/Configuration.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/Configuration.java
deleted file mode 100644
index e30d07cf..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/Configuration.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21;
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Configuration {
-    private static ApiClient defaultApiClient = new ApiClient();
-
-    /**
-     * Get the default API client, which would be used when creating API
-     * instances without providing an API client.
-     *
-     * @return Default API client
-     */
-    public static ApiClient getDefaultApiClient() {
-        return defaultApiClient;
-    }
-
-    /**
-     * Set the default API client, which would be used when creating API
-     * instances without providing an API client.
-     *
-     * @param apiClient API client
-     */
-    public static void setDefaultApiClient(ApiClient apiClient) {
-        defaultApiClient = apiClient;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/GzipRequestInterceptor.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/GzipRequestInterceptor.java
deleted file mode 100644
index dbab71ec..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/GzipRequestInterceptor.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21;
-
-import com.squareup.okhttp.*;
-import okio.Buffer;
-import okio.BufferedSink;
-import okio.GzipSink;
-import okio.Okio;
-
-import java.io.IOException;
-
-/**
- * Encodes request bodies using gzip.
- * <p>
- * Taken from https://github.com/square/okhttp/issues/350
- */
-class GzipRequestInterceptor implements Interceptor {
-    @Override
-    public Response intercept(Chain chain) throws IOException {
-        Request originalRequest = chain.request();
-        if (originalRequest.body() == null || originalRequest.header("Content-Encoding") != null) {
-            return chain.proceed(originalRequest);
-        }
-
-        Request compressedRequest = originalRequest.newBuilder()
-                .header("Content-Encoding", "gzip")
-                .method(originalRequest.method(), forceContentLength(gzip(originalRequest.body())))
-                .build();
-        return chain.proceed(compressedRequest);
-    }
-
-    private RequestBody forceContentLength(final RequestBody requestBody) throws IOException {
-        final Buffer buffer = new Buffer();
-        requestBody.writeTo(buffer);
-        return new RequestBody() {
-            @Override
-            public MediaType contentType() {
-                return requestBody.contentType();
-            }
-
-            @Override
-            public long contentLength() {
-                return buffer.size();
-            }
-
-            @Override
-            public void writeTo(BufferedSink sink) throws IOException {
-                sink.write(buffer.snapshot());
-            }
-        };
-    }
-
-    private RequestBody gzip(final RequestBody body) {
-        return new RequestBody() {
-            @Override
-            public MediaType contentType() {
-                return body.contentType();
-            }
-
-            @Override
-            public long contentLength() {
-                return -1; // We don't know the compressed length in advance!
-            }
-
-            @Override
-            public void writeTo(BufferedSink sink) throws IOException {
-                BufferedSink gzipSink = Okio.buffer(new GzipSink(sink));
-                body.writeTo(gzipSink);
-                gzipSink.close();
-            }
-        };
-    }
-}
\ No newline at end of file
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/JSON.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/JSON.java
deleted file mode 100644
index b4e808d0..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/JSON.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21;
-
-import com.google.gson.*;
-import com.google.gson.internal.bind.util.ISO8601Utils;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonToken;
-import com.google.gson.stream.JsonWriter;
-import io.gsonfire.GsonFireBuilder;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
-import org.threeten.bp.format.DateTimeFormatter;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.lang.reflect.Type;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.ParsePosition;
-import java.util.Date;
-import java.util.Map;
-
-public class JSON {
-    private Gson gson;
-    private boolean isLenientOnJson = false;
-    private final DateTypeAdapter dateTypeAdapter = new DateTypeAdapter();
-    private final SqlDateTypeAdapter sqlDateTypeAdapter = new SqlDateTypeAdapter();
-    private final OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new OffsetDateTimeTypeAdapter();
-    private final LocalDateTypeAdapter localDateTypeAdapter = new LocalDateTypeAdapter();
-
-    public static GsonBuilder createGson() {
-        GsonFireBuilder fireBuilder = new GsonFireBuilder();
-        return fireBuilder.createGsonBuilder();
-    }
-
-    private static String getDiscriminatorValue(JsonElement readElement, String discriminatorField) {
-        JsonElement element = readElement.getAsJsonObject().get(discriminatorField);
-        if (null == element) {
-            throw new IllegalArgumentException("missing discriminator field: <" + discriminatorField + ">");
-        }
-        return element.getAsString();
-    }
-
-    private static <T> Class<? extends T> getClassByDiscriminator(Map<String, Class<? extends T>> classByDiscriminatorValue, String discriminatorValue) {
-        Class<? extends T> clazz = classByDiscriminatorValue.get(discriminatorValue.toUpperCase());
-        if (null == clazz) {
-            throw new IllegalArgumentException("cannot determine model class of name: <" + discriminatorValue + ">");
-        }
-        return clazz;
-    }
-
-    public JSON() {
-        gson = createGson()
-                .registerTypeAdapter(Date.class, dateTypeAdapter)
-                .registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter)
-                .registerTypeAdapter(OffsetDateTime.class, offsetDateTimeTypeAdapter)
-                .registerTypeAdapter(LocalDate.class, localDateTypeAdapter)
-                .create();
-    }
-
-    /**
-     * Get Gson.
-     *
-     * @return Gson
-     */
-    public Gson getGson() {
-        return gson;
-    }
-
-    /**
-     * Set Gson.
-     *
-     * @param gson Gson
-     * @return JSON
-     */
-    public JSON setGson(Gson gson) {
-        this.gson = gson;
-        return this;
-    }
-
-    public JSON setLenientOnJson(boolean lenientOnJson) {
-        isLenientOnJson = lenientOnJson;
-        return this;
-    }
-
-    /**
-     * Serialize the given Java object into JSON string.
-     *
-     * @param obj Object
-     * @return String representation of the JSON
-     */
-    public String serialize(Object obj) {
-        return gson.toJson(obj);
-    }
-
-    /**
-     * Deserialize the given JSON string to Java object.
-     *
-     * @param <T>        Type
-     * @param body       The JSON string
-     * @param returnType The type to deserialize into
-     * @return The deserialized Java object
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T deserialize(String body, Type returnType) {
-        try {
-            if (isLenientOnJson) {
-                JsonReader jsonReader = new JsonReader(new StringReader(body));
-                // see https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)
-                jsonReader.setLenient(true);
-                return gson.fromJson(jsonReader, returnType);
-            } else {
-                return gson.fromJson(body, returnType);
-            }
-        } catch (JsonParseException e) {
-            // Fallback processing when failed to parse JSON form response body:
-            // return the response body string directly for the String return type;
-            if (returnType.equals(String.class))
-                return (T) body;
-            else throw (e);
-        }
-    }
-
-    /**
-     * Gson TypeAdapter for JSR310 OffsetDateTime type
-     */
-    public static class OffsetDateTimeTypeAdapter extends TypeAdapter<OffsetDateTime> {
-
-        private DateTimeFormatter formatter;
-
-        public OffsetDateTimeTypeAdapter() {
-            this(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
-        }
-
-        public OffsetDateTimeTypeAdapter(DateTimeFormatter formatter) {
-            this.formatter = formatter;
-        }
-
-        public void setFormat(DateTimeFormatter dateFormat) {
-            this.formatter = dateFormat;
-        }
-
-        @Override
-        public void write(JsonWriter out, OffsetDateTime date) throws IOException {
-            if (date == null) {
-                out.nullValue();
-            } else {
-                out.value(formatter.format(date));
-            }
-        }
-
-        @Override
-        public OffsetDateTime read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
-            String date = in.nextString();
-            if (date.endsWith("+0000")) {
-                date = date.substring(0, date.length() - 5) + "Z";
-            }
-            return OffsetDateTime.parse(date, formatter);
-        }
-    }
-
-    /**
-     * Gson TypeAdapter for JSR310 LocalDate type
-     */
-    public class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
-
-        private DateTimeFormatter formatter;
-
-        public LocalDateTypeAdapter() {
-            this(DateTimeFormatter.ISO_LOCAL_DATE);
-        }
-
-        public LocalDateTypeAdapter(DateTimeFormatter formatter) {
-            this.formatter = formatter;
-        }
-
-        public void setFormat(DateTimeFormatter dateFormat) {
-            this.formatter = dateFormat;
-        }
-
-        @Override
-        public void write(JsonWriter out, LocalDate date) throws IOException {
-            if (date == null) {
-                out.nullValue();
-            } else {
-                out.value(formatter.format(date));
-            }
-        }
-
-        @Override
-        public LocalDate read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
-            String date = in.nextString();
-            return LocalDate.parse(date, formatter);
-        }
-    }
-
-    public JSON setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-        offsetDateTimeTypeAdapter.setFormat(dateFormat);
-        return this;
-    }
-
-    public JSON setLocalDateFormat(DateTimeFormatter dateFormat) {
-        localDateTypeAdapter.setFormat(dateFormat);
-        return this;
-    }
-
-    /**
-     * Gson TypeAdapter for java.sql.Date type
-     * If the dateFormat is null, a simple "yyyy-MM-dd" format will be used
-     * (more efficient than SimpleDateFormat).
-     */
-    public static class SqlDateTypeAdapter extends TypeAdapter<java.sql.Date> {
-
-        private DateFormat dateFormat;
-
-        public SqlDateTypeAdapter() {
-        }
-
-        public SqlDateTypeAdapter(DateFormat dateFormat) {
-            this.dateFormat = dateFormat;
-        }
-
-        public void setFormat(DateFormat dateFormat) {
-            this.dateFormat = dateFormat;
-        }
-
-        @Override
-        public void write(JsonWriter out, java.sql.Date date) throws IOException {
-            if (date == null) {
-                out.nullValue();
-            } else {
-                String value;
-                if (dateFormat != null) {
-                    value = dateFormat.format(date);
-                } else {
-                    value = date.toString();
-                }
-                out.value(value);
-            }
-        }
-
-        @Override
-        public java.sql.Date read(JsonReader in) throws IOException {
-            if (in.peek() == JsonToken.NULL) {
-                in.nextNull();
-                return null;
-            }
-            String date = in.nextString();
-            try {
-                if (dateFormat != null) {
-                    return new java.sql.Date(dateFormat.parse(date).getTime());
-                }
-                return new java.sql.Date(ISO8601Utils.parse(date, new ParsePosition(0)).getTime());
-            } catch (ParseException e) {
-                throw new JsonParseException(e);
-            }
-        }
-    }
-
-    /**
-     * Gson TypeAdapter for java.util.Date type
-     * If the dateFormat is null, ISO8601Utils will be used.
-     */
-    public static class DateTypeAdapter extends TypeAdapter<Date> {
-
-        private DateFormat dateFormat;
-
-        public DateTypeAdapter() {
-        }
-
-        public DateTypeAdapter(DateFormat dateFormat) {
-            this.dateFormat = dateFormat;
-        }
-
-        public void setFormat(DateFormat dateFormat) {
-            this.dateFormat = dateFormat;
-        }
-
-        @Override
-        public void write(JsonWriter out, Date date) throws IOException {
-            if (date == null) {
-                out.nullValue();
-            } else {
-                String value;
-                if (dateFormat != null) {
-                    value = dateFormat.format(date);
-                } else {
-                    value = ISO8601Utils.format(date, true);
-                }
-                out.value(value);
-            }
-        }
-
-        @Override
-        public Date read(JsonReader in) throws IOException {
-            try {
-                if (in.peek() == JsonToken.NULL) {
-                    in.nextNull();
-                    return null;
-                }
-                String date = in.nextString();
-                try {
-                    if (dateFormat != null) {
-                        return dateFormat.parse(date);
-                    }
-                    return ISO8601Utils.parse(date, new ParsePosition(0));
-                } catch (ParseException e) {
-                    throw new JsonParseException(e);
-                }
-            } catch (IllegalArgumentException e) {
-                throw new JsonParseException(e);
-            }
-        }
-    }
-
-    public JSON setDateFormat(DateFormat dateFormat) {
-        dateTypeAdapter.setFormat(dateFormat);
-        return this;
-    }
-
-    public JSON setSqlDateFormat(DateFormat dateFormat) {
-        sqlDateTypeAdapter.setFormat(dateFormat);
-        return this;
-    }
-
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/Pair.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/Pair.java
deleted file mode 100644
index f3c0a5bf..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/Pair.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21;
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Pair {
-    private String name = "";
-    private String value = "";
-
-    public Pair(String name, String value) {
-        setName(name);
-        setValue(value);
-    }
-
-    private void setName(String name) {
-        if (!isValidString(name)) return;
-
-        this.name = name;
-    }
-
-    private void setValue(String value) {
-        if (!isValidString(value)) return;
-
-        this.value = value;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public String getValue() {
-        return this.value;
-    }
-
-    private boolean isValidString(String arg) {
-        if (arg == null) return false;
-        if (arg.trim().isEmpty()) return false;
-
-        return true;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ProgressRequestBody.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ProgressRequestBody.java
deleted file mode 100644
index 6a516e7b..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ProgressRequestBody.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21;
-
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.RequestBody;
-import okio.*;
-
-import java.io.IOException;
-
-public class ProgressRequestBody extends RequestBody {
-
-    public interface ProgressRequestListener {
-        void onRequestProgress(long bytesWritten, long contentLength, boolean done);
-    }
-
-    private final RequestBody requestBody;
-
-    private final ProgressRequestListener progressListener;
-
-    public ProgressRequestBody(RequestBody requestBody, ProgressRequestListener progressListener) {
-        this.requestBody = requestBody;
-        this.progressListener = progressListener;
-    }
-
-    @Override
-    public MediaType contentType() {
-        return requestBody.contentType();
-    }
-
-    @Override
-    public long contentLength() throws IOException {
-        return requestBody.contentLength();
-    }
-
-    @Override
-    public void writeTo(BufferedSink sink) throws IOException {
-        BufferedSink bufferedSink = Okio.buffer(sink(sink));
-        requestBody.writeTo(bufferedSink);
-        bufferedSink.flush();
-    }
-
-    private Sink sink(Sink sink) {
-        return new ForwardingSink(sink) {
-
-            long bytesWritten = 0L;
-            long contentLength = 0L;
-
-            @Override
-            public void write(Buffer source, long byteCount) throws IOException {
-                super.write(source, byteCount);
-                if (contentLength == 0) {
-                    contentLength = contentLength();
-                }
-
-                bytesWritten += byteCount;
-                progressListener.onRequestProgress(bytesWritten, contentLength, bytesWritten == contentLength);
-            }
-        };
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ProgressResponseBody.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ProgressResponseBody.java
deleted file mode 100644
index 574fe570..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/ProgressResponseBody.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21;
-
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.ResponseBody;
-import okio.*;
-
-import java.io.IOException;
-
-public class ProgressResponseBody extends ResponseBody {
-
-    public interface ProgressListener {
-        void update(long bytesRead, long contentLength, boolean done);
-    }
-
-    private final ResponseBody responseBody;
-    private final ProgressListener progressListener;
-    private BufferedSource bufferedSource;
-
-    public ProgressResponseBody(ResponseBody responseBody, ProgressListener progressListener) {
-        this.responseBody = responseBody;
-        this.progressListener = progressListener;
-    }
-
-    @Override
-    public MediaType contentType() {
-        return responseBody.contentType();
-    }
-
-    @Override
-    public long contentLength() throws IOException {
-        return responseBody.contentLength();
-    }
-
-    @Override
-    public BufferedSource source() throws IOException {
-        if (bufferedSource == null) {
-            bufferedSource = Okio.buffer(source(responseBody.source()));
-        }
-        return bufferedSource;
-    }
-
-    private Source source(Source source) {
-        return new ForwardingSource(source) {
-            long totalBytesRead = 0L;
-
-            @Override
-            public long read(Buffer sink, long byteCount) throws IOException {
-                long bytesRead = super.read(sink, byteCount);
-                // read() returns the number of bytes read, or -1 if this source is exhausted.
-                totalBytesRead += bytesRead != -1 ? bytesRead : 0;
-                progressListener.update(totalBytesRead, responseBody.contentLength(), bytesRead == -1);
-                return bytesRead;
-            }
-        };
-    }
-}
-
-
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/StringUtil.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/StringUtil.java
deleted file mode 100644
index bee8609e..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/StringUtil.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21;
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class StringUtil {
-    /**
-     * Check if the given array contains the given value (with case-insensitive comparison).
-     *
-     * @param array The array
-     * @param value The value to search
-     * @return true if the array contains the value
-     */
-    public static boolean containsIgnoreCase(String[] array, String value) {
-        for (String str : array) {
-            if (value == null && str == null) return true;
-            if (value != null && value.equalsIgnoreCase(str)) return true;
-        }
-        return false;
-    }
-
-    /**
-     * Join an array of strings with the given separator.
-     * <p>
-     * Note: This might be replaced by utility method from commons-lang or guava someday
-     * if one of those libraries is added as dependency.
-     * </p>
-     *
-     * @param array     The array of strings
-     * @param separator The separator
-     * @return the resulting string
-     */
-    public static String join(String[] array, String separator) {
-        int len = array.length;
-        if (len == 0) return "";
-
-        StringBuilder out = new StringBuilder();
-        out.append(array[0]);
-        for (int i = 1; i < len; i++) {
-            out.append(separator).append(array[i]);
-        }
-        return out.toString();
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/ApiKeyAuth.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/ApiKeyAuth.java
deleted file mode 100644
index 45390b28..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/ApiKeyAuth.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.auth;
-
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ApiKeyAuth implements Authentication {
-    private final String location;
-    private final String paramName;
-
-    private String apiKey;
-    private String apiKeyPrefix;
-
-    public ApiKeyAuth(String location, String paramName) {
-        this.location = location;
-        this.paramName = paramName;
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public String getParamName() {
-        return paramName;
-    }
-
-    public String getApiKey() {
-        return apiKey;
-    }
-
-    public void setApiKey(String apiKey) {
-        this.apiKey = apiKey;
-    }
-
-    public String getApiKeyPrefix() {
-        return apiKeyPrefix;
-    }
-
-    public void setApiKeyPrefix(String apiKeyPrefix) {
-        this.apiKeyPrefix = apiKeyPrefix;
-    }
-
-    @Override
-    public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
-        if (apiKey == null) {
-            return;
-        }
-        String value;
-        if (apiKeyPrefix != null) {
-            value = apiKeyPrefix + " " + apiKey;
-        } else {
-            value = apiKey;
-        }
-        if ("query".equals(location)) {
-            queryParams.add(new Pair(paramName, value));
-        } else if ("header".equals(location)) {
-            headerParams.put(paramName, value);
-        }
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/Authentication.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/Authentication.java
deleted file mode 100644
index 3f0efa63..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/Authentication.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.auth;
-
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-public interface Authentication {
-    /**
-     * Apply authentication settings to header and query params.
-     *
-     * @param queryParams  List of query parameters
-     * @param headerParams Map of header parameters
-     */
-    void applyToParams(List<Pair> queryParams, Map<String, String> headerParams);
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/HttpBasicAuth.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/HttpBasicAuth.java
deleted file mode 100644
index ad698762..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/HttpBasicAuth.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.auth;
-
-import com.squareup.okhttp.Credentials;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-public class HttpBasicAuth implements Authentication {
-    private String username;
-    private String password;
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    @Override
-    public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
-        if (username == null && password == null) {
-            return;
-        }
-        headerParams.put("Authorization", Credentials.basic(
-                username == null ? "" : username,
-                password == null ? "" : password));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/OAuth.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/OAuth.java
deleted file mode 100644
index e297d3ee..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/OAuth.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.auth;
-
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class OAuth implements Authentication {
-    private String accessToken;
-
-    public String getAccessToken() {
-        return accessToken;
-    }
-
-    public void setAccessToken(String accessToken) {
-        this.accessToken = accessToken;
-    }
-
-    @Override
-    public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
-        if (accessToken != null) {
-            headerParams.put("Authorization", "Bearer " + accessToken);
-        }
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/OAuthFlow.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/OAuthFlow.java
deleted file mode 100644
index e1f6abc5..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/auth/OAuthFlow.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.auth;
-
-public enum OAuthFlow {
-    accessCode, implicit, password, application
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/BrAPIRequest.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/BrAPIRequest.java
deleted file mode 100644
index 6a764d22..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/BrAPIRequest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model;
-
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Singular;
-
-import java.util.Map;
-
-@Getter
-@Builder
-public class BrAPIRequest {
-    private final String target;
-    @Singular
-    private final Map<String, String> parameters;
-    private final Object data;
-    private final String contentType;
-    private final HttpMethod method;
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/HttpMethod.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/HttpMethod.java
deleted file mode 100644
index 394e5089..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/HttpMethod.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model;
-
-public enum HttpMethod {
-    GET, POST, PUT, DELETE
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/exceptions/ApiException.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/exceptions/ApiException.java
deleted file mode 100644
index 091cb603..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/exceptions/ApiException.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/URL_Structure.md\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Response_Structure.md\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Date_Time_Encoding.md\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Location_Encoding.md\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Error_Handling.md\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://github.com/plantbreeding/API/blob/master/Specification/GeneralInfo/Search_Services.md\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/master/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.0
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.model.exceptions;
-
-import java.util.List;
-import java.util.Map;
-
-public class ApiException extends Exception {
-    private int code = 0;
-    private Map<String, List<String>> responseHeaders = null;
-    private String responseBody = null;
-
-    public ApiException() {
-    }
-
-    public ApiException(Throwable throwable) {
-        super(throwable);
-    }
-
-    public ApiException(String message) {
-        super(message);
-    }
-
-    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        super(message, throwable);
-        this.code = code;
-        this.responseHeaders = responseHeaders;
-        this.responseBody = responseBody;
-    }
-
-    public ApiException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this(message, null, code, responseHeaders, responseBody);
-    }
-
-    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders) {
-        this(message, throwable, code, responseHeaders, null);
-    }
-
-    public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this(null, null, code, responseHeaders, responseBody);
-    }
-
-    public ApiException(int code, String message) {
-        super(message);
-        this.code = code;
-    }
-
-    public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
-        this(code, message);
-        this.responseHeaders = responseHeaders;
-        this.responseBody = responseBody;
-    }
-
-    /**
-     * Get the HTTP status code.
-     *
-     * @return HTTP status code
-     */
-    public int getCode() {
-        return code;
-    }
-
-    /**
-     * Get the HTTP response headers.
-     *
-     * @return A map of list of string
-     */
-    public Map<String, List<String>> getResponseHeaders() {
-        return responseHeaders;
-    }
-
-    /**
-     * Get the HTTP response body.
-     *
-     * @return Response body in the form of string
-     */
-    public String getResponseBody() {
-        return responseBody;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/BrAPIQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/BrAPIQueryParams.java
deleted file mode 100644
index e5b7bc74..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/BrAPIQueryParams.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-@Getter
-@Setter
-@SuperBuilder
-@AllArgsConstructor
-@NoArgsConstructor
-@Accessors(fluent = true)
-public abstract class BrAPIQueryParams {
-
-    protected Integer page;
-    protected Integer pageSize;
-
-    /**
-     * Abstract class for each individual module to extend.
-     * Handles building query param lists from the client.
-     * Each module has its own base implementation that handles a common set of parameters.
-     *
-     * @param client the okhttp client
-     * @param paramList a list of brapi pairs which correspond to the call parameters
-     * @param headerParams so far only used for the authorization token
-     */
-    public void buildQueryParams(ApiClient client, List<Pair> paramList, Map<String, String> headerParams) {
-        if (page != null)
-            paramList.addAll(client.parameterToPair("page", page));
-        if (pageSize != null)
-            paramList.addAll(client.parameterToPair("pageSize", pageSize));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/BrAPISecureQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/BrAPISecureQueryParams.java
deleted file mode 100644
index 23ca2494..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/BrAPISecureQueryParams.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
- **/
-@Getter
-@Setter
-@SuperBuilder
-@AllArgsConstructor
-@NoArgsConstructor
-@Accessors(fluent = true)
-public abstract class BrAPISecureQueryParams extends BrAPIQueryParams {
-
-    protected String authorization;
-
-    @Override
-    public void buildQueryParams(ApiClient client, List<Pair> paramList, Map<String, String> headerParams) {
-        super.buildQueryParams(client, paramList, headerParams);
-        if (authorization != null)
-            headerParams.put("Authorization", client.parameterToString(authorization));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/CoreQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/CoreQueryParams.java
deleted file mode 100644
index cecaad31..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/CoreQueryParams.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.core;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-import org.brapi.client.v21.model.queryParams.BrAPISecureQueryParams;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * externalReferenceID **Deprecated in v2.1** Please use &#x60;externalReferenceId&#x60;. Github issue number #460  &lt;br&gt;An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
- * externalReferenceId An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
- * externalReferenceSource An identifier for the source system or database of an external reference (use with &#x60;externalReferenceId&#x60; parameter) (optional)
- * page Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
- * pageSize The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@AllArgsConstructor
-@NoArgsConstructor
-@Accessors(fluent = true)
-public abstract class CoreQueryParams extends BrAPISecureQueryParams {
-
-    protected String programDbId;
-    protected String commonCropName;
-    protected String externalReferenceId;
-    protected String externalReferenceSource;
-
-    @Override
-    public void buildQueryParams(ApiClient client, List<Pair> paramList, Map<String, String> headerParams) {
-        super.buildQueryParams(client, paramList, headerParams);
-        if (commonCropName != null)
-            paramList.addAll(client.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            paramList.addAll(client.parameterToPair("programDbId", programDbId));
-        if (externalReferenceId != null)
-            paramList.addAll(client.parameterToPair("externalReferenceId", externalReferenceId));
-        if (externalReferenceSource != null)
-            paramList.addAll(client.parameterToPair("externalReferenceSource", externalReferenceSource));
-        if (page != null)
-            paramList.addAll(client.parameterToPair("page", page));
-        if (pageSize != null)
-            paramList.addAll(client.parameterToPair("pageSize", pageSize));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/ListQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/ListQueryParams.java
deleted file mode 100644
index 07daab80..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/ListQueryParams.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.core;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-import org.brapi.client.v21.model.queryParams.BrAPISecureQueryParams;
-import org.brapi.model.v21.core.BrAPIListTypes;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * listType A flag to indicate the type of objects that are referneced in a List (optional)
- * listName The human readable name of a List (optional)
- * listDbId The unique identifier of a List (optional)
- * listSource A short tag to indicate the source of a list (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class ListQueryParams extends BrAPISecureQueryParams {
-
-    private BrAPIListTypes listType;
-    private String listName;
-    private String listDbId;
-    private String listSource;
-
-    @Override
-    public void buildQueryParams(ApiClient client, List<Pair> paramList, Map<String, String> headerParams) {
-        super.buildQueryParams(client, paramList, headerParams);
-        if (listType != null)
-            paramList.addAll(client.parameterToPair("listType", listType));
-        if (listName != null)
-            paramList.addAll(client.parameterToPair("listName", listName));
-        if (listDbId != null)
-            paramList.addAll(client.parameterToPair("listDbId", listDbId));
-        if (listSource != null)
-            paramList.addAll(client.parameterToPair("listSource", listSource));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/LocationQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/LocationQueryParams.java
deleted file mode 100644
index bd09433c..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/LocationQueryParams.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.core;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-import org.brapi.client.v21.model.queryParams.BrAPISecureQueryParams;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * locationType The type of location this represents (ex. Field Station, Breeding Location, Storage Location, etc) (optional)
- * locationDbId The unique identifier for a Location (optional)
- * locationName A human readable name for a location &lt;br/&gt; MIAPPE V1.1 (DM-18) Experimental site name - The name of the natural site, experimental field, greenhouse, phenotyping facility, etc. where the experiment took place. (optional)
- * parentLocationDbId The unique identifier for a Location &lt;br/&gt; The Parent Location defines the encompassing location that this location belongs to.  For example, an Institution might have multiple Field Stations inside it and each Field Station might have multiple Fields. (optional)
- * parentLocationName A human readable name for a location &lt;br/&gt; The Parent Location defines the encompassing location that this location belongs to.  For example, an Institution might have multiple Field Stations inside it and each Field Station might have multiple Fields. (optional)
- * commonCropName The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crop.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server. (optional)
- * programDbId Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
- * externalReferenceID **Deprecated in v2.1** Please use &#x60;externalReferenceId&#x60;. Github issue number #460  &lt;br&gt;An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
- * externalReferenceId An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
- * externalReferenceSource An identifier for the source system or database of an external reference (use with &#x60;externalReferenceId&#x60; parameter) (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class LocationQueryParams extends BrAPISecureQueryParams {
-
-    private String locationType;
-    private String locationDbId;
-    private String parentLocationDbId;
-    private String parentLocationName;
-    private String locationName;
-
-    @Override
-    public void buildQueryParams(ApiClient client, List<Pair> paramList, Map<String, String> headerParams) {
-        super.buildQueryParams(client, paramList, headerParams);
-        if (locationType != null)
-            paramList.addAll(client.parameterToPair("locationType", locationType));
-        if (locationDbId != null)
-            paramList.addAll(client.parameterToPair("locationDbId", locationDbId));
-        if (locationName != null)
-            paramList.addAll(client.parameterToPair("locationName", locationName));
-        if (parentLocationDbId != null)
-            paramList.addAll(client.parameterToPair("parentLocationDbId", parentLocationDbId));
-        if (parentLocationName != null)
-            paramList.addAll(client.parameterToPair("parentLocationName", parentLocationName));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/PeopleQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/PeopleQueryParams.java
deleted file mode 100644
index bc538c37..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/PeopleQueryParams.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.core;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-import org.brapi.client.v21.model.queryParams.BrAPISecureQueryParams;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * firstName A persons first name (optional)
- * lastName A persons last name (optional)
- * personDbId The unique ID of a person (optional)
- * userID A systems user ID associated with this person. Different from personDbId because you could have a person who is not a user of the system. (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class PeopleQueryParams extends BrAPISecureQueryParams {
-
-    private String firstName;
-    private String lastName;
-    private String personDbId;
-    private String userID;
-
-    @Override
-    public void buildQueryParams(ApiClient client, List<Pair> paramList, Map<String, String> headerParams) {
-        super.buildQueryParams(client, paramList, headerParams);
-        if (firstName != null)
-            paramList.addAll(client.parameterToPair("firstName", firstName));
-        if (lastName != null)
-            paramList.addAll(client.parameterToPair("lastName", lastName));
-        if (personDbId != null)
-            paramList.addAll(client.parameterToPair("personDbId", personDbId));
-        if (userID != null)
-            paramList.addAll(client.parameterToPair("userID", userID));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/ProgramQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/ProgramQueryParams.java
deleted file mode 100644
index 3b9b737c..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/ProgramQueryParams.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.core;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-import org.brapi.client.v21.model.queryParams.BrAPISecureQueryParams;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * abbreviation A shortened version of the human readable name for a Program (optional)
- * programType The type of program entity this object represents &lt;br/&gt; &#x27;STANARD&#x27; represents a standard, permenant breeding program &lt;br/&gt; &#x27;PROJECT&#x27; represents a short term project, usually with a set time limit based on funding  (optional)
- * programName Use this parameter to only return results associated with the given &#x60;Program&#x60; by its human readable name.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class ProgramQueryParams extends BrAPISecureQueryParams {
-
-    private String programType;
-    private String programName;
-    private String abbreviation;
-
-    @Override
-    public void buildQueryParams(ApiClient client, List<Pair> paramList, Map<String, String> headerParams) {
-        super.buildQueryParams(client, paramList, headerParams);
-        if (abbreviation != null)
-            paramList.addAll(client.parameterToPair("abbreviation", abbreviation));
-        if (programType != null)
-            paramList.addAll(client.parameterToPair("programType", programType));
-        if (programName != null)
-            paramList.addAll(client.parameterToPair("programName", programName));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/SeasonQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/SeasonQueryParams.java
deleted file mode 100644
index df67b518..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/SeasonQueryParams.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.core;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-import org.brapi.client.v21.model.queryParams.BrAPISecureQueryParams;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * seasonDbId The unique identifier for a season. For backward compatibility it can be a string like &#x27;2012&#x27;, &#x27;1957-2004&#x27; (optional)
- * season The term to describe a given season. Example \&quot;Spring\&quot; OR \&quot;May\&quot; OR \&quot;Planting_Time_7\&quot;. (optional)
- * seasonName The term to describe a given season. Example \&quot;Spring\&quot; OR \&quot;May\&quot; OR \&quot;Planting_Time_7\&quot;. (optional)
- * year The 4 digit year of a season. Example \&quot;2017\&quot; (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class SeasonQueryParams extends BrAPISecureQueryParams {
-
-    private String seasonName;
-    private String seasonDbId;
-    private String season;
-    private String year;
-
-    @Override
-    public void buildQueryParams(ApiClient client, List<Pair> paramList, Map<String, String> headerParams) {
-        super.buildQueryParams(client, paramList, headerParams);
-        if (seasonDbId != null)
-            paramList.addAll(client.parameterToPair("seasonDbId", seasonDbId));
-        if (season != null)
-            paramList.addAll(client.parameterToPair("season", season));
-        if (seasonName != null)
-            paramList.addAll(client.parameterToPair("seasonName", seasonName));
-        if (year != null)
-            paramList.addAll(client.parameterToPair("year", year));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/StudyQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/StudyQueryParams.java
deleted file mode 100644
index 290c8667..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/StudyQueryParams.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.core;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-import org.brapi.client.v21.model.queryParams.BrAPISecureQueryParams;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * studyType Filter based on study type unique identifier (optional)
- * locationDbId Filter by location (optional)
- * seasonDbId Filter by season or year (optional)
- * studyCode Filter by study code (optional)
- * studyPUI Filter by study PUI (optional)
- * observationVariableDbId Filter by observation variable DbId (optional)
- * active A flag to indicate if a Study is currently active and ongoing (optional)
- * sortBy Name of the field to sort by. (optional)
- * sortOrder Sort order direction. Ascending/Descending. (optional)
- * trialDbId Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
- * studyDbId Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
- * studyName Use this parameter to only return results associated with the given &#x60;Study&#x60; by its human readable name.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
- * germplasmDbId Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
- **/
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class StudyQueryParams extends BrAPISecureQueryParams {
-
-    private String studyType;
-    private String locationDbId;
-    private String seasonDbId;
-    private String trialDbId;
-    private String studyDbId;
-    private String studyName;
-    private String studyCode;
-    private String studyPUI;
-    private String germplasmDbId;
-    private String observationVariableDbId;
-    private String active;
-    private String sortBy;
-    private String sortOrder;
-
-    @Override
-    public void buildQueryParams(ApiClient client, List<Pair> paramList, Map<String, String> headerParams) {
-        super.buildQueryParams(client, paramList, headerParams);
-        if (studyType != null)
-            paramList.addAll(client.parameterToPair("studyType", studyType));
-        if (locationDbId != null)
-            paramList.addAll(client.parameterToPair("locationDbId", locationDbId));
-        if (seasonDbId != null)
-            paramList.addAll(client.parameterToPair("seasonDbId", seasonDbId));
-        if (studyCode != null)
-            paramList.addAll(client.parameterToPair("studyCode", studyCode));
-        if (studyPUI != null)
-            paramList.addAll(client.parameterToPair("studyPUI", studyPUI));
-        if (observationVariableDbId != null)
-            paramList.addAll(client.parameterToPair("observationVariableDbId", observationVariableDbId));
-        if (active != null)
-            paramList.addAll(client.parameterToPair("active", active));
-        if (sortBy != null)
-            paramList.addAll(client.parameterToPair("sortBy", sortBy));
-        if (sortOrder != null)
-            paramList.addAll(client.parameterToPair("sortOrder", sortOrder));
-        if (trialDbId != null)
-            paramList.addAll(client.parameterToPair("trialDbId", trialDbId));
-        if (studyDbId != null)
-            paramList.addAll(client.parameterToPair("studyDbId", studyDbId));
-        if (studyName != null)
-            paramList.addAll(client.parameterToPair("studyName", studyName));
-        if (germplasmDbId != null)
-            paramList.addAll(client.parameterToPair("germplasmDbId", germplasmDbId));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/TrialQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/TrialQueryParams.java
deleted file mode 100644
index d9523f0d..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/TrialQueryParams.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.core;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-import org.brapi.client.v21.model.queryParams.BrAPISecureQueryParams;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * active A flag to indicate if a Trial is currently active and ongoing (optional)
- * contactDbId Contact entities associated with this trial (optional)
- * locationDbId Filter by location (optional)
- * searchDateRangeStart The start of the overlapping search date range. &#x60;searchDateRangeStart&#x60; must be before &#x60;searchDateRangeEnd&#x60;.  Return a Trial entity if any of the following cases are true  - &#x60;searchDateRangeStart&#x60; is before &#x60;trial.endDate&#x60; AND &#x60;searchDateRangeEnd&#x60; is null   - &#x60;searchDateRangeStart&#x60; is before &#x60;trial.endDate&#x60; AND &#x60;searchDateRangeEnd&#x60; is after &#x60;trial.startDate&#x60;  - &#x60;searchDateRangeEnd&#x60; is after &#x60;trial.startDate&#x60; AND &#x60;searchDateRangeStart&#x60; is null  - &#x60;searchDateRangeEnd&#x60; is after &#x60;trial.startDate&#x60; AND &#x60;searchDateRangeStart&#x60; is before &#x60;trial.endDate&#x60; (optional)
- * searchDateRangeEnd The start of the overlapping search date range. &#x60;searchDateRangeStart&#x60; must be before &#x60;searchDateRangeEnd&#x60;.  Return a Trial entity if any of the following cases are true  - &#x60;searchDateRangeStart&#x60; is before &#x60;trial.endDate&#x60; AND &#x60;searchDateRangeEnd&#x60; is null   - &#x60;searchDateRangeStart&#x60; is before &#x60;trial.endDate&#x60; AND &#x60;searchDateRangeEnd&#x60; is after &#x60;trial.startDate&#x60;  - &#x60;searchDateRangeEnd&#x60; is after &#x60;trial.startDate&#x60; AND &#x60;searchDateRangeStart&#x60; is null  - &#x60;searchDateRangeEnd&#x60; is after &#x60;trial.startDate&#x60; AND &#x60;searchDateRangeStart&#x60; is before &#x60;trial.endDate&#x60; (optional)
- * trialPUI Filter by trial PUI (optional)
- * sortBy Sort order. Name of the field to sort by. (optional)
- * sortOrder Sort order direction: asc/desc (optional)
- * trialDbId Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
- * trialName Use this parameter to only return results associated with the given &#x60;Trial&#x60; by its human readable name.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
- * studyDbId Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class TrialQueryParams extends BrAPISecureQueryParams {
-
-    private String active;
-    private String commonCropName;
-    private String contactDbId;
-    private String programDbId;
-    private String locationDbId;
-    private String searchDateRangeStart;
-    private String searchDateRangeEnd;
-    private String studyDbId;
-    private String trialDbId;
-    private String trialName;
-    private String trialPUI;
-    private String sortBy;
-    private String sortOrder;
-    private String externalReferenceID;
-    private String externalReferenceSource;
-
-    @Override
-    public void buildQueryParams(ApiClient client, List<Pair> paramList, Map<String, String> headerParams) {
-        super.buildQueryParams(client, paramList, headerParams);
-        if (active != null)
-            paramList.addAll(client.parameterToPair("active", active));
-        if (contactDbId != null)
-            paramList.addAll(client.parameterToPair("contactDbId", contactDbId));
-        if (locationDbId != null)
-            paramList.addAll(client.parameterToPair("locationDbId", locationDbId));
-        if (searchDateRangeStart != null)
-            paramList.addAll(client.parameterToPair("searchDateRangeStart", searchDateRangeStart));
-        if (searchDateRangeEnd != null)
-            paramList.addAll(client.parameterToPair("searchDateRangeEnd", searchDateRangeEnd));
-        if (trialPUI != null)
-            paramList.addAll(client.parameterToPair("trialPUI", trialPUI));
-        if (sortBy != null)
-            paramList.addAll(client.parameterToPair("sortBy", sortBy));
-        if (sortOrder != null)
-            paramList.addAll(client.parameterToPair("sortOrder", sortOrder));
-        if (trialDbId != null)
-            paramList.addAll(client.parameterToPair("trialDbId", trialDbId));
-        if (trialName != null)
-            paramList.addAll(client.parameterToPair("trialName", trialName));
-        if (studyDbId != null)
-            paramList.addAll(client.parameterToPair("studyDbId", studyDbId));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/VendorQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/VendorQueryParams.java
deleted file mode 100644
index 4627c608..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/core/VendorQueryParams.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.core;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-import org.brapi.client.v21.model.queryParams.BrAPISecureQueryParams;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * orderId The order id returned by the vendor when the order was successfully submitted. From response of \&quot;POST /vendor/orders\&quot; (optional)
- * submissionId The submission id returned by the vendor when a set of plates was successfully submitted. From response of \&quot;POST /vendor/plates\&quot; (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class VendorQueryParams extends BrAPISecureQueryParams {
-
-    private String orderId;
-    private String submissionId;
-
-    @Override
-    public void buildQueryParams(ApiClient client, List<Pair> paramList, Map<String, String> headerParams) {
-        super.buildQueryParams(client, paramList, headerParams);
-        if (orderId != null)
-            paramList.addAll(client.parameterToPair("orderId", orderId));
-        if (submissionId != null)
-            paramList.addAll(client.parameterToPair("submissionId", submissionId));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/AlleleMatrixQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/AlleleMatrixQueryParams.java
deleted file mode 100644
index 3bba85a6..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/AlleleMatrixQueryParams.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.genotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-import org.brapi.client.v21.model.queryParams.BrAPISecureQueryParams;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * dimensionVariantPage The requested page number for the Variant dimension of the matrix (optional)
- * dimensionVariantPageSize The requested page size for the Variant dimension of the matrix (optional)
- * dimensionCallSetPage The requested page number for the CallSet dimension of the matrix (optional)
- * dimensionCallSetPageSize The requested page size for the CallSet dimension of the matrix (optional)
- * preview Default Value &#x3D; false &lt;br/&gt;If &#x27;preview&#x27; is set to true, then the server should return with the \&quot;dataMatrices\&quot; field as null or empty. All other data fields should be returned normally.  This is intended to be a preview and give the client a sense of how large the matrix returned will be &lt;br/&gt;If &#x27;preview&#x27; is set to false or not set (default), then the server should return all the matrix data as requested. (optional)
- * dataMatrixNames \&quot;dataMatrixNames\&quot; is a comma seperated list of names (ie &#x27;Genotype, Read Depth&#x27; etc). This list controls which data matrices are returned in the response. &lt;br&gt; This maps to a FORMAT field in the VCF file standard. (optional)
- * dataMatrixAbbreviations \&quot;dataMatrixAbbreviations\&quot; is a comma seperated list of abbreviations (ie &#x27;GT, RD&#x27; etc). This list controls which data matrices are returned in the response. &lt;br&gt; This maps to a FORMAT field in the VCF file standard. (optional)
- * positionRange The postion range to search &lt;br/&gt; Uses the format \&quot;contig:start-end\&quot; where \&quot;contig\&quot; is the chromosome or contig name, \&quot;start\&quot; is   the starting position of the range, and \&quot;end\&quot; is the ending position of the range &lt;br&gt; Example: CRHOM_1:12000-14000 (optional)
- * germplasmDbId Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
- * germplasmName Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; by its human readable name.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
- * germplasmPUI Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; by its global permanent unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
- * callSetDbId The ID which uniquely identifies a &#x60;CallSet&#x60; within the given database server (optional)
- * variantDbId The ID which uniquely identifies a &#x60;Variant&#x60; within the given database server (optional)
- * variantSetDbId The ID which uniquely identifies a &#x60;VariantSet&#x60; within the given database server (optional)
- * expandHomozygotes Should homozygotes be expanded (true) or collapsed into a single occurrence (false) (optional)
- * unknownString The string to use as a representation for missing data (optional)
- * sepPhased The string to use as a separator for phased allele calls (optional)
- * sepUnphased The string to use as a separator for unphased allele calls (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class AlleleMatrixQueryParams extends BrAPISecureQueryParams {
-
-    private Integer dimensionVariantPage;
-    private Integer dimensionVariantPageSize;
-    private Integer dimensionCallSetPage;
-    private Integer dimensionCallSetPageSize;
-    private Boolean preview;
-    private String dataMatrixNames;
-    private String dataMatrixAbbreviations;
-    private String positionRange;
-    private String germplasmDbId;
-    private String germplasmName;
-    private String germplasmPUI;
-    private String callSetDbId;
-    private String variantDbId;
-    private String variantSetDbId;
-    private Boolean expandHomozygotes;
-    private String unknownString;
-    private String sepPhased;
-    private String sepUnphased;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> paramList, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, paramList, headerParams);
-        if (dimensionVariantPage != null)
-            paramList.addAll(apiClient.parameterToPair("dimensionVariantPage", dimensionVariantPage));
-        if (dimensionVariantPageSize != null)
-            paramList.addAll(apiClient.parameterToPair("dimensionVariantPageSize", dimensionVariantPageSize));
-        if (dimensionCallSetPage != null)
-            paramList.addAll(apiClient.parameterToPair("dimensionCallSetPage", dimensionCallSetPage));
-        if (dimensionCallSetPageSize != null)
-            paramList.addAll(apiClient.parameterToPair("dimensionCallSetPageSize", dimensionCallSetPageSize));
-        if (preview != null)
-            paramList.addAll(apiClient.parameterToPair("preview", preview));
-        if (dataMatrixNames != null)
-            paramList.addAll(apiClient.parameterToPair("dataMatrixNames", dataMatrixNames));
-        if (dataMatrixAbbreviations != null)
-            paramList.addAll(apiClient.parameterToPair("dataMatrixAbbreviations", dataMatrixAbbreviations));
-        if (positionRange != null)
-            paramList.addAll(apiClient.parameterToPair("positionRange", positionRange));
-        if (germplasmDbId != null)
-            paramList.addAll(apiClient.parameterToPair("germplasmDbId", germplasmDbId));
-        if (germplasmName != null)
-            paramList.addAll(apiClient.parameterToPair("germplasmName", germplasmName));
-        if (germplasmPUI != null)
-            paramList.addAll(apiClient.parameterToPair("germplasmPUI", germplasmPUI));
-        if (callSetDbId != null)
-            paramList.addAll(apiClient.parameterToPair("callSetDbId", callSetDbId));
-        if (variantDbId != null)
-            paramList.addAll(apiClient.parameterToPair("variantDbId", variantDbId));
-        if (variantSetDbId != null)
-            paramList.addAll(apiClient.parameterToPair("variantSetDbId", variantSetDbId));
-        if (expandHomozygotes != null)
-            paramList.addAll(apiClient.parameterToPair("expandHomozygotes", expandHomozygotes));
-        if (unknownString != null)
-            paramList.addAll(apiClient.parameterToPair("unknownString", unknownString));
-        if (sepPhased != null)
-            paramList.addAll(apiClient.parameterToPair("sepPhased", sepPhased));
-        if (sepUnphased != null)
-            paramList.addAll(apiClient.parameterToPair("sepUnphased", sepUnphased));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/CallQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/CallQueryParams.java
deleted file mode 100644
index 8f43b3ed..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/CallQueryParams.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.genotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * callSetDbId The ID which uniquely identifies a &#x60;CallSet&#x60; within the given database server (optional)
- * variantDbId The ID which uniquely identifies a &#x60;Variant&#x60; within the given database server (optional)
- * variantSetDbId The ID which uniquely identifies a &#x60;VariantSet&#x60; within the given database server (optional)
- * expandHomozygotes Should homozygotes be expanded (true) or collapsed into a single occurrence (false) (optional)
- * unknownString The string to use as a representation for missing data (optional)
- * sepPhased The string to use as a separator for phased allele calls (optional)
- * sepUnphased The string to use as a separator for unphased allele calls (optional)
- * pageToken **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class CallQueryParams extends GenotypeQueryParams {
-
-    private String callSetDbId;
-    private String variantDbId;
-    private String variantSetDbId;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (callSetDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("callSetDbId", callSetDbId));
-        if (variantDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("variantDbId", variantDbId));
-        if (variantSetDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("variantSetDbId", variantSetDbId));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/CallSetQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/CallSetQueryParams.java
deleted file mode 100644
index 2c098923..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/CallSetQueryParams.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.genotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * callSetDbId The ID which uniquely identifies a &#x60;CallSet&#x60; within the given database server (optional)
- * callSetName The human readable name of a &#x60;CallSet&#x60;. (optional)
- * variantSetDbId The ID which uniquely identifies a &#x60;VariantSet&#x60; within the given database server (optional)
- * sampleDbId The ID which uniquely identifies a &#x60;Sample&#x60; within the given database server &lt;br&gt;Filter results to only include &#x60;CallSets&#x60; generated from this &#x60;Sample&#x60; (optional)
- * germplasmDbId Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class CallSetQueryParams extends GenotypeQueryParams {
-
-    private String callSetDbId;
-    private String callSetName;
-    private String variantSetDbId;
-    private String sampleDbId;
-    private String germplasmDbId;
-    private String externalReferenceSource;
-    private String externalReferenceId;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (callSetDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("callSetDbId", callSetDbId));
-        if (callSetName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("callSetName", callSetName));
-        if (variantSetDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("variantSetDbId", variantSetDbId));
-        if (sampleDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("sampleDbId", sampleDbId));
-        if (germplasmDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("germplasmDbId", germplasmDbId));
-        if (externalReferenceId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceId", externalReferenceId));
-        if (externalReferenceSource != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceSource", externalReferenceSource));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/GenomeMapQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/GenomeMapQueryParams.java
deleted file mode 100644
index 009d83ec..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/GenomeMapQueryParams.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.genotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * mapDbId The ID which uniquely identifies a &#x60;GenomeMap&#x60; (optional)
- * mapPUI The DOI or other permanent identifier for a &#x60;GenomeMap&#x60; (optional)
- * scientificName Full scientific binomial format name. This includes Genus, Species, and Sub-species (optional)
- * type The type of map, usually \&quot;Genetic\&quot; or \&quot;Physical\&quot; (optional)
- * commonCropName The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crop.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server. (optional)
- * programDbId Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
- * trialDbId Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
- * studyDbId Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class GenomeMapQueryParams extends GenotypeQueryParams {
-
-    private String commonCropName;
-    private String mapDbId;
-    private String mapPUI;
-    private String scientificName;
-    private String type;
-    private String programDbId;
-    private String trialDbId;
-    private String studyDbId;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (mapDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("mapDbId", mapDbId));
-        if (mapPUI != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("mapPUI", mapPUI));
-        if (scientificName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("scientificName", scientificName));
-        if (type != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("type", type));
-        if (commonCropName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-        if (trialDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("trialDbId", trialDbId));
-        if (studyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("studyDbId", studyDbId));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/GenotypeQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/GenotypeQueryParams.java
deleted file mode 100644
index 4ff4cc1d..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/GenotypeQueryParams.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.genotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-import org.brapi.client.v21.model.queryParams.BrAPISecureQueryParams;
-
-import java.util.List;
-import java.util.Map;
-
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class GenotypeQueryParams extends BrAPISecureQueryParams {
-
-    private Boolean expandHomozygotes;
-    private String unknownString;
-    private String sepPhased;
-    private String sepUnphased;
-    private String pageToken;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (expandHomozygotes != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("expandHomozygotes", expandHomozygotes));
-        if (unknownString != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("unknownString", unknownString));
-        if (sepPhased != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("sepPhased", sepPhased));
-        if (sepUnphased != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("sepUnphased", sepUnphased));
-        if (pageToken != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageToken", pageToken));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/PlatesQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/PlatesQueryParams.java
deleted file mode 100644
index a473c13b..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/PlatesQueryParams.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.genotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * sampleDbId The unique identifier for a &#x60;Sample&#x60; (optional)
- * sampleName The human readable name of the &#x60;Sample&#x60; (optional)
- * sampleGroupDbId The unique identifier for a group of related &#x60;Samples&#x60; (optional)
- * observationUnitDbId The ID which uniquely identifies an &#x60;ObservationUnit&#x60; (optional)
- * plateDbId The ID which uniquely identifies a &#x60;Plate&#x60; of &#x60;Samples&#x60; (optional)
- * plateName The human readable name of a &#x60;Plate&#x60; of &#x60;Samples&#x60; (optional)
- * commonCropName The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crop.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server. (optional)
- * programDbId Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
- * trialDbId Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
- * studyDbId Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
- * germplasmDbId Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
- * externalReferenceId An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
- * externalReferenceSource An identifier for the source system or database of an external reference (use with &#x60;externalReferenceId&#x60; parameter) (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class PlatesQueryParams extends GenotypeQueryParams {
-
-    private String sampleDbId;
-    private String sampleName;
-    private String sampleGroupDbId;
-    private String observationUnitDbId;
-    private String plateDbId;
-    private String plateName;
-    private String commonCropName;
-    private String germplasmDbId;
-    private String externalReferenceId;
-    private String externalReferenceSource;
-    private String scientificName;
-    private String type;
-    private String programDbId;
-    private String trialDbId;
-    private String studyDbId;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (sampleDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("sampleDbId", sampleDbId));
-        if (sampleName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("sampleName", sampleName));
-        if (sampleGroupDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("sampleGroupDbId", sampleGroupDbId));
-        if (observationUnitDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitDbId", observationUnitDbId));
-        if (plateDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("plateDbId", plateDbId));
-        if (plateName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("plateName", plateName));
-        if (commonCropName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-        if (trialDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("trialDbId", trialDbId));
-        if (studyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("studyDbId", studyDbId));
-        if (germplasmDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("germplasmDbId", germplasmDbId));
-        if (externalReferenceId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceId", externalReferenceId));
-        if (externalReferenceSource != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceSource", externalReferenceSource));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/ReferenceQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/ReferenceQueryParams.java
deleted file mode 100644
index d1f2bfd2..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/ReferenceQueryParams.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.genotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * referenceDbId The ID of the &#x60;Reference&#x60; to be retrieved. (optional)
- * referenceSetDbId The ID of the &#x60;ReferenceSet&#x60; to be retrieved. (optional)
- * accession If set, return the reference sets for which the &#x60;accession&#x60; matches this string (case-sensitive, exact match). (optional)
- * md5checksum If specified, return the references for which the &#x60;md5checksum&#x60; matches this string (case-sensitive, exact match). (optional)
- * isDerived If the reference is derived from a source sequence (optional)
- * minLength The minimum length of the reference sequences to be retrieved. (optional)
- * maxLength The maximum length of the reference sequences to be retrieved. (optional)
- * commonCropName The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crop.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server. (optional)
- * programDbId Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
- * trialDbId Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
- * studyDbId Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
- * externalReferenceId An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
- * externalReferenceSource An identifier for the source system or database of an external reference (use with &#x60;externalReferenceId&#x60; parameter) (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class ReferenceQueryParams extends GenotypeQueryParams {
-
-    private String referenceDbId;
-    private String referenceSetDbId;
-    private String accession;
-    private String md5checksum;
-    private String isDerived;
-    private String minLength;
-    private String maxLength;
-    private String commonCropName;
-    private String programDbId;
-    private String trialDbId;
-    private String studyDbId;
-    private String externalReferenceSource;
-    private String externalReferenceId;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (referenceDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("referenceDbId", referenceDbId));
-        if (referenceSetDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("referenceSetDbId", referenceSetDbId));
-        if (accession != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("accession", accession));
-        if (md5checksum != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("md5checksum", md5checksum));
-        if (isDerived != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("isDerived", isDerived));
-        if (minLength != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("minLength", minLength));
-        if (maxLength != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("maxLength", maxLength));
-        if (commonCropName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-        if (trialDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("trialDbId", trialDbId));
-        if (studyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("studyDbId", studyDbId));
-        if (externalReferenceId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceId", externalReferenceId));
-        if (externalReferenceSource != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceSource", externalReferenceSource));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/ReferenceSetQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/ReferenceSetQueryParams.java
deleted file mode 100644
index 5a5030c0..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/ReferenceSetQueryParams.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.genotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class ReferenceSetQueryParams extends GenotypeQueryParams {
-
-    private String referenceSetDbId;
-    private String accession;
-    private String md5checksum;
-    private String assemblyPUI;
-    private String commonCropName;
-    private String programDbId;
-    private String trialDbId;
-    private String studyDbId;
-    private String externalReferenceSource;
-    private String externalReferenceId;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (referenceSetDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("referenceSetDbId", referenceSetDbId));
-        if (accession != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("accession", accession));
-        if (assemblyPUI != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("assemblyPUI", assemblyPUI));
-        if (md5checksum != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("md5checksum", md5checksum));
-        if (commonCropName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-        if (trialDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("trialDbId", trialDbId));
-        if (studyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("studyDbId", studyDbId));
-        if (externalReferenceId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceId", externalReferenceId));
-        if (externalReferenceSource != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceSource", externalReferenceSource));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/SampleQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/SampleQueryParams.java
deleted file mode 100644
index acb7e68d..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/SampleQueryParams.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.genotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * sampleDbId The unique identifier for a &#x60;Sample&#x60; (optional)
- * sampleName The human readable name of the &#x60;Sample&#x60; (optional)
- * sampleGroupDbId The unique identifier for a group of related &#x60;Samples&#x60; (optional)
- * observationUnitDbId The ID which uniquely identifies an &#x60;ObservationUnit&#x60; (optional)
- * plateDbId The ID which uniquely identifies a &#x60;Plate&#x60; of &#x60;Sample&#x60; (optional)
- * plateName The human readable name of a &#x60;Plate&#x60; of &#x60;Sample&#x60; (optional)
- * commonCropName The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crop.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server. (optional)
- * programDbId Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
- * trialDbId Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
- * studyDbId Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
- * germplasmDbId Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
- * externalReferenceID **Deprecated in v2.1** Please use &#x60;externalReferenceId&#x60;. Github issue number #460  &lt;br&gt;An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
- * externalReferenceId An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
- * externalReferenceSource An identifier for the source system or database of an external reference (use with &#x60;externalReferenceId&#x60; parameter) (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class SampleQueryParams extends GenotypeQueryParams {
-
-    private String sampleName;
-    private String sampleGroupDbId;
-    private String plateName;
-    private String programDbId;
-    private String commonCropName;
-    private String trialDbId;
-    private String externalReferenceId;
-    private String sampleDbId;
-    private String observationUnitDbId;
-    private String plateDbId;
-    private String germplasmDbId;
-    private String studyDbId;
-    private String externalReferenceID;
-    private String externalReferenceSource;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (sampleDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("sampleDbId", sampleDbId));
-        if (sampleName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("sampleName", sampleName));
-        if (sampleGroupDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("sampleGroupDbId", sampleGroupDbId));
-        if (observationUnitDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitDbId", observationUnitDbId));
-        if (plateDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("plateDbId", plateDbId));
-        if (plateName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("plateName", plateName));
-        if (commonCropName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-        if (trialDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("trialDbId", trialDbId));
-        if (studyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("studyDbId", studyDbId));
-        if (germplasmDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("germplasmDbId", germplasmDbId));
-        if (externalReferenceID != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceID", externalReferenceID));
-        if (externalReferenceId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceId", externalReferenceId));
-        if (externalReferenceSource != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceSource", externalReferenceSource));
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/VariantQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/VariantQueryParams.java
deleted file mode 100644
index 0642b50d..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/VariantQueryParams.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.genotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * variantDbId The ID which uniquely identifies a &#x60;Variant&#x60; (optional)
- * variantSetDbId The ID which uniquely identifies a &#x60;VariantSet&#x60; (optional)
- * referenceDbId The ID which uniquely identifies a &#x60;Reference&#x60; (optional)
- * referenceSetDbId The ID which uniquely identifies a &#x60;ReferenceSet&#x60; (optional)
- * pageToken **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
- * externalReferenceId An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
- * externalReferenceSource An identifier for the source system or database of an external reference (use with &#x60;externalReferenceId&#x60; parameter) (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class VariantQueryParams extends GenotypeQueryParams {
-
-    private String searchResultsDbId;
-    private String variantDbId;
-    private String variantSetDbId;
-    private String referenceDbId;
-    private String referenceSetDbId;
-    private String pageToken;
-    private String externalReferenceSource;
-    private String externalReferenceId;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (variantDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("variantDbId", variantDbId));
-        if (variantSetDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("variantSetDbId", variantSetDbId));
-        if (referenceDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("referenceDbId", referenceDbId));
-        if (referenceSetDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("referenceSetDbId", referenceSetDbId));
-        if (pageToken != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageToken", pageToken));
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-        if (externalReferenceId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceId", externalReferenceId));
-        if (externalReferenceSource != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceSource", externalReferenceSource));
-
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/VariantSetQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/VariantSetQueryParams.java
deleted file mode 100644
index 36aff457..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/genotype/VariantSetQueryParams.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.genotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * variantSetDbId The ID of the &#x60;VariantSet&#x60; to be retrieved. (optional)
- * variantDbId The ID of the &#x60;Variant&#x60; to be retrieved. (optional)
- * callSetDbId The ID of the &#x60;CallSet&#x60; to be retrieved. (optional)
- * referenceSetDbId The ID of the reference set that describes the sequences used by the variants in this set. (optional)
- * commonCropName The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crop.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server. (optional)
- * programDbId Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
- * studyDbId Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
- * studyName Use this parameter to only return results associated with the given &#x60;Study&#x60; by its human readable name.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
- * externalReferenceId An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
- * externalReferenceSource An identifier for the source system or database of an external reference (use with &#x60;externalReferenceId&#x60; parameter) (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class VariantSetQueryParams extends GenotypeQueryParams {
-
-    private String variantSetDbId;
-    private String variantDbId;
-    private String callSetDbId;
-    private String studyDbId;
-    private String studyName;
-    private String referenceSetDbId;
-    private String commonCropName;
-    private String programDbId;
-    private String externalReferenceId;
-    private String externalReferenceSource;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (variantSetDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("variantSetDbId", variantSetDbId));
-        if (variantDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("variantDbId", variantDbId));
-        if (callSetDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("callSetDbId", callSetDbId));
-        if (referenceSetDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("referenceSetDbId", referenceSetDbId));
-        if (commonCropName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-        if (studyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("studyDbId", studyDbId));
-        if (studyName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("studyName", studyName));
-        if (externalReferenceId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceId", externalReferenceId));
-        if (externalReferenceSource != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceSource", externalReferenceSource));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/CrossQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/CrossQueryParams.java
deleted file mode 100644
index c40a7551..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/CrossQueryParams.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.germplasm;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * crossingProjectDbId Search for Crossing Projects with this unique id (optional)
- * crossingProjectName The human readable name for a crossing project (optional)
- * crossDbId Search for Cross with this unique id (optional)
- * crossName Search for Cross with this human readable name (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class CrossQueryParams extends GermplasmQueryParams {
-
-    private String crossingProjectDbId;
-    private String crossDbId;
-    private String crossingProjectName;
-    private String crossName;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (crossingProjectDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("crossingProjectDbId", crossingProjectDbId));
-        if (crossingProjectName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("crossingProjectName", crossingProjectName));
-        if (crossDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("crossDbId", crossDbId));
-        if (crossName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("crossName", crossName));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/CrossingProjectQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/CrossingProjectQueryParams.java
deleted file mode 100644
index 3fee4488..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/CrossingProjectQueryParams.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.germplasm;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * crossingProjectDbId Search for Crossing Projects with this unique id (optional)
- * crossingProjectName The human readable name for a crossing project (optional)
- * includePotentialParents If the parameter &#x27;includePotentialParents&#x27; is false, the array &#x27;potentialParents&#x27; should be empty, null, or excluded from the response object. (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class CrossingProjectQueryParams extends GermplasmQueryParams {
-
-    private String crossingProjectDbId;
-    private String crossingProjectName;
-    private Boolean includePotentialParents;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (crossingProjectDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("crossingProjectDbId", crossingProjectDbId));
-        if (crossingProjectName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("crossingProjectName", crossingProjectName));
-        if (includePotentialParents != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("includePotentialParents", includePotentialParents));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/GermplasmAttributeQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/GermplasmAttributeQueryParams.java
deleted file mode 100644
index ea1cf3b0..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/GermplasmAttributeQueryParams.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.germplasm;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * attributeCategory The general category for the attribute. very similar to Trait class. (optional)
- * attributeDbId The unique id for an attribute (optional)
- * attributeName The human readable name for an attribute (optional)
- * attributePUI The Permanent Unique Identifier of an Attribute, usually in the form of a URI (optional)
- * methodDbId Method unique identifier (optional)
- * methodName Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation (optional)
- * methodPUI The Permanent Unique Identifier of a Method, usually in the form of a URI (optional)
- * scaleDbId Scale unique identifier (optional)
- * scaleName Human readable name for the scale &lt;br/&gt;MIAPPE V1.1 (DM-88) Scale  Name of the scale of observation (optional)
- * scalePUI The Permanent Unique Identifier of a Scale, usually in the form of a URI (optional)
- * traitDbId Trait unique identifier (optional)
- * traitName Human readable name for the trait &lt;br/&gt;MIAPPE V1.1 (DM-88) Trait  Name of the trait of observation (optional)
- * traitPUI The Permanent Unique Identifier of a Trait, usually in the form of a URI (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class GermplasmAttributeQueryParams extends GermplasmQueryParams {
-
-    private String attributeCategory;
-    private String attributeDbId;
-    private String attributeName;
-    private String attributePUI;
-    private String methodDbId;
-    private String methodName;
-    private String methodPUI;
-    private String scaleDbId;
-    private String scaleName;
-    private String scalePUI;
-    private String traitDbId;
-    private String traitName;
-    private String traitPUI;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (attributeCategory != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("attributeCategory", attributeCategory));
-        if (attributeDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("attributeDbId", attributeDbId));
-        if (attributeName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("attributeName", attributeName));
-        if (attributePUI != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("attributePUI", attributePUI));
-        if (methodDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("methodDbId", methodDbId));
-        if (methodName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("methodName", methodName));
-        if (methodPUI != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("methodPUI", methodPUI));
-        if (scaleDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("scaleDbId", scaleDbId));
-        if (scaleName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("scaleName", scaleName));
-        if (scalePUI != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("scalePUI", scalePUI));
-        if (traitDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("traitDbId", traitDbId));
-        if (traitName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("traitName", traitName));
-        if (traitPUI != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("traitPUI", traitPUI));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java
deleted file mode 100644
index c686b611..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.germplasm;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * attributeValueDbId The unique id for an attribute value (optional)
- * attributeDbId The unique id for an attribute (optional)
- * attributeName The human readable name for an attribute (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class GermplasmAttributeValueQueryParams extends GermplasmQueryParams {
-
-    private String attributeValueDbId;
-    private String attributeDbId;
-    private String attributeName;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (attributeValueDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("attributeValueDbId", attributeValueDbId));
-        if (attributeDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("attributeDbId", attributeDbId));
-        if (attributeName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("attributeName", attributeName));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/GermplasmQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/GermplasmQueryParams.java
deleted file mode 100644
index 98f2444c..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/GermplasmQueryParams.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.germplasm;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-import org.brapi.client.v21.model.queryParams.BrAPISecureQueryParams;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * accessionNumber The unique identifier for a material or germplasm within a genebank  MCPD (v2.1) (ACCENUMB) 2. This is the unique identifier for accessions within a genebank, and is assigned when a sample is entered into the genebank collection (e.g. \&quot;PI 113869\&quot;). (optional)
- * collection A specific panel/collection/population name this germplasm belongs to. (optional)
- * binomialName The full binomial name (scientific name) to identify a germplasm (optional)
- * genus Genus name to identify germplasm (optional)
- * species Species name to identify germplasm (optional)
- * synonym Alternative name or ID used to reference this germplasm (optional)
- * parentDbId Search for Germplasm with this parent (optional)
- * progenyDbId Search for Germplasm with this child (optional)
- * commonCropName The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crop.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server. (optional)
- * programDbId Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
- * trialDbId Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
- * studyDbId Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
- * germplasmDbId Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
- * germplasmName Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; by its human readable name.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
- * germplasmPUI Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; by its global permanent unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
- * externalReferenceID **Deprecated in v2.1** Please use &#x60;externalReferenceId&#x60;. Github issue number #460  &lt;br&gt;An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
- * externalReferenceId An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
- * externalReferenceSource An identifier for the source system or database of an external reference (use with &#x60;externalReferenceId&#x60; parameter) (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class GermplasmQueryParams extends BrAPISecureQueryParams {
-
-    private String germplasmPUI;
-    private String germplasmDbId;
-    private String germplasmName;
-    private String commonCropName;
-    private String accessionNumber;
-    private String collection;
-    private String genus;
-    private String species;
-    private String studyDbId;
-    private String synonym;
-    private String parentDbId;
-    private String progenyDbId;
-    private String programDbId;
-    private String externalReferenceId;
-    private String externalReferenceID;
-    private String externalReferenceSource;
-    private String trialDbId;
-    private String binomialName;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (accessionNumber != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("accessionNumber", accessionNumber));
-        if (collection != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("collection", collection));
-        if (binomialName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("binomialName", binomialName));
-        if (genus != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("genus", genus));
-        if (species != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("species", species));
-        if (synonym != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("synonym", synonym));
-        if (parentDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("parentDbId", parentDbId));
-        if (progenyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("progenyDbId", progenyDbId));
-        if (commonCropName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-        if (trialDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("trialDbId", trialDbId));
-        if (studyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("studyDbId", studyDbId));
-        if (germplasmDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("germplasmDbId", germplasmDbId));
-        if (germplasmName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("germplasmName", germplasmName));
-        if (germplasmPUI != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("germplasmPUI", germplasmPUI));
-        if (externalReferenceID != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceID", externalReferenceID));
-        if (externalReferenceId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceId", externalReferenceId));
-        if (externalReferenceSource != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceSource", externalReferenceSource));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/PedigreeQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/PedigreeQueryParams.java
deleted file mode 100644
index 2dbb8f12..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/PedigreeQueryParams.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.germplasm;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * accessionNumber The unique identifier for a material or germplasm within a genebank  MCPD (v2.1) (ACCENUMB) 2. This is the unique identifier for accessions within a genebank, and is assigned when a sample is entered into the genebank collection (e.g. \&quot;PI 113869\&quot;). (optional)
- * collection A specific panel/collection/population name this germplasm belongs to. (optional)
- * familyCode A familyCode representing the family this germplasm belongs to. (optional)
- * binomialName The full binomial name (scientific name) of a germplasm (optional)
- * genus The scientific genus of a germplasm (optional)
- * species The scientific species of a germplasm (optional)
- * synonym An alternative name or ID used to reference this germplasm (optional)
- * includeParents If this parameter is true, include the array of parents in the response (optional)
- * includeSiblings If this parameter is true, include the array of siblings in the response (optional)
- * includeProgeny If this parameter is true, include the array of progeny in the response (optional)
- * includeFullTree Recursively include ALL of the nodes present in this pedigree tree. (optional)
- * pedigreeDepth Recursively include this number of levels up the tree in the response (optional)
- * progenyDepth Recursively include this number of levels down the tree in the response (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class PedigreeQueryParams extends GermplasmQueryParams {
-
-    private String accessionNumber;
-    private String collection;
-    private String familyCode;
-    private String binomialName;
-    private String genus;
-    private String species;
-    private String synonym;
-    private Boolean includeParents;
-    private Boolean includeSiblings;
-    private Boolean includeProgeny;
-    private Boolean includeFullTree;
-    private Integer pedigreeDepth;
-    private Integer progenyDepth;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (accessionNumber != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("accessionNumber", accessionNumber));
-        if (collection != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("collection", collection));
-        if (familyCode != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("familyCode", familyCode));
-        if (binomialName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("binomialName", binomialName));
-        if (genus != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("genus", genus));
-        if (species != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("species", species));
-        if (synonym != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("synonym", synonym));
-        if (includeParents != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("includeParents", includeParents));
-        if (includeSiblings != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("includeSiblings", includeSiblings));
-        if (includeProgeny != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("includeProgeny", includeProgeny));
-        if (includeFullTree != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("includeFullTree", includeFullTree));
-        if (pedigreeDepth != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pedigreeDepth", pedigreeDepth));
-        if (progenyDepth != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("progenyDepth", progenyDepth));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/SeedLotQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/SeedLotQueryParams.java
deleted file mode 100644
index 2323de07..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/germplasm/SeedLotQueryParams.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.germplasm;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * seedLotDbId Unique id for a seed lot on this server (optional)
- * crossDbId Search for Cross with this unique id (optional)
- * crossName Search for Cross with this human readable name (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class SeedLotQueryParams extends GermplasmQueryParams {
-
-    private String seedLotDbId;
-    private String crossDbId;
-    private String crossName;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (seedLotDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("seedLotDbId", seedLotDbId));
-        if (crossDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("crossDbId", crossDbId));
-        if (crossName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("crossName", crossName));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/EventQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/EventQueryParams.java
deleted file mode 100644
index f9916f59..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/EventQueryParams.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.phenotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.List;
-import java.util.Map;
-
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class EventQueryParams extends PhenotypeQueryParams {
-
-    protected String studyDbId;
-    protected String observationUnitDbId;
-    protected String eventDbId;
-    protected String eventType;
-    protected OffsetDateTime dateRangeStart;
-    protected OffsetDateTime dateRangeEnd;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (eventDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("eventDbId", eventDbId));
-        if (eventType != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("eventType", eventType));
-        if (dateRangeStart != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("dateRangeStart", dateRangeStart));
-        if (dateRangeEnd != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("dateRangeEnd", dateRangeEnd));
-        if (studyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("studyDbId", studyDbId));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/ImageQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/ImageQueryParams.java
deleted file mode 100644
index e35ad81d..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/ImageQueryParams.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.phenotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * imageDbId The unique identifier for a image (optional)
- * imageName The human readable name of an image (optional)
- * observationUnitDbId The unique identifier of the observation unit an image is portraying (optional)
- * observationDbId The unique identifier of the observation an image is associated with (optional)
- * descriptiveOntologyTerm A descriptive term associated with an image (optional)
- * commonCropName The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crop.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server. (optional)
- * programDbId Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class ImageQueryParams extends PhenotypeQueryParams {
-
-    private String imageDbId;
-    private String imageName;
-    private String observationUnitDbId;
-    private String observationDbId;
-    private String descriptiveOntologyTerm;
-    private String externalReferenceID;
-    private String externalReferenceSource;
-    private String commonCropName;
-    private String programDbId;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (imageDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("imageDbId", imageDbId));
-        if (imageName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("imageName", imageName));
-        if (observationDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationDbId", observationDbId));
-        if (descriptiveOntologyTerm != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("descriptiveOntologyTerm", descriptiveOntologyTerm));
-        if (commonCropName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/MethodQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/MethodQueryParams.java
deleted file mode 100644
index bc3fb276..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/MethodQueryParams.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.phenotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * methodDbId The unique identifier for a method (optional)
- * observationVariableDbId The unique identifier for an observation variable (optional)
- * ontologyDbId The unique identifier for an ontology definition. Use this parameter to filter results based on a specific ontology   Use &#x60;GET /ontologies&#x60; to find the list of available ontologies on a server. (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class MethodQueryParams extends PhenotypeQueryParams {
-
-    private String methodDbId;
-    private String observationVariableDbId;
-    private String ontologyDbId;
-    private String commonCropName;
-    private String programDbId;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (methodDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("methodDbId", methodDbId));
-        if (observationVariableDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationVariableDbId", observationVariableDbId));
-        if (ontologyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("ontologyDbId", ontologyDbId));
-        if (commonCropName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/ObservationQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/ObservationQueryParams.java
deleted file mode 100644
index 9dd451eb..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/ObservationQueryParams.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.phenotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * observationDbId The unique ID of an Observation (optional)
- * observationUnitDbId The unique ID of an Observation Unit (optional)
- * observationVariableDbId The unique ID of an observation variable (optional)
- * locationDbId The unique ID of a location where these observations were collected (optional)
- * seasonDbId The year or Phenotyping campaign of a multi-annual study (trees, grape, ...) (optional)
- * observationTimeStampRangeStart Timestamp range start (optional)
- * observationTimeStampRangeEnd Timestamp range end (optional)
- * observationUnitLevelName The Observation Unit Level. Returns only the observation unit of the specified Level.  &lt;br/&gt;References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelName  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
- * observationUnitLevelOrder The Observation Unit Level Order Number. Returns only the observation unit of the specified Level.  References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
- * observationUnitLevelCode The Observation Unit Level Code. This parameter should be used together with &#x60;observationUnitLevelName&#x60;  or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
- * observationUnitLevelRelationshipName The Observation Unit Level Relationship is a connection that this observation unit has to another level of the hierarchy.  &lt;br/&gt;For example, if you have several observation units at a &#x27;plot&#x27; level, they might all share a relationship to the same &#x27;field&#x27; level.   &lt;br/&gt;Use this parameter to identify groups of observation units that share a relationship level.  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
- * observationUnitLevelRelationshipOrder The Observation Unit Level Order Number.  &lt;br/&gt;Returns only the observation unit of the specified Level. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
- * observationUnitLevelRelationshipCode The Observation Unit Level Code.  &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
- * observationUnitLevelRelationshipDbId The observationUnitDbId associated with a particular level and code. &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;observationUnitDbId  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class ObservationQueryParams extends PhenotypeQueryParams {
-
-    private String observationDbId;
-    private String germplasmDbId;
-    private String observationVariableDbId;
-    private String studyDbId;
-    private String locationDbId;
-    private String trialDbId;
-    private String programDbId;
-    private String seasonDbId;
-    private String observationUnitLevelName;
-    private String observationUnitLevelOrder;
-    private String observationUnitLevelCode;
-    private OffsetDateTime observationTimeStampRangeStart;
-    private OffsetDateTime observationTimeStampRangeEnd;
-    private String observationUnitLevelRelationshipName;
-    private String observationUnitLevelRelationshipOrder;
-    private String observationUnitLevelRelationshipCode;
-    private String observationUnitLevelRelationshipDbId;
-    private String commonCropName;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (observationDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationDbId", observationDbId));
-        if (observationVariableDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationVariableDbId", observationVariableDbId));
-        if (locationDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("locationDbId", locationDbId));
-        if (seasonDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("seasonDbId", seasonDbId));
-        if (observationTimeStampRangeStart != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationTimeStampRangeStart", observationTimeStampRangeStart));
-        if (observationTimeStampRangeEnd != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationTimeStampRangeEnd", observationTimeStampRangeEnd));
-        if (observationUnitLevelName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelName", observationUnitLevelName));
-        if (observationUnitLevelOrder != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelOrder", observationUnitLevelOrder));
-        if (observationUnitLevelCode != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelCode", observationUnitLevelCode));
-        if (observationUnitLevelRelationshipName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelRelationshipName", observationUnitLevelRelationshipName));
-        if (observationUnitLevelRelationshipOrder != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelRelationshipOrder", observationUnitLevelRelationshipOrder));
-        if (observationUnitLevelRelationshipCode != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelRelationshipCode", observationUnitLevelRelationshipCode));
-        if (observationUnitLevelRelationshipDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelRelationshipDbId", observationUnitLevelRelationshipDbId));
-        if (commonCropName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-        if (trialDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("trialDbId", trialDbId));
-        if (studyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("studyDbId", studyDbId));
-        if (germplasmDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("germplasmDbId", germplasmDbId));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/ObservationUnitQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/ObservationUnitQueryParams.java
deleted file mode 100644
index fe4adaed..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/ObservationUnitQueryParams.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.phenotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * observationUnitDbId The unique ID of an Observation Unit (optional)
- * observationUnitName The human readable identifier for an Observation Unit (optional)
- * locationDbId The unique ID of a location where these observations were collected (optional)
- * seasonDbId The year or Phenotyping campaign of a multi-annual study (trees, grape, ...) (optional)
- * includeObservations Use this parameter to include a list of observations embedded in each ObservationUnit object.   CAUTION - Use this parameter at your own risk. It may return large, unpaginated lists of observation data. Only set this value to True if you are sure you need to.  (optional)
- * observationUnitLevelName The Observation Unit Level. Returns only the observation unit of the specified Level.  &lt;br/&gt;References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelName  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
- * observationUnitLevelOrder The Observation Unit Level Order Number. Returns only the observation unit of the specified Level.  References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
- * observationUnitLevelCode The Observation Unit Level Code. This parameter should be used together with &#x60;observationUnitLevelName&#x60;  or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
- * observationUnitLevelRelationshipName The Observation Unit Level Relationship is a connection that this observation unit has to another level of the hierarchy.  &lt;br/&gt;For example, if you have several observation units at a &#x27;plot&#x27; level, they might all share a relationship to the same &#x27;field&#x27; level.   &lt;br/&gt;Use this parameter to identify groups of observation units that share a relationship level.  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
- * observationUnitLevelRelationshipOrder The Observation Unit Level Order Number.  &lt;br/&gt;Returns only the observation unit of the specified Level. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
- * observationUnitLevelRelationshipCode The Observation Unit Level Code.  &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
- * observationUnitLevelRelationshipDbId The observationUnitDbId associated with a particular level and code. &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;observationUnitDbId  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class ObservationUnitQueryParams extends PhenotypeQueryParams {
-
-    private String germplasmDbId;
-    private String studyDbId;
-    private String locationDbId;
-    private String trialDbId;
-    private String programDbId;
-    private String seasonDbId;
-    private String observationUnitLevelName;
-    private String observationUnitLevelOrder;
-    private String observationUnitLevelCode;
-    private Boolean includeObservations;
-    private String observationUnitName;
-    private String observationUnitLevelRelationshipCode;
-    private String observationUnitLevelRelationshipDbId;
-    private String observationUnitLevelRelationshipOrder;
-    private String observationUnitLevelRelationshipName;
-    private String getObservationUnitLevelRelationshipName;
-    private String commonCropName;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (observationUnitName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitName", observationUnitName));
-        if (locationDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("locationDbId", locationDbId));
-        if (seasonDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("seasonDbId", seasonDbId));
-        if (includeObservations != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("includeObservations", includeObservations));
-        if (observationUnitLevelName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelName", observationUnitLevelName));
-        if (observationUnitLevelOrder != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelOrder", observationUnitLevelOrder));
-        if (observationUnitLevelCode != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelCode", observationUnitLevelCode));
-        if (observationUnitLevelRelationshipName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelRelationshipName", observationUnitLevelRelationshipName));
-        if (observationUnitLevelRelationshipOrder != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelRelationshipOrder", observationUnitLevelRelationshipOrder));
-        if (observationUnitLevelRelationshipCode != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelRelationshipCode", observationUnitLevelRelationshipCode));
-        if (observationUnitLevelRelationshipDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelRelationshipDbId", observationUnitLevelRelationshipDbId));
-        if (commonCropName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-        if (trialDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("trialDbId", trialDbId));
-        if (studyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("studyDbId", studyDbId));
-        if (germplasmDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("germplasmDbId", germplasmDbId));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/OntologyQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/OntologyQueryParams.java
deleted file mode 100644
index f0a0c70b..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/OntologyQueryParams.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.phenotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * ontologyName The human readable identifier for an ontology definition (optional)
- * ontologyDbId The unique identifier for an ontology definition. Use this parameter to filter results based on a specific ontology   Use &#x60;GET /ontologies&#x60; to find the list of available ontologies on a server. (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class OntologyQueryParams extends PhenotypeQueryParams {
-
-    private String ontologyDbId;
-    private String ontologyName;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (ontologyName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("ontologyName", ontologyName));
-        if (ontologyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("ontologyDbId", ontologyDbId));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/PhenotypeQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/PhenotypeQueryParams.java
deleted file mode 100644
index e211c5ad..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/PhenotypeQueryParams.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.phenotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-import org.brapi.client.v21.model.queryParams.BrAPISecureQueryParams;
-
-import java.util.List;
-import java.util.Map;
-
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class PhenotypeQueryParams extends BrAPISecureQueryParams {
-
-    private String observationUnitDbId;
-    private String externalReferenceId;
-    private String externalReferenceSource;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (observationUnitDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitDbId", observationUnitDbId));
-        if (externalReferenceId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceId", externalReferenceId));
-        if (externalReferenceSource != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceSource", externalReferenceSource));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/ScaleQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/ScaleQueryParams.java
deleted file mode 100644
index 20f49df7..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/ScaleQueryParams.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.phenotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * scaleDbId The unique identifier for a scale (optional)
- * observationVariableDbId The unique identifier for an observation variable (optional)
- * ontologyDbId The unique identifier for an ontology definition. Use this parameter to filter results based on a specific ontology   Use &#x60;GET /ontologies&#x60; to find the list of available ontologies on a server. (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class ScaleQueryParams extends PhenotypeQueryParams {
-
-    private String ontologyDbId;
-    private String commonCropName;
-    private String programDbId;
-    private String scaleDbId;
-    private String observationVariableDbId;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (scaleDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("scaleDbId", scaleDbId));
-        if (observationVariableDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationVariableDbId", observationVariableDbId));
-        if (ontologyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("ontologyDbId", ontologyDbId));
-        if (commonCropName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/TraitQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/TraitQueryParams.java
deleted file mode 100644
index 76c3f455..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/TraitQueryParams.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.phenotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * traitDbId The unique identifier for a trait (optional)
- * observationVariableDbId The unique identifier for an observation variable (optional)
- * ontologyDbId The unique identifier for an ontology definition. Use this parameter to filter results based on a specific ontology   Use &#x60;GET /ontologies&#x60; to find the list of available ontologies on a server. (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class TraitQueryParams extends PhenotypeQueryParams {
-
-    private String ontologyDbId;
-    private String commonCropName;
-    private String programDbId;
-    private String traitDbId;
-    private String observationVariableDbId;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (traitDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("traitDbId", traitDbId));
-        if (observationVariableDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationVariableDbId", observationVariableDbId));
-        if (ontologyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("ontologyDbId", ontologyDbId));
-        if (commonCropName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/VariableQueryParams.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/VariableQueryParams.java
deleted file mode 100644
index 062baf7e..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/model/queryParams/phenotype/VariableQueryParams.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.client.v21.model.queryParams.phenotype;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.SuperBuilder;
-import org.brapi.client.v21.ApiClient;
-import org.brapi.client.v21.Pair;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * observationVariableDbId Variable&#x27;s unique ID (optional)
- * observationVariableName Human readable name of an Observation Variable (optional)
- * observationVariablePUI The Permanent Unique Identifier of a Observation Variable, usually in the form of a URI (optional)
- * traitClass Variable&#x27;s trait class (phenological, physiological, morphological, etc.) (optional)
- * methodDbId Method unique identifier (optional)
- * methodName Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation (optional)
- * methodPUI The Permanent Unique Identifier of a Method, usually in the form of a URI (optional)
- * scaleDbId Scale unique identifier (optional)
- * scaleName Human readable name for the scale &lt;br/&gt;MIAPPE V1.1 (DM-88) Scale  Name of the scale of observation (optional)
- * scalePUI The Permanent Unique Identifier of a Scale, usually in the form of a URI (optional)
- * traitDbId Trait unique identifier (optional)
- * traitName Human readable name for the trait &lt;br/&gt;MIAPPE V1.1 (DM-88) Trait  Name of the trait of observation (optional)
- * traitPUI The Permanent Unique Identifier of a Trait, usually in the form of a URI (optional)
- * ontologyDbId The unique identifier for an ontology definition. Use this parameter to filter results based on a specific ontology   Use &#x60;GET /ontologies&#x60; to find the list of available ontologies on a server. (optional)
- */
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(fluent = true)
-public class VariableQueryParams extends PhenotypeQueryParams {
-
-    private String traitClass;
-    private String studyDbId;
-    private String observationVariableDbId;
-    private String observationVariableName;
-    private String observationVariablePUI;
-    private String methodName;
-    private String methodPUI;
-    private String methodDbId;
-    private String scaleDbId;
-    private String scaleName;
-    private String scalePUI;
-    private String traitDbId;
-    private String traitName;
-    private String traitPUI;
-    private String ontologyDbId;
-    private String commonCropName;
-    private String programDbId;
-    private String trialDbId;
-
-    @Override
-    public void buildQueryParams(ApiClient apiClient, List<Pair> localVarQueryParams, Map<String, String> headerParams) {
-        super.buildQueryParams(apiClient, localVarQueryParams, headerParams);
-        if (observationVariableDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationVariableDbId", observationVariableDbId));
-        if (observationVariableName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationVariableName", observationVariableName));
-        if (observationVariablePUI != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationVariablePUI", observationVariablePUI));
-        if (traitClass != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("traitClass", traitClass));
-        if (methodDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("methodDbId", methodDbId));
-        if (methodName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("methodName", methodName));
-        if (methodPUI != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("methodPUI", methodPUI));
-        if (scaleDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("scaleDbId", scaleDbId));
-        if (scaleName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("scaleName", scaleName));
-        if (scalePUI != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("scalePUI", scalePUI));
-        if (traitDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("traitDbId", traitDbId));
-        if (traitName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("traitName", traitName));
-        if (traitPUI != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("traitPUI", traitPUI));
-        if (ontologyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("ontologyDbId", ontologyDbId));
-        if (commonCropName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-        if (trialDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("trialDbId", trialDbId));
-        if (studyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("studyDbId", studyDbId));
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/CommonCropNamesApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/CommonCropNamesApi.java
deleted file mode 100644
index fedc7ce9..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/CommonCropNamesApi.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.core;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.model.v21.core.CommonCropNamesResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class CommonCropNamesApi {
-    private ApiClient apiClient;
-
-    public CommonCropNamesApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public CommonCropNamesApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for commoncropnamesGet
-     *
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call commoncropnamesGetCall(Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/commoncropnames";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call commoncropnamesGetValidateBeforeCall(Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return commoncropnamesGetCall(page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Common Crop Names
-     * List the common crop names for the crops available in a database server.   This call is ** required ** for multi-crop systems where data from multiple  crops may be stored in the same database server. A distinct database server  is defined by everything in the URL before \&quot;/brapi/v2\&quot;, including host  name and base path.  This call is recommended for single crop systems to be compatible with  multi-crop clients. For a single crop system the response should contain  an array with exactly 1 element.   The common crop name can be used as a search parameter for Programs,  Studies, and Germplasm.
-     *
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return CommonCropNamesResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CommonCropNamesResponse commoncropnamesGet(Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<CommonCropNamesResponse> resp = commoncropnamesGetWithHttpInfo(page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Common Crop Names
-     * List the common crop names for the crops available in a database server.   This call is ** required ** for multi-crop systems where data from multiple  crops may be stored in the same database server. A distinct database server  is defined by everything in the URL before \&quot;/brapi/v2\&quot;, including host  name and base path.  This call is recommended for single crop systems to be compatible with  multi-crop clients. For a single crop system the response should contain  an array with exactly 1 element.   The common crop name can be used as a search parameter for Programs,  Studies, and Germplasm.
-     *
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;CommonCropNamesResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CommonCropNamesResponse> commoncropnamesGetWithHttpInfo(Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = commoncropnamesGetValidateBeforeCall(page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<CommonCropNamesResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Common Crop Names (asynchronously)
-     * List the common crop names for the crops available in a database server.   This call is ** required ** for multi-crop systems where data from multiple  crops may be stored in the same database server. A distinct database server  is defined by everything in the URL before \&quot;/brapi/v2\&quot;, including host  name and base path.  This call is recommended for single crop systems to be compatible with  multi-crop clients. For a single crop system the response should contain  an array with exactly 1 element.   The common crop name can be used as a search parameter for Programs,  Studies, and Germplasm.
-     *
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call commoncropnamesGetAsync(Integer page, Integer pageSize, String authorization, final ApiCallback<CommonCropNamesResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = commoncropnamesGetValidateBeforeCall(page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CommonCropNamesResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/ListsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/ListsApi.java
deleted file mode 100644
index 6ff5bfbc..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/ListsApi.java
+++ /dev/null
@@ -1,997 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.core;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.core.ListQueryParams;
-import org.brapi.model.v21.core.*;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ListsApi {
-    private ApiClient apiClient;
-
-    public ListsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public ListsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for listsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call listsGetCall(ListQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/lists";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call listsGetValidateBeforeCall(ListQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return listsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get filtered set of generic lists
-     *
-     * @return ListsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ListsListResponse listsGet(ListQueryParams queryParams) throws ApiException {
-        ApiResponse<ListsListResponse> resp = listsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get filtered set of generic lists
-     *
-     * @return ApiResponse&lt;ListsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ListsListResponse> listsGetWithHttpInfo(ListQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = listsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<ListsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get filtered set of generic lists (asynchronously)
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call listsGetAsync(ListQueryParams queryParams, final ApiCallback<ListsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = listsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ListsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for listsListDbIdDataPost
-     *
-     * @param listDbId                The unique identifier of a generic List (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call listsListDbIdDataPostCall(String listDbId, List<String> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/lists/{listDbId}/data"
-                .replaceAll("\\{" + "listDbId" + "}", apiClient.escapeString(listDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call listsListDbIdDataPostValidateBeforeCall(String listDbId, List<String> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'listDbId' is set
-        if (listDbId == null) {
-            throw new ApiException("Missing the required parameter 'listDbId' when calling listsListDbIdDataPost(Async)");
-        }
-
-        return listsListDbIdDataPostCall(listDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Add new data members to a specific List
-     * Add new data members to a specific List
-     *
-     * @param listDbId      The unique identifier of a generic List (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ListResponse listsListDbIdDataPost(String listDbId, List<String> body, String authorization) throws ApiException {
-        ApiResponse<ListResponse> resp = listsListDbIdDataPostWithHttpInfo(listDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Add new data members to a specific List
-     * Add new data members to a specific List
-     *
-     * @param listDbId      The unique identifier of a generic List (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ListResponse> listsListDbIdDataPostWithHttpInfo(String listDbId, List<String> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = listsListDbIdDataPostValidateBeforeCall(listDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Add new data members to a specific List (asynchronously)
-     * Add new data members to a specific List
-     *
-     * @param listDbId      The unique identifier of a generic List (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call listsListDbIdDataPostAsync(String listDbId, List<String> body, String authorization, final ApiCallback<ListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = listsListDbIdDataPostValidateBeforeCall(listDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for listsListDbIdGet
-     *
-     * @param listDbId                The unique identifier of a List (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call listsListDbIdGetCall(String listDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/lists/{listDbId}"
-                .replaceAll("\\{" + "listDbId" + "}", apiClient.escapeString(listDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call listsListDbIdGetValidateBeforeCall(String listDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'listDbId' is set
-        if (listDbId == null) {
-            throw new ApiException("Missing the required parameter 'listDbId' when calling listsListDbIdGet(Async)");
-        }
-
-        return listsListDbIdGetCall(listDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details of a specific List
-     * Get a specific generic lists
-     *
-     * @param listDbId      The unique identifier of a List (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ListsSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ListsSingleResponse listsListDbIdGet(String listDbId, String authorization) throws ApiException {
-        ApiResponse<ListsSingleResponse> resp = listsListDbIdGetWithHttpInfo(listDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details of a specific List
-     * Get a specific generic lists
-     *
-     * @param listDbId      The unique identifier of a List (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ListsSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ListsSingleResponse> listsListDbIdGetWithHttpInfo(String listDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = listsListDbIdGetValidateBeforeCall(listDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ListsSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details of a specific List (asynchronously)
-     * Get a specific generic lists
-     *
-     * @param listDbId      The unique identifier of a List (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call listsListDbIdGetAsync(String listDbId, String authorization, final ApiCallback<ListsSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = listsListDbIdGetValidateBeforeCall(listDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ListsSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for listsListDbIdItemsPost
-     *
-     * @param listDbId                The unique identifier of a List (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call listsListDbIdItemsPostCall(String listDbId, List<String> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/lists/{listDbId}/items"
-                .replaceAll("\\{" + "listDbId" + "}", apiClient.escapeString(listDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call listsListDbIdItemsPostValidateBeforeCall(String listDbId, List<String> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'listDbId' is set
-        if (listDbId == null) {
-            throw new ApiException("Missing the required parameter 'listDbId' when calling listsListDbIdItemsPost(Async)");
-        }
-
-        return listsListDbIdItemsPostCall(listDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Add Items to a specific List
-     * **Deprecated in v2.1** Please use &#x60;POST /lists/{listDbId}/data&#x60;. Github issue number #444  &lt;br/&gt; Add new data to a specific generic lists
-     *
-     * @param listDbId      The unique identifier of a List (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ListResponse listsListDbIdItemsPost(String listDbId, List<String> body, String authorization) throws ApiException {
-        ApiResponse<ListResponse> resp = listsListDbIdItemsPostWithHttpInfo(listDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Add Items to a specific List
-     * **Deprecated in v2.1** Please use &#x60;POST /lists/{listDbId}/data&#x60;. Github issue number #444  &lt;br/&gt; Add new data to a specific generic lists
-     *
-     * @param listDbId      The unique identifier of a List (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ListResponse> listsListDbIdItemsPostWithHttpInfo(String listDbId, List<String> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = listsListDbIdItemsPostValidateBeforeCall(listDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Add Items to a specific List (asynchronously)
-     * **Deprecated in v2.1** Please use &#x60;POST /lists/{listDbId}/data&#x60;. Github issue number #444  &lt;br/&gt; Add new data to a specific generic lists
-     *
-     * @param listDbId      The unique identifier of a List (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call listsListDbIdItemsPostAsync(String listDbId, List<String> body, String authorization, final ApiCallback<ListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = listsListDbIdItemsPostValidateBeforeCall(listDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for listsListDbIdPut
-     *
-     * @param listDbId                The unique identifier of a List (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call listsListDbIdPutCall(String listDbId, ListNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/lists/{listDbId}"
-                .replaceAll("\\{" + "listDbId" + "}", apiClient.escapeString(listDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call listsListDbIdPutValidateBeforeCall(String listDbId, ListNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'listDbId' is set
-        if (listDbId == null) {
-            throw new ApiException("Missing the required parameter 'listDbId' when calling listsListDbIdPut(Async)");
-        }
-
-        return listsListDbIdPutCall(listDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update an existing generic list
-     * Update an existing generic list
-     *
-     * @param listDbId      The unique identifier of a List (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ListsSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ListsSingleResponse listsListDbIdPut(String listDbId, ListNewRequest body, String authorization) throws ApiException {
-        ApiResponse<ListsSingleResponse> resp = listsListDbIdPutWithHttpInfo(listDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update an existing generic list
-     * Update an existing generic list
-     *
-     * @param listDbId      The unique identifier of a List (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ListsSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ListsSingleResponse> listsListDbIdPutWithHttpInfo(String listDbId, ListNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = listsListDbIdPutValidateBeforeCall(listDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ListsSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update an existing generic list (asynchronously)
-     * Update an existing generic list
-     *
-     * @param listDbId      The unique identifier of a List (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call listsListDbIdPutAsync(String listDbId, ListNewRequest body, String authorization, final ApiCallback<ListsSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = listsListDbIdPutValidateBeforeCall(listDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ListsSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for listsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call listsPostCall(List<ListNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/lists";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call listsPostValidateBeforeCall(List<ListNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return listsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Create New List Objects
-     * Create new list objects in the database
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ListsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ListsListResponse listsPost(List<ListNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<ListsListResponse> resp = listsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Create New List Objects
-     * Create new list objects in the database
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ListsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ListsListResponse> listsPostWithHttpInfo(List<ListNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = listsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ListsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Create New List Objects (asynchronously)
-     * Create new list objects in the database
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call listsPostAsync(List<ListNewRequest> body, String authorization, final ApiCallback<ListsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = listsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ListsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchListsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchListsPostCall(ListSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/lists";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchListsPostValidateBeforeCall(ListSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchListsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for Lists
-     * Submit a search request for Lists &lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/lists/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ListsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ListsListResponse searchListsPost(ListSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<ListsListResponse> resp = searchListsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for Lists
-     * Submit a search request for Lists &lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/lists/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ListsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ListsListResponse> searchListsPostWithHttpInfo(ListSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchListsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ListsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for Lists (asynchronously)
-     * Submit a search request for Lists &lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/lists/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchListsPostAsync(ListSearchRequest body, String authorization, final ApiCallback<ListsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchListsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ListsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchListsSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchListsSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/lists/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchListsSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchListsSearchResultsDbIdGet(Async)");
-        }
-
-        return searchListsSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;List&#x60; search request
-     * Get the results of a &#x60;List&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/lists&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ListsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ListsListResponse searchListsSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<ListsListResponse> resp = searchListsSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;List&#x60; search request
-     * Get the results of a &#x60;List&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/lists&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ListsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ListsListResponse> searchListsSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchListsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ListsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;List&#x60; search request (asynchronously)
-     * Get the results of a &#x60;List&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/lists&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchListsSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<ListsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchListsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ListsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/LocationsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/LocationsApi.java
deleted file mode 100644
index a17493c9..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/LocationsApi.java
+++ /dev/null
@@ -1,757 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.core;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.core.LocationQueryParams;
-import org.brapi.model.v21.core.LocationListResponse;
-import org.brapi.model.v21.core.LocationNewRequest;
-import org.brapi.model.v21.core.LocationSearchRequest;
-import org.brapi.model.v21.core.LocationSingleResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class LocationsApi {
-    private ApiClient apiClient;
-
-    public LocationsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public LocationsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for locationsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call locationsGetCall(LocationQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/locations";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call locationsGetValidateBeforeCall(LocationQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return locationsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a filtered list of Locations
-     * Get a list of locations. * The &#x60;countryCode&#x60; is as per [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec. * &#x60;altitude&#x60; is in meters.
-     *
-     * @return LocationListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public LocationListResponse locationsGet(LocationQueryParams queryParams) throws ApiException {
-        ApiResponse<LocationListResponse> resp = locationsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get a filtered list of Locations
-     * Get a list of locations. * The &#x60;countryCode&#x60; is as per [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec. * &#x60;altitude&#x60; is in meters.
-     *
-     * @return ApiResponse&lt;LocationListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<LocationListResponse> locationsGetWithHttpInfo(LocationQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = locationsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<LocationListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a filtered list of Locations (asynchronously)
-     * Get a list of locations. * The &#x60;countryCode&#x60; is as per [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec. * &#x60;altitude&#x60; is in meters.
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call locationsGetAsync(LocationQueryParams queryParams, final ApiCallback<LocationListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = locationsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<LocationListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for locationsLocationDbIdGet
-     *
-     * @param locationDbId            The internal DB id for a location (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call locationsLocationDbIdGetCall(String locationDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/locations/{locationDbId}"
-                .replaceAll("\\{" + "locationDbId" + "}", apiClient.escapeString(locationDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call locationsLocationDbIdGetValidateBeforeCall(String locationDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'locationDbId' is set
-        if (locationDbId == null) {
-            throw new ApiException("Missing the required parameter 'locationDbId' when calling locationsLocationDbIdGet(Async)");
-        }
-
-        return locationsLocationDbIdGetCall(locationDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details of a specific Location
-     * Get details for a location. - The &#x60;countryCode&#x60; is as per [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec. - &#x60;altitude&#x60; is in meters.&#x27;
-     *
-     * @param locationDbId  The internal DB id for a location (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return LocationSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public LocationSingleResponse locationsLocationDbIdGet(String locationDbId, String authorization) throws ApiException {
-        ApiResponse<LocationSingleResponse> resp = locationsLocationDbIdGetWithHttpInfo(locationDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details of a specific Location
-     * Get details for a location. - The &#x60;countryCode&#x60; is as per [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec. - &#x60;altitude&#x60; is in meters.&#x27;
-     *
-     * @param locationDbId  The internal DB id for a location (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;LocationSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<LocationSingleResponse> locationsLocationDbIdGetWithHttpInfo(String locationDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = locationsLocationDbIdGetValidateBeforeCall(locationDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<LocationSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details of a specific Location (asynchronously)
-     * Get details for a location. - The &#x60;countryCode&#x60; is as per [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec. - &#x60;altitude&#x60; is in meters.&#x27;
-     *
-     * @param locationDbId  The internal DB id for a location (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call locationsLocationDbIdGetAsync(String locationDbId, String authorization, final ApiCallback<LocationSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = locationsLocationDbIdGetValidateBeforeCall(locationDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<LocationSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for locationsLocationDbIdPut
-     *
-     * @param locationDbId            The internal DB id for a location (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call locationsLocationDbIdPutCall(String locationDbId, LocationNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/locations/{locationDbId}"
-                .replaceAll("\\{" + "locationDbId" + "}", apiClient.escapeString(locationDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call locationsLocationDbIdPutValidateBeforeCall(String locationDbId, LocationNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'locationDbId' is set
-        if (locationDbId == null) {
-            throw new ApiException("Missing the required parameter 'locationDbId' when calling locationsLocationDbIdPut(Async)");
-        }
-
-        return locationsLocationDbIdPutCall(locationDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update the details for an existing Location
-     * Update the details for an existing location. - The &#x60;countryCode&#x60; is as per [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec. - &#x60;altitude&#x60; is in meters.&#x27;
-     *
-     * @param locationDbId  The internal DB id for a location (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return LocationSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public LocationSingleResponse locationsLocationDbIdPut(String locationDbId, LocationNewRequest body, String authorization) throws ApiException {
-        ApiResponse<LocationSingleResponse> resp = locationsLocationDbIdPutWithHttpInfo(locationDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update the details for an existing Location
-     * Update the details for an existing location. - The &#x60;countryCode&#x60; is as per [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec. - &#x60;altitude&#x60; is in meters.&#x27;
-     *
-     * @param locationDbId  The internal DB id for a location (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;LocationSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<LocationSingleResponse> locationsLocationDbIdPutWithHttpInfo(String locationDbId, LocationNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = locationsLocationDbIdPutValidateBeforeCall(locationDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<LocationSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update the details for an existing Location (asynchronously)
-     * Update the details for an existing location. - The &#x60;countryCode&#x60; is as per [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec. - &#x60;altitude&#x60; is in meters.&#x27;
-     *
-     * @param locationDbId  The internal DB id for a location (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call locationsLocationDbIdPutAsync(String locationDbId, LocationNewRequest body, String authorization, final ApiCallback<LocationSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = locationsLocationDbIdPutValidateBeforeCall(locationDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<LocationSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for locationsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call locationsPostCall(List<LocationNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/locations";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call locationsPostValidateBeforeCall(List<LocationNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return locationsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Create new Locations
-     * Add new locations to database * The &#x60;countryCode&#x60; is as per [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec. * &#x60;altitude&#x60; is in meters.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return LocationListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public LocationListResponse locationsPost(List<LocationNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<LocationListResponse> resp = locationsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Create new Locations
-     * Add new locations to database * The &#x60;countryCode&#x60; is as per [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec. * &#x60;altitude&#x60; is in meters.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;LocationListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<LocationListResponse> locationsPostWithHttpInfo(List<LocationNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = locationsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<LocationListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Create new Locations (asynchronously)
-     * Add new locations to database * The &#x60;countryCode&#x60; is as per [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec. * &#x60;altitude&#x60; is in meters.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call locationsPostAsync(List<LocationNewRequest> body, String authorization, final ApiCallback<LocationListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = locationsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<LocationListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchLocationsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchLocationsPostCall(LocationSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/locations";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchLocationsPostValidateBeforeCall(LocationSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchLocationsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;Locations&#x60;
-     * Submit a search request for &#x60;Locations&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/locations/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return LocationListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public LocationListResponse searchLocationsPost(LocationSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<LocationListResponse> resp = searchLocationsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;Locations&#x60;
-     * Submit a search request for &#x60;Locations&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/locations/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;LocationListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<LocationListResponse> searchLocationsPostWithHttpInfo(LocationSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchLocationsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<LocationListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;Locations&#x60; (asynchronously)
-     * Submit a search request for &#x60;Locations&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/locations/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchLocationsPostAsync(LocationSearchRequest body, String authorization, final ApiCallback<LocationListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchLocationsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<LocationListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchLocationsSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchLocationsSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/locations/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchLocationsSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchLocationsSearchResultsDbIdGet(Async)");
-        }
-
-        return searchLocationsSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;Locations&#x60; search request
-     * Get the results of a &#x60;Locations&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/location&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return LocationListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public LocationListResponse searchLocationsSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<LocationListResponse> resp = searchLocationsSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;Locations&#x60; search request
-     * Get the results of a &#x60;Locations&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/location&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;LocationListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<LocationListResponse> searchLocationsSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchLocationsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<LocationListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;Locations&#x60; search request (asynchronously)
-     * Get the results of a &#x60;Locations&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/location&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchLocationsSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<LocationListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchLocationsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<LocationListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/PeopleApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/PeopleApi.java
deleted file mode 100644
index aaf27d8f..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/PeopleApi.java
+++ /dev/null
@@ -1,754 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.core;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.core.PeopleQueryParams;
-import org.brapi.model.v21.core.PersonListResponse;
-import org.brapi.model.v21.core.PersonNewRequest;
-import org.brapi.model.v21.core.PersonSearchRequest;
-import org.brapi.model.v21.core.PersonSingleResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class PeopleApi {
-    private ApiClient apiClient;
-
-    public PeopleApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public PeopleApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for peopleGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call peopleGetCall(PeopleQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/people";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call peopleGetValidateBeforeCall(PeopleQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return peopleGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get filtered list of People
-     *
-     * @return PersonListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PersonListResponse peopleGet(PeopleQueryParams queryParams) throws ApiException {
-        ApiResponse<PersonListResponse> resp = peopleGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get filtered list of People
-     *
-     * @return ApiResponse&lt;PersonListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PersonListResponse> peopleGetWithHttpInfo(PeopleQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = peopleGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<PersonListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get filtered list of People (asynchronously)
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call peopleGetAsync(PeopleQueryParams queryParams, final ApiCallback<PersonListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = peopleGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PersonListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for peoplePersonDbIdGet
-     *
-     * @param personDbId              The unique ID of a person (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call peoplePersonDbIdGetCall(String personDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/people/{personDbId}"
-                .replaceAll("\\{" + "personDbId" + "}", apiClient.escapeString(personDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call peoplePersonDbIdGetValidateBeforeCall(String personDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'personDbId' is set
-        if (personDbId == null) {
-            throw new ApiException("Missing the required parameter 'personDbId' when calling peoplePersonDbIdGet(Async)");
-        }
-
-        return peoplePersonDbIdGetCall(personDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details for a specific Person
-     * Get the details for a specific Person
-     *
-     * @param personDbId    The unique ID of a person (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PersonSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PersonSingleResponse peoplePersonDbIdGet(String personDbId, String authorization) throws ApiException {
-        ApiResponse<PersonSingleResponse> resp = peoplePersonDbIdGetWithHttpInfo(personDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details for a specific Person
-     * Get the details for a specific Person
-     *
-     * @param personDbId    The unique ID of a person (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PersonSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PersonSingleResponse> peoplePersonDbIdGetWithHttpInfo(String personDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = peoplePersonDbIdGetValidateBeforeCall(personDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PersonSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details for a specific Person (asynchronously)
-     * Get the details for a specific Person
-     *
-     * @param personDbId    The unique ID of a person (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call peoplePersonDbIdGetAsync(String personDbId, String authorization, final ApiCallback<PersonSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = peoplePersonDbIdGetValidateBeforeCall(personDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PersonSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for peoplePersonDbIdPut
-     *
-     * @param personDbId              The unique ID of a person (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call peoplePersonDbIdPutCall(String personDbId, PersonNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/people/{personDbId}"
-                .replaceAll("\\{" + "personDbId" + "}", apiClient.escapeString(personDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call peoplePersonDbIdPutValidateBeforeCall(String personDbId, PersonNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'personDbId' is set
-        if (personDbId == null) {
-            throw new ApiException("Missing the required parameter 'personDbId' when calling peoplePersonDbIdPut(Async)");
-        }
-
-        return peoplePersonDbIdPutCall(personDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update an existing Person
-     * Update an existing Person
-     *
-     * @param personDbId    The unique ID of a person (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PersonSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PersonSingleResponse peoplePersonDbIdPut(String personDbId, PersonNewRequest body, String authorization) throws ApiException {
-        ApiResponse<PersonSingleResponse> resp = peoplePersonDbIdPutWithHttpInfo(personDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update an existing Person
-     * Update an existing Person
-     *
-     * @param personDbId    The unique ID of a person (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PersonSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PersonSingleResponse> peoplePersonDbIdPutWithHttpInfo(String personDbId, PersonNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = peoplePersonDbIdPutValidateBeforeCall(personDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PersonSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update an existing Person (asynchronously)
-     * Update an existing Person
-     *
-     * @param personDbId    The unique ID of a person (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call peoplePersonDbIdPutAsync(String personDbId, PersonNewRequest body, String authorization, final ApiCallback<PersonSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = peoplePersonDbIdPutValidateBeforeCall(personDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PersonSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for peoplePost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call peoplePostCall(List<PersonNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/people";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call peoplePostValidateBeforeCall(List<PersonNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return peoplePostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Create new People
-     * Create new People entities. &#x60;personDbId&#x60; is generated and managed by the server.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PersonListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PersonListResponse peoplePost(List<PersonNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<PersonListResponse> resp = peoplePostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Create new People
-     * Create new People entities. &#x60;personDbId&#x60; is generated and managed by the server.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PersonListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PersonListResponse> peoplePostWithHttpInfo(List<PersonNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = peoplePostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PersonListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Create new People (asynchronously)
-     * Create new People entities. &#x60;personDbId&#x60; is generated and managed by the server.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call peoplePostAsync(List<PersonNewRequest> body, String authorization, final ApiCallback<PersonListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = peoplePostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PersonListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchPeoplePost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchPeoplePostCall(PersonSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/people";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchPeoplePostValidateBeforeCall(PersonSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchPeoplePostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;People&#x60;
-     * Submit a search request for &#x60;People&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/people/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PersonListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PersonListResponse searchPeoplePost(PersonSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<PersonListResponse> resp = searchPeoplePostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;People&#x60;
-     * Submit a search request for &#x60;People&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/people/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PersonListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PersonListResponse> searchPeoplePostWithHttpInfo(PersonSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchPeoplePostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PersonListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;People&#x60; (asynchronously)
-     * Submit a search request for &#x60;People&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/people/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchPeoplePostAsync(PersonSearchRequest body, String authorization, final ApiCallback<PersonListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchPeoplePostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PersonListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchPeopleSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchPeopleSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/people/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchPeopleSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchPeopleSearchResultsDbIdGet(Async)");
-        }
-
-        return searchPeopleSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;People&#x60; search request
-     * Get the results of a &#x60;People&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/people&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PersonListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PersonListResponse searchPeopleSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<PersonListResponse> resp = searchPeopleSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;People&#x60; search request
-     * Get the results of a &#x60;People&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/people&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PersonListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PersonListResponse> searchPeopleSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchPeopleSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PersonListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;People&#x60; search request (asynchronously)
-     * Get the results of a &#x60;People&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/people&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchPeopleSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<PersonListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchPeopleSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PersonListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/ProgramsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/ProgramsApi.java
deleted file mode 100644
index f6ee90e4..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/ProgramsApi.java
+++ /dev/null
@@ -1,752 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.core;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.core.ProgramQueryParams;
-import org.brapi.model.v21.core.ProgramListResponse;
-import org.brapi.model.v21.core.ProgramNewRequest;
-import org.brapi.model.v21.core.ProgramSearchRequest;
-import org.brapi.model.v21.core.ProgramSingleResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ProgramsApi {
-    private ApiClient apiClient;
-
-    public ProgramsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public ProgramsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for programsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call programsGetCall(ProgramQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/programs";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call programsGetValidateBeforeCall(ProgramQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return programsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a filtered list of breeding Programs. This list can be filtered by common crop name to narrow results to a specific crop.
-     *
-     * @return ProgramListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ProgramListResponse programsGet(ProgramQueryParams queryParams) throws ApiException {
-        ApiResponse<ProgramListResponse> resp = programsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get a filtered list of breeding Programs. This list can be filtered by common crop name to narrow results to a specific crop.
-     *
-     * @return ApiResponse&lt;ProgramListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ProgramListResponse> programsGetWithHttpInfo(ProgramQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = programsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<ProgramListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a filtered list of breeding Programs. This list can be filtered by common crop name to narrow results to a specific crop.
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call programsGetAsync(ProgramQueryParams queryParams, final ApiCallback<ProgramListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = programsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ProgramListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for programsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call programsPostCall(List<ProgramNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/programs";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call programsPostValidateBeforeCall(List<ProgramNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return programsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Add new breeding Programs to the database
-     * Add new breeding Programs to the database. The &#x60;programDbId&#x60; is set by the server, all other fields are take from the request body, or a default value is used.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ProgramListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ProgramListResponse programsPost(List<ProgramNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<ProgramListResponse> resp = programsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Add new breeding Programs to the database
-     * Add new breeding Programs to the database. The &#x60;programDbId&#x60; is set by the server, all other fields are take from the request body, or a default value is used.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ProgramListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ProgramListResponse> programsPostWithHttpInfo(List<ProgramNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = programsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ProgramListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Add new breeding Programs to the database (asynchronously)
-     * Add new breeding Programs to the database. The &#x60;programDbId&#x60; is set by the server, all other fields are take from the request body, or a default value is used.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call programsPostAsync(List<ProgramNewRequest> body, String authorization, final ApiCallback<ProgramListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = programsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ProgramListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for programsProgramDbIdGet
-     *
-     * @param programDbId             Filter by the common crop name. Exact match. (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call programsProgramDbIdGetCall(String programDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/programs/{programDbId}"
-                .replaceAll("\\{" + "programDbId" + "}", apiClient.escapeString(programDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call programsProgramDbIdGetValidateBeforeCall(String programDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'programDbId' is set
-        if (programDbId == null) {
-            throw new ApiException("Missing the required parameter 'programDbId' when calling programsProgramDbIdGet(Async)");
-        }
-
-        return programsProgramDbIdGetCall(programDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a breeding Program by Id
-     * Get a single breeding Program by Id. This can be used to quickly get the details of a Program when you have the Id from another entity.
-     *
-     * @param programDbId   Filter by the common crop name. Exact match. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ProgramSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ProgramSingleResponse programsProgramDbIdGet(String programDbId, String authorization) throws ApiException {
-        ApiResponse<ProgramSingleResponse> resp = programsProgramDbIdGetWithHttpInfo(programDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get a breeding Program by Id
-     * Get a single breeding Program by Id. This can be used to quickly get the details of a Program when you have the Id from another entity.
-     *
-     * @param programDbId   Filter by the common crop name. Exact match. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ProgramSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ProgramSingleResponse> programsProgramDbIdGetWithHttpInfo(String programDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = programsProgramDbIdGetValidateBeforeCall(programDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ProgramSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a breeding Program by Id (asynchronously)
-     * Get a single breeding Program by Id. This can be used to quickly get the details of a Program when you have the Id from another entity.
-     *
-     * @param programDbId   Filter by the common crop name. Exact match. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call programsProgramDbIdGetAsync(String programDbId, String authorization, final ApiCallback<ProgramSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = programsProgramDbIdGetValidateBeforeCall(programDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ProgramSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for programsProgramDbIdPut
-     *
-     * @param programDbId             Filter by the common crop name. Exact match. (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call programsProgramDbIdPutCall(String programDbId, ProgramNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/programs/{programDbId}"
-                .replaceAll("\\{" + "programDbId" + "}", apiClient.escapeString(programDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call programsProgramDbIdPutValidateBeforeCall(String programDbId, ProgramNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'programDbId' is set
-        if (programDbId == null) {
-            throw new ApiException("Missing the required parameter 'programDbId' when calling programsProgramDbIdPut(Async)");
-        }
-
-        return programsProgramDbIdPutCall(programDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update an existing Program
-     * Update the details of an existing breeding Program.
-     *
-     * @param programDbId   Filter by the common crop name. Exact match. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ProgramSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ProgramSingleResponse programsProgramDbIdPut(String programDbId, ProgramNewRequest body, String authorization) throws ApiException {
-        ApiResponse<ProgramSingleResponse> resp = programsProgramDbIdPutWithHttpInfo(programDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update an existing Program
-     * Update the details of an existing breeding Program.
-     *
-     * @param programDbId   Filter by the common crop name. Exact match. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ProgramSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ProgramSingleResponse> programsProgramDbIdPutWithHttpInfo(String programDbId, ProgramNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = programsProgramDbIdPutValidateBeforeCall(programDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ProgramSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update an existing Program (asynchronously)
-     * Update the details of an existing breeding Program.
-     *
-     * @param programDbId   Filter by the common crop name. Exact match. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call programsProgramDbIdPutAsync(String programDbId, ProgramNewRequest body, String authorization, final ApiCallback<ProgramSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = programsProgramDbIdPutValidateBeforeCall(programDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ProgramSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchProgramsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchProgramsPostCall(ProgramSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/programs";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchProgramsPostValidateBeforeCall(ProgramSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchProgramsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;Programs&#x60;
-     * Submit a search request for &#x60;Programs&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/programs/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ProgramListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ProgramListResponse searchProgramsPost(ProgramSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<ProgramListResponse> resp = searchProgramsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;Programs&#x60;
-     * Submit a search request for &#x60;Programs&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/programs/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ProgramListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ProgramListResponse> searchProgramsPostWithHttpInfo(ProgramSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchProgramsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ProgramListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;Programs&#x60; (asynchronously)
-     * Submit a search request for &#x60;Programs&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/programs/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchProgramsPostAsync(ProgramSearchRequest body, String authorization, final ApiCallback<ProgramListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchProgramsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ProgramListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchProgramsSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchProgramsSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/programs/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchProgramsSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchProgramsSearchResultsDbIdGet(Async)");
-        }
-
-        return searchProgramsSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;Programs&#x60; search request
-     * Get the results of a &#x60;Programs&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/programs&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ProgramListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ProgramListResponse searchProgramsSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<ProgramListResponse> resp = searchProgramsSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;Programs&#x60; search request
-     * Get the results of a &#x60;Programs&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/programs&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ProgramListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ProgramListResponse> searchProgramsSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchProgramsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ProgramListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;Programs&#x60; search request (asynchronously)
-     * Get the results of a &#x60;Programs&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/programs&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchProgramsSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<ProgramListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchProgramsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ProgramListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/SeasonsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/SeasonsApi.java
deleted file mode 100644
index cab65cab..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/SeasonsApi.java
+++ /dev/null
@@ -1,509 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.core;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.core.SeasonQueryParams;
-import org.brapi.model.v21.core.Season;
-import org.brapi.model.v21.core.SeasonListResponse;
-import org.brapi.model.v21.core.SeasonSingleResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class SeasonsApi {
-    private ApiClient apiClient;
-
-    public SeasonsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public SeasonsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for seasonsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call seasonsGetCall(SeasonQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/seasons";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call seasonsGetValidateBeforeCall(SeasonQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return seasonsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Seasons
-     * Call to retrieve all seasons in the database.  A season is made of 2 parts; the primary year and a term which defines a segment of the year.  This could be a traditional season, like \&quot;Spring\&quot; or \&quot;Summer\&quot; or this could be a month, like  \&quot;May\&quot; or \&quot;June\&quot; or this could be an arbitrary season name which is meaningful to the breeding  program like \&quot;PlantingTime_3\&quot; or \&quot;Season E\&quot;
-     *
-     * @return SeasonListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SeasonListResponse seasonsGet(SeasonQueryParams queryParams) throws ApiException {
-        ApiResponse<SeasonListResponse> resp = seasonsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Seasons
-     * Call to retrieve all seasons in the database.  A season is made of 2 parts; the primary year and a term which defines a segment of the year.  This could be a traditional season, like \&quot;Spring\&quot; or \&quot;Summer\&quot; or this could be a month, like  \&quot;May\&quot; or \&quot;June\&quot; or this could be an arbitrary season name which is meaningful to the breeding  program like \&quot;PlantingTime_3\&quot; or \&quot;Season E\&quot;
-     *
-     * @return ApiResponse&lt;SeasonListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SeasonListResponse> seasonsGetWithHttpInfo(SeasonQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = seasonsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<SeasonListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Call to retrieve all seasons in the database.  A season is made of 2 parts; the primary year and a term which defines a segment of the year.  This could be a traditional season, like \&quot;Spring\&quot; or \&quot;Summer\&quot; or this could be a month, like  \&quot;May\&quot; or \&quot;June\&quot; or this could be an arbitrary season name which is meaningful to the breeding  program like \&quot;PlantingTime_3\&quot; or \&quot;Season E\&quot;
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call seasonsGetAsync(SeasonQueryParams queryParams, final ApiCallback<SeasonListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = seasonsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SeasonListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for seasonsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call seasonsPostCall(List<Season> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/seasons";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call seasonsPostValidateBeforeCall(List<Season> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return seasonsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * POST new Seasons
-     * Add new season entries to the database
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return SeasonListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SeasonListResponse seasonsPost(List<Season> body, String authorization) throws ApiException {
-        ApiResponse<SeasonListResponse> resp = seasonsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * POST new Seasons
-     * Add new season entries to the database
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;SeasonListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SeasonListResponse> seasonsPostWithHttpInfo(List<Season> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = seasonsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<SeasonListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * POST new Seasons (asynchronously)
-     * Add new season entries to the database
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call seasonsPostAsync(List<Season> body, String authorization, final ApiCallback<SeasonListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = seasonsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SeasonListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for seasonsSeasonDbIdGet
-     *
-     * @param seasonDbId              The unique identifier for a season. For backward compatibility it can be a string like &#x27;2012&#x27;, &#x27;1957-2004&#x27; (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call seasonsSeasonDbIdGetCall(String seasonDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/seasons/{seasonDbId}"
-                .replaceAll("\\{" + "seasonDbId" + "}", apiClient.escapeString(seasonDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call seasonsSeasonDbIdGetValidateBeforeCall(String seasonDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'seasonDbId' is set
-        if (seasonDbId == null) {
-            throw new ApiException("Missing the required parameter 'seasonDbId' when calling seasonsSeasonDbIdGet(Async)");
-        }
-
-        return seasonsSeasonDbIdGetCall(seasonDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the a single Season
-     * Get the a single Season
-     *
-     * @param seasonDbId    The unique identifier for a season. For backward compatibility it can be a string like &#x27;2012&#x27;, &#x27;1957-2004&#x27; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return SeasonSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SeasonSingleResponse seasonsSeasonDbIdGet(String seasonDbId, String authorization) throws ApiException {
-        ApiResponse<SeasonSingleResponse> resp = seasonsSeasonDbIdGetWithHttpInfo(seasonDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the a single Season
-     * Get the a single Season
-     *
-     * @param seasonDbId    The unique identifier for a season. For backward compatibility it can be a string like &#x27;2012&#x27;, &#x27;1957-2004&#x27; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;SeasonSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SeasonSingleResponse> seasonsSeasonDbIdGetWithHttpInfo(String seasonDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = seasonsSeasonDbIdGetValidateBeforeCall(seasonDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<SeasonSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the a single Season (asynchronously)
-     * Get the a single Season
-     *
-     * @param seasonDbId    The unique identifier for a season. For backward compatibility it can be a string like &#x27;2012&#x27;, &#x27;1957-2004&#x27; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call seasonsSeasonDbIdGetAsync(String seasonDbId, String authorization, final ApiCallback<SeasonSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = seasonsSeasonDbIdGetValidateBeforeCall(seasonDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SeasonSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for seasonsSeasonDbIdPut
-     *
-     * @param seasonDbId              The unique identifier for a season. For backward compatibility it can be a string like &#x27;2012&#x27;, &#x27;1957-2004&#x27; (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call seasonsSeasonDbIdPutCall(String seasonDbId, Season body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/seasons/{seasonDbId}"
-                .replaceAll("\\{" + "seasonDbId" + "}", apiClient.escapeString(seasonDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call seasonsSeasonDbIdPutValidateBeforeCall(String seasonDbId, Season body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'seasonDbId' is set
-        if (seasonDbId == null) {
-            throw new ApiException("Missing the required parameter 'seasonDbId' when calling seasonsSeasonDbIdPut(Async)");
-        }
-
-        return seasonsSeasonDbIdPutCall(seasonDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update existing Seasons
-     * Update existing Seasons
-     *
-     * @param seasonDbId    The unique identifier for a season. For backward compatibility it can be a string like &#x27;2012&#x27;, &#x27;1957-2004&#x27; (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return SeasonSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SeasonSingleResponse seasonsSeasonDbIdPut(String seasonDbId, Season body, String authorization) throws ApiException {
-        ApiResponse<SeasonSingleResponse> resp = seasonsSeasonDbIdPutWithHttpInfo(seasonDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update existing Seasons
-     * Update existing Seasons
-     *
-     * @param seasonDbId    The unique identifier for a season. For backward compatibility it can be a string like &#x27;2012&#x27;, &#x27;1957-2004&#x27; (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;SeasonSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SeasonSingleResponse> seasonsSeasonDbIdPutWithHttpInfo(String seasonDbId, Season body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = seasonsSeasonDbIdPutValidateBeforeCall(seasonDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<SeasonSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update existing Seasons (asynchronously)
-     * Update existing Seasons
-     *
-     * @param seasonDbId    The unique identifier for a season. For backward compatibility it can be a string like &#x27;2012&#x27;, &#x27;1957-2004&#x27; (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call seasonsSeasonDbIdPutAsync(String seasonDbId, Season body, String authorization, final ApiCallback<SeasonSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = seasonsSeasonDbIdPutValidateBeforeCall(seasonDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SeasonSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/ServerInfoApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/ServerInfoApi.java
deleted file mode 100644
index 4aab256a..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/ServerInfoApi.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.core;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.model.v21.core.ContentTypes;
-import org.brapi.model.v21.core.ServerInfoResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ServerInfoApi {
-    private ApiClient apiClient;
-
-    public ServerInfoApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public ServerInfoApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for serverinfoGet
-     *
-     * @param contentType             Filter the list of endpoints based on the response content type. (optional)
-     * @param dataType                **Deprecated in v2.1** Please use &#x60;contentType&#x60;. Github issue number #443 &lt;br&gt;The data format supported by the call. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call serverinfoGetCall(ContentTypes contentType, ContentTypes dataType, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/serverinfo";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (contentType != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("contentType", contentType));
-        if (dataType != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("dataType", dataType));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call serverinfoGetValidateBeforeCall(ContentTypes contentType, ContentTypes dataType, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return serverinfoGetCall(contentType, dataType, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the list of implemented Calls
-     * Implementation Notes  Having a consistent structure for the path string of each call is very  important for teams to be able to connect and find errors. Read more on Github.  Here are the rules for the path of each call that should be returned  Every word in the call path should match the documentation exactly, both in  spelling and capitalization. Note that path strings are all lower case, but  path parameters are camel case.  Each path should start relative to \\\&quot;/\\\&quot; and therefore should not include \\\&quot;/\\\&quot;  No leading or trailing slashes (\\\&quot;/\\\&quot;)   Path parameters are wrapped in curly braces (\\\&quot;{}\\\&quot;). The name of the path parameter  should be spelled exactly as it is specified in the documentation.  Examples   GOOD   \&quot;call\&quot;: \&quot;germplasm/{germplasmDbId}/pedigree\&quot;   BAD    \&quot;call\&quot;: \&quot;germplasm/{id}/pedigree\&quot;  BAD    \&quot;call\&quot;: \&quot;germplasm/{germplasmDBid}/pedigree\&quot;   BAD    \&quot;call\&quot;: \&quot;brapi/v2/germplasm/{germplasmDbId}/pedigree\&quot;   BAD    \&quot;call\&quot;: \&quot;/germplasm/{germplasmDbId}/pedigree/\&quot;   BAD    \&quot;call\&quot;: \&quot;germplasm/&lt;germplasmDbId&gt;/pedigree\&quot;
-     *
-     * @param contentType   Filter the list of endpoints based on the response content type. (optional)
-     * @param dataType      **Deprecated in v2.1** Please use &#x60;contentType&#x60;. Github issue number #443 &lt;br&gt;The data format supported by the call. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ServerInfoResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ServerInfoResponse serverinfoGet(ContentTypes contentType, ContentTypes dataType, String authorization) throws ApiException {
-        ApiResponse<ServerInfoResponse> resp = serverinfoGetWithHttpInfo(contentType, dataType, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the list of implemented Calls
-     * Implementation Notes  Having a consistent structure for the path string of each call is very  important for teams to be able to connect and find errors. Read more on Github.  Here are the rules for the path of each call that should be returned  Every word in the call path should match the documentation exactly, both in  spelling and capitalization. Note that path strings are all lower case, but  path parameters are camel case.  Each path should start relative to \\\&quot;/\\\&quot; and therefore should not include \\\&quot;/\\\&quot;  No leading or trailing slashes (\\\&quot;/\\\&quot;)   Path parameters are wrapped in curly braces (\\\&quot;{}\\\&quot;). The name of the path parameter  should be spelled exactly as it is specified in the documentation.  Examples   GOOD   \&quot;call\&quot;: \&quot;germplasm/{germplasmDbId}/pedigree\&quot;   BAD    \&quot;call\&quot;: \&quot;germplasm/{id}/pedigree\&quot;  BAD    \&quot;call\&quot;: \&quot;germplasm/{germplasmDBid}/pedigree\&quot;   BAD    \&quot;call\&quot;: \&quot;brapi/v2/germplasm/{germplasmDbId}/pedigree\&quot;   BAD    \&quot;call\&quot;: \&quot;/germplasm/{germplasmDbId}/pedigree/\&quot;   BAD    \&quot;call\&quot;: \&quot;germplasm/&lt;germplasmDbId&gt;/pedigree\&quot;
-     *
-     * @param contentType   Filter the list of endpoints based on the response content type. (optional)
-     * @param dataType      **Deprecated in v2.1** Please use &#x60;contentType&#x60;. Github issue number #443 &lt;br&gt;The data format supported by the call. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ServerInfoResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ServerInfoResponse> serverinfoGetWithHttpInfo(ContentTypes contentType, ContentTypes dataType, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = serverinfoGetValidateBeforeCall(contentType, dataType, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ServerInfoResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the list of implemented Calls (asynchronously)
-     * Implementation Notes  Having a consistent structure for the path string of each call is very  important for teams to be able to connect and find errors. Read more on Github.  Here are the rules for the path of each call that should be returned  Every word in the call path should match the documentation exactly, both in  spelling and capitalization. Note that path strings are all lower case, but  path parameters are camel case.  Each path should start relative to \\\&quot;/\\\&quot; and therefore should not include \\\&quot;/\\\&quot;  No leading or trailing slashes (\\\&quot;/\\\&quot;)   Path parameters are wrapped in curly braces (\\\&quot;{}\\\&quot;). The name of the path parameter  should be spelled exactly as it is specified in the documentation.  Examples   GOOD   \&quot;call\&quot;: \&quot;germplasm/{germplasmDbId}/pedigree\&quot;   BAD    \&quot;call\&quot;: \&quot;germplasm/{id}/pedigree\&quot;  BAD    \&quot;call\&quot;: \&quot;germplasm/{germplasmDBid}/pedigree\&quot;   BAD    \&quot;call\&quot;: \&quot;brapi/v2/germplasm/{germplasmDbId}/pedigree\&quot;   BAD    \&quot;call\&quot;: \&quot;/germplasm/{germplasmDbId}/pedigree/\&quot;   BAD    \&quot;call\&quot;: \&quot;germplasm/&lt;germplasmDbId&gt;/pedigree\&quot;
-     *
-     * @param contentType   Filter the list of endpoints based on the response content type. (optional)
-     * @param dataType      **Deprecated in v2.1** Please use &#x60;contentType&#x60;. Github issue number #443 &lt;br&gt;The data format supported by the call. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call serverinfoGetAsync(ContentTypes contentType, ContentTypes dataType, String authorization, final ApiCallback<ServerInfoResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = serverinfoGetValidateBeforeCall(contentType, dataType, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ServerInfoResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/StudiesApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/StudiesApi.java
deleted file mode 100644
index c285f52f..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/StudiesApi.java
+++ /dev/null
@@ -1,865 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.core;
-
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.core.StudyQueryParams;
-import org.brapi.model.v21.core.*;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class StudiesApi {
-    private ApiClient apiClient;
-
-    public StudiesApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public StudiesApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for searchStudiesPost
-     *
-     * @param body                    Study Search request (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchStudiesPostCall(StudySearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/studies";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchStudiesPostValidateBeforeCall(StudySearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchStudiesPostCall(body, authorization, progressListener, progressRequestListener);
-    }
-
-    /**
-     * Submit a search request for &#x60;Studies&#x60;
-     * Submit a search request for &#x60;Studies&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/studies/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return StudyListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public StudyListResponse searchStudiesPost(StudySearchRequest body, String authorization) throws ApiException {
-        ApiResponse<StudyListResponse> resp = searchStudiesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;Studies&#x60;
-     * Submit a search request for &#x60;Studies&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/studies/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;StudyListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<StudyListResponse> searchStudiesPostWithHttpInfo(StudySearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchStudiesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<StudyListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;Studies&#x60; (asynchronously)
-     * Submit a search request for &#x60;Studies&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/studies/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchStudiesPostAsync(StudySearchRequest body, String authorization, final ApiCallback<StudyListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchStudiesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<StudyListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchStudiesSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchStudiesSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/studies/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchStudiesSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchStudiesSearchResultsDbIdGet(Async)");
-        }
-
-        return searchStudiesSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-    }
-
-    /**
-     * Get the results of a &#x60;Studies&#x60; search request
-     * Get the results of a &#x60;Studies&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/studies&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return StudyListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public StudyListResponse searchStudiesSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<StudyListResponse> resp = searchStudiesSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;Studies&#x60; search request
-     * Get the results of a &#x60;Studies&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/studies&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;StudyListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<StudyListResponse> searchStudiesSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchStudiesSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<StudyListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;Studies&#x60; search request (asynchronously)
-     * Get the results of a &#x60;Studies&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/studies&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchStudiesSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<StudyListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchStudiesSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<StudyListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for studiesGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call studiesGetCall(StudyQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/studies";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call studiesGetValidateBeforeCall(StudyQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return studiesGetCall(queryParams, progressListener, progressRequestListener);
-
-    }
-
-    /**
-     * Get a filtered list of Studies
-     * Get list of studies  StartDate and endDate should be ISO-8601 format for dates
-     *
-     * @return StudyListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public StudyListResponse studiesGet(StudyQueryParams queryParams) throws ApiException {
-        ApiResponse<StudyListResponse> resp = studiesGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get a filtered list of Studies
-     * Get list of studies  StartDate and endDate should be ISO-8601 format for dates
-     *
-     * @return ApiResponse&lt;StudyListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<StudyListResponse> studiesGetWithHttpInfo(StudyQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = studiesGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<StudyListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a filtered list of Studies (asynchronously)
-     * Get list of studies  StartDate and endDate should be ISO-8601 format for dates
-     *
-     * @param queryParams contains the following members:
-     * @param callback    The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call studiesGetAsync(StudyQueryParams queryParams, final ApiCallback<StudyListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = studiesGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<StudyListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for studiesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call studiesPostCall(List<StudyNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/studies";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call studiesPostValidateBeforeCall(List<StudyNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return studiesPostCall(body, authorization, progressListener, progressRequestListener);
-
-    }
-
-    /**
-     * Create new Studies.
-     * Create new studies  Implementation Notes  StartDate and endDate should be ISO-8601 format for dates  &#x60;studyDbId&#x60; is generated by the server.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return StudyListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public StudyListResponse studiesPost(List<StudyNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<StudyListResponse> resp = studiesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Create new Studies.
-     * Create new studies  Implementation Notes  StartDate and endDate should be ISO-8601 format for dates  &#x60;studyDbId&#x60; is generated by the server.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;StudyListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<StudyListResponse> studiesPostWithHttpInfo(List<StudyNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = studiesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<StudyListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Create new Studies. (asynchronously)
-     * Create new studies  Implementation Notes  StartDate and endDate should be ISO-8601 format for dates  &#x60;studyDbId&#x60; is generated by the server.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call studiesPostAsync(List<StudyNewRequest> body, String authorization, final ApiCallback<StudyListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = studiesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<StudyListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for studiesStudyDbIdGet
-     *
-     * @param studyDbId               Identifier of the study. Usually a number, could be alphanumeric. (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call studiesStudyDbIdGetCall(String studyDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/studies/{studyDbId}"
-                .replaceAll("\\{" + "studyDbId" + "}", apiClient.escapeString(studyDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call studiesStudyDbIdGetValidateBeforeCall(String studyDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'studyDbId' is set
-        if (studyDbId == null) {
-            throw new ApiException("Missing the required parameter 'studyDbId' when calling studiesStudyDbIdGet(Async)");
-        }
-
-        return studiesStudyDbIdGetCall(studyDbId, authorization, progressListener, progressRequestListener);
-
-    }
-
-    /**
-     * Get the details for a specific Study
-     * Retrieve the information of the study required for field data collection  An additionalInfo field was added to provide a controlled vocabulary for less common data fields.
-     *
-     * @param studyDbId     Identifier of the study. Usually a number, could be alphanumeric. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return StudySingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public StudySingleResponse studiesStudyDbIdGet(String studyDbId, String authorization) throws ApiException {
-        ApiResponse<StudySingleResponse> resp = studiesStudyDbIdGetWithHttpInfo(studyDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details for a specific Study
-     * Retrieve the information of the study required for field data collection  An additionalInfo field was added to provide a controlled vocabulary for less common data fields.
-     *
-     * @param studyDbId     Identifier of the study. Usually a number, could be alphanumeric. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;StudySingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<StudySingleResponse> studiesStudyDbIdGetWithHttpInfo(String studyDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = studiesStudyDbIdGetValidateBeforeCall(studyDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<StudySingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details for a specific Study (asynchronously)
-     * Retrieve the information of the study required for field data collection  An additionalInfo field was added to provide a controlled vocabulary for less common data fields.
-     *
-     * @param studyDbId     Identifier of the study. Usually a number, could be alphanumeric. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call studiesStudyDbIdGetAsync(String studyDbId, String authorization, final ApiCallback<StudySingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = studiesStudyDbIdGetValidateBeforeCall(studyDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<StudySingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for studiesStudyDbIdPut
-     *
-     * @param studyDbId               Identifier of the study. Usually a number, could be alphanumeric. (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call studiesStudyDbIdPutCall(String studyDbId, StudyNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/studies/{studyDbId}"
-                .replaceAll("\\{" + "studyDbId" + "}", apiClient.escapeString(studyDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call studiesStudyDbIdPutValidateBeforeCall(String studyDbId, StudyNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'studyDbId' is set
-        if (studyDbId == null) {
-            throw new ApiException("Missing the required parameter 'studyDbId' when calling studiesStudyDbIdPut(Async)");
-        }
-
-        return studiesStudyDbIdPutCall(studyDbId, body, authorization, progressListener, progressRequestListener);
-
-    }
-
-    /**
-     * Update an existing Study
-     * Update an existing Study with new data
-     *
-     * @param studyDbId     Identifier of the study. Usually a number, could be alphanumeric. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return StudySingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public StudySingleResponse studiesStudyDbIdPut(String studyDbId, StudyNewRequest body, String authorization) throws ApiException {
-        ApiResponse<StudySingleResponse> resp = studiesStudyDbIdPutWithHttpInfo(studyDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update an existing Study
-     * Update an existing Study with new data
-     *
-     * @param studyDbId     Identifier of the study. Usually a number, could be alphanumeric. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;StudySingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<StudySingleResponse> studiesStudyDbIdPutWithHttpInfo(String studyDbId, StudyNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = studiesStudyDbIdPutValidateBeforeCall(studyDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<StudySingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update an existing Study (asynchronously)
-     * Update an existing Study with new data
-     *
-     * @param studyDbId     Identifier of the study. Usually a number, could be alphanumeric. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call studiesStudyDbIdPutAsync(String studyDbId, StudyNewRequest body, String authorization, final ApiCallback<StudySingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = studiesStudyDbIdPutValidateBeforeCall(studyDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<StudySingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for studytypesGet
-     *
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call studytypesGetCall(Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/studytypes";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call studytypesGetValidateBeforeCall(Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return studytypesGetCall(page, pageSize, authorization, progressListener, progressRequestListener);
-
-    }
-
-    /**
-     * Get the Study Types
-     * Call to retrieve the list of study types.
-     *
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return StudyTypesResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public StudyTypesResponse studytypesGet(Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<StudyTypesResponse> resp = studytypesGetWithHttpInfo(page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Study Types
-     * Call to retrieve the list of study types.
-     *
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;StudyTypesResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<StudyTypesResponse> studytypesGetWithHttpInfo(Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = studytypesGetValidateBeforeCall(page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<StudyTypesResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Study Types (asynchronously)
-     * Call to retrieve the list of study types.
-     *
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call studytypesGetAsync(Integer page, Integer pageSize, String authorization, final ApiCallback<StudyTypesResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = studytypesGetValidateBeforeCall(page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<StudyTypesResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/TrialsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/TrialsApi.java
deleted file mode 100644
index 9ec727f2..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/core/TrialsApi.java
+++ /dev/null
@@ -1,755 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.core;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.core.TrialQueryParams;
-import org.brapi.model.v21.core.TrialListResponse;
-import org.brapi.model.v21.core.TrialNewRequest;
-import org.brapi.model.v21.core.TrialSearchRequest;
-import org.brapi.model.v21.core.TrialSingleResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class TrialsApi {
-    private ApiClient apiClient;
-
-    public TrialsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public TrialsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for searchTrialsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchTrialsPostCall(TrialSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/trials";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchTrialsPostValidateBeforeCall(TrialSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchTrialsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;Trials&#x60;
-     * Submit a search request for &#x60;Trials&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/trials/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return TrialListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public TrialListResponse searchTrialsPost(TrialSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<TrialListResponse> resp = searchTrialsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;Trials&#x60;
-     * Submit a search request for &#x60;Trials&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/trials/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;TrialListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<TrialListResponse> searchTrialsPostWithHttpInfo(TrialSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchTrialsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<TrialListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;Trials&#x60; (asynchronously)
-     * Submit a search request for &#x60;Trials&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/trials/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchTrialsPostAsync(TrialSearchRequest body, String authorization, final ApiCallback<TrialListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchTrialsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<TrialListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchTrialsSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchTrialsSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/trials/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchTrialsSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchTrialsSearchResultsDbIdGet(Async)");
-        }
-
-        return searchTrialsSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;Trials&#x60; search request
-     * Get the results of a &#x60;Trials&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/trials&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return TrialListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public TrialListResponse searchTrialsSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<TrialListResponse> resp = searchTrialsSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;Trials&#x60; search request
-     * Get the results of a &#x60;Trials&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/trials&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;TrialListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<TrialListResponse> searchTrialsSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchTrialsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<TrialListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;Trials&#x60; search request (asynchronously)
-     * Get the results of a &#x60;Trials&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/trials&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchTrialsSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<TrialListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchTrialsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<TrialListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for trialsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call trialsGetCall(TrialQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/trials";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call trialsGetValidateBeforeCall(TrialQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return trialsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Retrieve a filtered list of breeding Trials. A Trial is a collection of Studies
-     *
-     * @return TrialListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public TrialListResponse trialsGet(TrialQueryParams queryParams) throws ApiException {
-        ApiResponse<TrialListResponse> resp = trialsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get a filtered list of Trials
-     * Retrieve a filtered list of breeding Trials. A Trial is a collection of Studies
-     *
-     * @return ApiResponse&lt;TrialListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<TrialListResponse> trialsGetWithHttpInfo(TrialQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = trialsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<TrialListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Retrieve a filtered list of breeding Trials. A Trial is a collection of Studies
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call trialsGetAsync(TrialQueryParams queryParams, final ApiCallback<TrialListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = trialsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<TrialListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for trialsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call trialsPostCall(List<TrialNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/trials";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call trialsPostValidateBeforeCall(List<TrialNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return trialsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Create new trials
-     * Create new breeding Trials. A Trial represents a collection of related Studies. &#x60;trialDbId&#x60; is generated by the server.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return TrialListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public TrialListResponse trialsPost(List<TrialNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<TrialListResponse> resp = trialsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Create new trials
-     * Create new breeding Trials. A Trial represents a collection of related Studies. &#x60;trialDbId&#x60; is generated by the server.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;TrialListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<TrialListResponse> trialsPostWithHttpInfo(List<TrialNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = trialsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<TrialListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Create new trials (asynchronously)
-     * Create new breeding Trials. A Trial represents a collection of related Studies. &#x60;trialDbId&#x60; is generated by the server.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call trialsPostAsync(List<TrialNewRequest> body, String authorization, final ApiCallback<TrialListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = trialsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<TrialListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for trialsTrialDbIdGet
-     *
-     * @param trialDbId               The internal trialDbId (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call trialsTrialDbIdGetCall(String trialDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/trials/{trialDbId}"
-                .replaceAll("\\{" + "trialDbId" + "}", apiClient.escapeString(trialDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call trialsTrialDbIdGetValidateBeforeCall(String trialDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'trialDbId' is set
-        if (trialDbId == null) {
-            throw new ApiException("Missing the required parameter 'trialDbId' when calling trialsTrialDbIdGet(Async)");
-        }
-
-        return trialsTrialDbIdGetCall(trialDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details of a specific Trial
-     * Get the details of a specific Trial
-     *
-     * @param trialDbId     The internal trialDbId (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return TrialSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public TrialSingleResponse trialsTrialDbIdGet(String trialDbId, String authorization) throws ApiException {
-        ApiResponse<TrialSingleResponse> resp = trialsTrialDbIdGetWithHttpInfo(trialDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details of a specific Trial
-     * Get the details of a specific Trial
-     *
-     * @param trialDbId     The internal trialDbId (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;TrialSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<TrialSingleResponse> trialsTrialDbIdGetWithHttpInfo(String trialDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = trialsTrialDbIdGetValidateBeforeCall(trialDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<TrialSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details of a specific Trial (asynchronously)
-     * Get the details of a specific Trial
-     *
-     * @param trialDbId     The internal trialDbId (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call trialsTrialDbIdGetAsync(String trialDbId, String authorization, final ApiCallback<TrialSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = trialsTrialDbIdGetValidateBeforeCall(trialDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<TrialSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for trialsTrialDbIdPut
-     *
-     * @param trialDbId               The internal trialDbId (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call trialsTrialDbIdPutCall(String trialDbId, TrialNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/trials/{trialDbId}"
-                .replaceAll("\\{" + "trialDbId" + "}", apiClient.escapeString(trialDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call trialsTrialDbIdPutValidateBeforeCall(String trialDbId, TrialNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'trialDbId' is set
-        if (trialDbId == null) {
-            throw new ApiException("Missing the required parameter 'trialDbId' when calling trialsTrialDbIdPut(Async)");
-        }
-
-        return trialsTrialDbIdPutCall(trialDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update the details of an existing Trial
-     * Update the details of an existing Trial
-     *
-     * @param trialDbId     The internal trialDbId (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return TrialSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public TrialSingleResponse trialsTrialDbIdPut(String trialDbId, TrialNewRequest body, String authorization) throws ApiException {
-        ApiResponse<TrialSingleResponse> resp = trialsTrialDbIdPutWithHttpInfo(trialDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update the details of an existing Trial
-     * Update the details of an existing Trial
-     *
-     * @param trialDbId     The internal trialDbId (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;TrialSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<TrialSingleResponse> trialsTrialDbIdPutWithHttpInfo(String trialDbId, TrialNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = trialsTrialDbIdPutValidateBeforeCall(trialDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<TrialSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update the details of an existing Trial (asynchronously)
-     * Update the details of an existing Trial
-     *
-     * @param trialDbId     The internal trialDbId (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call trialsTrialDbIdPutAsync(String trialDbId, TrialNewRequest body, String authorization, final ApiCallback<TrialSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = trialsTrialDbIdPutValidateBeforeCall(trialDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<TrialSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/AlleleMatrixApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/AlleleMatrixApi.java
deleted file mode 100644
index 3ebf7947..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/AlleleMatrixApi.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.genotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.genotype.AlleleMatrixQueryParams;
-import org.brapi.model.v21.genotype.AlleleMatrixResponse;
-import org.brapi.model.v21.genotype.AlleleMatrixSearchRequest;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class AlleleMatrixApi {
-    private ApiClient apiClient;
-
-    public AlleleMatrixApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public AlleleMatrixApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for allelematrixGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call allelematrixGetCall(AlleleMatrixQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/allelematrix";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call allelematrixGetValidateBeforeCall(AlleleMatrixQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return allelematrixGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Use this endpoint to retrieve a two dimensional matrix of genotype data. The response structure is based on the VCF file format,  but the search and filter parameters give the ability to slice and merge data sets. This allows the user to return the subset of data they are interested in,  without having to download the entire genotype file. &lt;br/&gt;Each row of data (outer array) corresponds to a variant definition, and each column (inner array) corresponds to a callSet.
-     *
-     * @return AlleleMatrixResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public AlleleMatrixResponse allelematrixGet(AlleleMatrixQueryParams queryParams) throws ApiException {
-        ApiResponse<AlleleMatrixResponse> resp = allelematrixGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Use this endpoint to retrieve a two dimensional matrix of genotype data. The response structure is based on the VCF file format,  but the search and filter parameters give the ability to slice and merge data sets. This allows the user to return the subset of data they are interested in,  without having to download the entire genotype file. &lt;br/&gt;Each row of data (outer array) corresponds to a variant definition, and each column (inner array) corresponds to a callSet.
-     *
-     * @return ApiResponse&lt;AlleleMatrixResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<AlleleMatrixResponse> allelematrixGetWithHttpInfo(AlleleMatrixQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = allelematrixGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<AlleleMatrixResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Use this endpoint to retrieve a two dimensional matrix of genotype data. The response structure is based on the VCF file format,  but the search and filter parameters give the ability to slice and merge data sets. This allows the user to return the subset of data they are interested in,  without having to download the entire genotype file. &lt;br/&gt;Each row of data (outer array) corresponds to a variant definition, and each column (inner array) corresponds to a callSet.
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call allelematrixGetAsync(AlleleMatrixQueryParams queryParams, final ApiCallback<AlleleMatrixResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = allelematrixGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<AlleleMatrixResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchAllelematrixPost
-     *
-     * @param body                    Study Search request (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchAllelematrixPostCall(AlleleMatrixSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/allelematrix";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchAllelematrixPostValidateBeforeCall(AlleleMatrixSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchAllelematrixPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for a Allele Matrix
-     * Use this endpoint to retrieve a two dimensional matrix of genotype data. The response structure is based on the VCF format, but the search and filter parameters give the ability to slice and merge data sets. This allows the user to return the subset of data they are interested in, without having to download the entire genotype file. &lt;br/&gt;Each row of data (outer array) corresponds to a variant definition, and each column (inner array) corresponds to a callSet.  &lt;br/&gt;Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately. If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;. Use the corresponding &#x60;GET /search/calls/{searchResultsDbId}&#x60; to retrieve the results of the search.  &lt;br/&gt;Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;<a href="https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity">...</a>\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return AlleleMatrixResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public AlleleMatrixResponse searchAllelematrixPost(AlleleMatrixSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<AlleleMatrixResponse> resp = searchAllelematrixPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for a Allele Matrix
-     * Use this endpoint to retrieve a two dimensional matrix of genotype data. The response structure is based on the VCF format, but the search and filter parameters give the ability to slice and merge data sets. This allows the user to return the subset of data they are interested in, without having to download the entire genotype file. &lt;br/&gt;Each row of data (outer array) corresponds to a variant definition, and each column (inner array) corresponds to a callSet.  &lt;br/&gt;Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately. If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;. Use the corresponding &#x60;GET /search/calls/{searchResultsDbId}&#x60; to retrieve the results of the search.  &lt;br/&gt;Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;<a href="https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity">...</a>\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;AlleleMatrixResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<AlleleMatrixResponse> searchAllelematrixPostWithHttpInfo(AlleleMatrixSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchAllelematrixPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<AlleleMatrixResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for a Allele Matrix (asynchronously)
-     * Use this endpoint to retrieve a two dimensional matrix of genotype data. The response structure is based on the VCF format, but the search and filter parameters give the ability to slice and merge data sets. This allows the user to return the subset of data they are interested in, without having to download the entire genotype file. &lt;br/&gt;Each row of data (outer array) corresponds to a variant definition, and each column (inner array) corresponds to a callSet.  &lt;br/&gt;Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately. If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;. Use the corresponding &#x60;GET /search/calls/{searchResultsDbId}&#x60; to retrieve the results of the search.  &lt;br/&gt;Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;<a href="https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity">...</a>\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchAllelematrixPostAsync(AlleleMatrixSearchRequest body, String authorization, final ApiCallback<AlleleMatrixResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchAllelematrixPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<AlleleMatrixResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchAllelematrixSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchAllelematrixSearchResultsDbIdGetCall(String searchResultsDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/allelematrix/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchAllelematrixSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchAllelematrixSearchResultsDbIdGet(Async)");
-        }
-
-        return searchAllelematrixSearchResultsDbIdGetCall(searchResultsDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a Allele Matrix search request
-     * Use this endpoint to retrieve a two dimensional matrix of genotype data. The response structure is based on the VCF format, but the search and filter parameters give the ability to slice and merge data sets. This allows the user to return the subset of data they are interested in, without having to download the entire genotype file. &lt;br/&gt;Each row of data (outer array) corresponds to a variant definition, and each column (inner array) corresponds to a callSet.  &lt;br/&gt;Clients should submit a search request using the corresponding &#x60;POST /search/allelematrix&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately. If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;. Use this endpoint to retrieve the results of the search.  &lt;br/&gt;Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;<a href="https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity">...</a>\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return AlleleMatrixResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public AlleleMatrixResponse searchAllelematrixSearchResultsDbIdGet(String searchResultsDbId, String authorization) throws ApiException {
-        ApiResponse<AlleleMatrixResponse> resp = searchAllelematrixSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a Allele Matrix search request
-     * Use this endpoint to retrieve a two dimensional matrix of genotype data. The response structure is based on the VCF format, but the search and filter parameters give the ability to slice and merge data sets. This allows the user to return the subset of data they are interested in, without having to download the entire genotype file. &lt;br/&gt;Each row of data (outer array) corresponds to a variant definition, and each column (inner array) corresponds to a callSet.  &lt;br/&gt;Clients should submit a search request using the corresponding &#x60;POST /search/allelematrix&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately. If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;. Use this endpoint to retrieve the results of the search.  &lt;br/&gt;Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;<a href="https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity">...</a>\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;AlleleMatrixResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<AlleleMatrixResponse> searchAllelematrixSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchAllelematrixSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<AlleleMatrixResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a Allele Matrix search request (asynchronously)
-     * Use this endpoint to retrieve a two dimensional matrix of genotype data. The response structure is based on the VCF format, but the search and filter parameters give the ability to slice and merge data sets. This allows the user to return the subset of data they are interested in, without having to download the entire genotype file. &lt;br/&gt;Each row of data (outer array) corresponds to a variant definition, and each column (inner array) corresponds to a callSet.  &lt;br/&gt;Clients should submit a search request using the corresponding &#x60;POST /search/allelematrix&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately. If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;. Use this endpoint to retrieve the results of the search.  &lt;br/&gt;Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;<a href="https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity">...</a>\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchAllelematrixSearchResultsDbIdGetAsync(String searchResultsDbId, String authorization, final ApiCallback<AlleleMatrixResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchAllelematrixSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<AlleleMatrixResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/CallSetsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/CallSetsApi.java
deleted file mode 100644
index cb10a259..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/CallSetsApi.java
+++ /dev/null
@@ -1,679 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.genotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.genotype.CallSetQueryParams;
-import org.brapi.model.v21.genotype.CallSetResponse;
-import org.brapi.model.v21.genotype.CallSetsListResponse;
-import org.brapi.model.v21.genotype.CallSetsSearchRequest;
-import org.brapi.model.v21.genotype.CallsListResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class CallSetsApi {
-    private ApiClient apiClient;
-
-    public CallSetsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public CallSetsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for callsetsCallSetDbIdCallsGet
-     *
-     * @param callSetDbId             The ID which uniquely identifies a &#x60;CallSet&#x60; within the given database server (required)
-     * @param expandHomozygotes       Should homozygotes be expanded (true) or collapsed into a single occurrence (false) (optional)
-     * @param unknownString           The string to use as a representation for missing data (optional)
-     * @param sepPhased               The string to use as a separator for phased allele calls (optional)
-     * @param sepUnphased             The string to use as a separator for unphased allele calls (optional)
-     * @param pageToken               **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call callsetsCallSetDbIdCallsGetCall(String callSetDbId, Boolean expandHomozygotes, String unknownString, String sepPhased, String sepUnphased, String pageToken, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/callsets/{callSetDbId}/calls"
-                .replaceAll("\\{" + "callSetDbId" + "}", apiClient.escapeString(callSetDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (expandHomozygotes != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("expandHomozygotes", expandHomozygotes));
-        if (unknownString != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("unknownString", unknownString));
-        if (sepPhased != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("sepPhased", sepPhased));
-        if (sepUnphased != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("sepUnphased", sepUnphased));
-        if (pageToken != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageToken", pageToken));
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call callsetsCallSetDbIdCallsGetValidateBeforeCall(String callSetDbId, Boolean expandHomozygotes, String unknownString, String sepPhased, String sepUnphased, String pageToken, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'callSetDbId' is set
-        if (callSetDbId == null) {
-            throw new ApiException("Missing the required parameter 'callSetDbId' when calling callsetsCallSetDbIdCallsGet(Async)");
-        }
-
-        return callsetsCallSetDbIdCallsGetCall(callSetDbId, expandHomozygotes, unknownString, sepPhased, sepUnphased, pageToken, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Gets a list of &#x60;Calls&#x60; associated with a &#x60;CallSet&#x60;.
-     * Gets a list of &#x60;Calls&#x60; associated with a &#x60;CallSet&#x60;.
-     *
-     * @param callSetDbId       The ID which uniquely identifies a &#x60;CallSet&#x60; within the given database server (required)
-     * @param expandHomozygotes Should homozygotes be expanded (true) or collapsed into a single occurrence (false) (optional)
-     * @param unknownString     The string to use as a representation for missing data (optional)
-     * @param sepPhased         The string to use as a separator for phased allele calls (optional)
-     * @param sepUnphased       The string to use as a separator for unphased allele calls (optional)
-     * @param pageToken         **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return CallsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CallsListResponse callsetsCallSetDbIdCallsGet(String callSetDbId, Boolean expandHomozygotes, String unknownString, String sepPhased, String sepUnphased, String pageToken, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<CallsListResponse> resp = callsetsCallSetDbIdCallsGetWithHttpInfo(callSetDbId, expandHomozygotes, unknownString, sepPhased, sepUnphased, pageToken, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Gets a list of &#x60;Calls&#x60; associated with a &#x60;CallSet&#x60;.
-     * Gets a list of &#x60;Calls&#x60; associated with a &#x60;CallSet&#x60;.
-     *
-     * @param callSetDbId       The ID which uniquely identifies a &#x60;CallSet&#x60; within the given database server (required)
-     * @param expandHomozygotes Should homozygotes be expanded (true) or collapsed into a single occurrence (false) (optional)
-     * @param unknownString     The string to use as a representation for missing data (optional)
-     * @param sepPhased         The string to use as a separator for phased allele calls (optional)
-     * @param sepUnphased       The string to use as a separator for unphased allele calls (optional)
-     * @param pageToken         **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;CallsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CallsListResponse> callsetsCallSetDbIdCallsGetWithHttpInfo(String callSetDbId, Boolean expandHomozygotes, String unknownString, String sepPhased, String sepUnphased, String pageToken, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = callsetsCallSetDbIdCallsGetValidateBeforeCall(callSetDbId, expandHomozygotes, unknownString, sepPhased, sepUnphased, pageToken, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<CallsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Gets a list of &#x60;Calls&#x60; associated with a &#x60;CallSet&#x60;. (asynchronously)
-     * Gets a list of &#x60;Calls&#x60; associated with a &#x60;CallSet&#x60;.
-     *
-     * @param callSetDbId       The ID which uniquely identifies a &#x60;CallSet&#x60; within the given database server (required)
-     * @param expandHomozygotes Should homozygotes be expanded (true) or collapsed into a single occurrence (false) (optional)
-     * @param unknownString     The string to use as a representation for missing data (optional)
-     * @param sepPhased         The string to use as a separator for phased allele calls (optional)
-     * @param sepUnphased       The string to use as a separator for unphased allele calls (optional)
-     * @param pageToken         **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call callsetsCallSetDbIdCallsGetAsync(String callSetDbId, Boolean expandHomozygotes, String unknownString, String sepPhased, String sepUnphased, String pageToken, Integer page, Integer pageSize, String authorization, final ApiCallback<CallsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = callsetsCallSetDbIdCallsGetValidateBeforeCall(callSetDbId, expandHomozygotes, unknownString, sepPhased, sepUnphased, pageToken, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CallsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for callsetsCallSetDbIdGet
-     *
-     * @param callSetDbId             The ID which uniquely identifies a &#x60;CallSet&#x60; within the given database server (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call callsetsCallSetDbIdGetCall(String callSetDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/callsets/{callSetDbId}"
-                .replaceAll("\\{" + "callSetDbId" + "}", apiClient.escapeString(callSetDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call callsetsCallSetDbIdGetValidateBeforeCall(String callSetDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'callSetDbId' is set
-        if (callSetDbId == null) {
-            throw new ApiException("Missing the required parameter 'callSetDbId' when calling callsetsCallSetDbIdGet(Async)");
-        }
-
-        return callsetsCallSetDbIdGetCall(callSetDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Gets a &#x60;CallSet&#x60; by ID.
-     * Gets a &#x60;CallSet&#x60; by ID.
-     *
-     * @param callSetDbId   The ID which uniquely identifies a &#x60;CallSet&#x60; within the given database server (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return CallSetResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CallSetResponse callsetsCallSetDbIdGet(String callSetDbId, String authorization) throws ApiException {
-        ApiResponse<CallSetResponse> resp = callsetsCallSetDbIdGetWithHttpInfo(callSetDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Gets a &#x60;CallSet&#x60; by ID.
-     * Gets a &#x60;CallSet&#x60; by ID.
-     *
-     * @param callSetDbId   The ID which uniquely identifies a &#x60;CallSet&#x60; within the given database server (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;CallSetResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CallSetResponse> callsetsCallSetDbIdGetWithHttpInfo(String callSetDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = callsetsCallSetDbIdGetValidateBeforeCall(callSetDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<CallSetResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Gets a &#x60;CallSet&#x60; by ID. (asynchronously)
-     * Gets a &#x60;CallSet&#x60; by ID.
-     *
-     * @param callSetDbId   The ID which uniquely identifies a &#x60;CallSet&#x60; within the given database server (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call callsetsCallSetDbIdGetAsync(String callSetDbId, String authorization, final ApiCallback<CallSetResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = callsetsCallSetDbIdGetValidateBeforeCall(callSetDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CallSetResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for callsetsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call callsetsGetCall(CallSetQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/callsets";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call callsetsGetValidateBeforeCall(CallSetQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return callsetsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Gets a filtered list of &#x60;CallSet&#x60; JSON objects.
-     *
-     * @return CallSetsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CallSetsListResponse callsetsGet(CallSetQueryParams queryParams) throws ApiException {
-        ApiResponse<CallSetsListResponse> resp = callsetsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Gets a filtered list of &#x60;CallSet&#x60; JSON objects.
-     *
-     * @return ApiResponse&lt;CallSetsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CallSetsListResponse> callsetsGetWithHttpInfo(CallSetQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = callsetsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<CallSetsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Gets a filtered list of &#x60;CallSet&#x60; JSON objects. (asynchronously)
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call callsetsGetAsync(CallSetQueryParams queryParams, final ApiCallback<CallSetsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = callsetsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CallSetsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchCallsetsPost
-     *
-     * @param body                    Study Search request (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchCallsetsPostCall(CallSetsSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/callsets";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchCallsetsPostValidateBeforeCall(CallSetsSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchCallsetsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;CallSets&#x60;
-     * Submit a search request for &#x60;CallSets&#x60;  &lt;br&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/callsets/{searchResultsDbId}&#x60; to retrieve the results of the search.  &lt;br&gt; Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return CallSetsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CallSetsListResponse searchCallsetsPost(CallSetsSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<CallSetsListResponse> resp = searchCallsetsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;CallSets&#x60;
-     * Submit a search request for &#x60;CallSets&#x60;  &lt;br&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/callsets/{searchResultsDbId}&#x60; to retrieve the results of the search.  &lt;br&gt; Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;CallSetsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CallSetsListResponse> searchCallsetsPostWithHttpInfo(CallSetsSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchCallsetsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<CallSetsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;CallSets&#x60; (asynchronously)
-     * Submit a search request for &#x60;CallSets&#x60;  &lt;br&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/callsets/{searchResultsDbId}&#x60; to retrieve the results of the search.  &lt;br&gt; Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchCallsetsPostAsync(CallSetsSearchRequest body, String authorization, final ApiCallback<CallSetsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchCallsetsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CallSetsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchCallsetsSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchCallsetsSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/callsets/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchCallsetsSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchCallsetsSearchResultsDbIdGet(Async)");
-        }
-
-        return searchCallsetsSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;CallSets&#x60; search request
-     * Get the results of a &#x60;CallSets&#x60; search request  &lt;br&gt; Clients should submit a search request using the corresponding &#x60;POST /search/callsets&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search.  &lt;br&gt;Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return CallSetsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CallSetsListResponse searchCallsetsSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<CallSetsListResponse> resp = searchCallsetsSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;CallSets&#x60; search request
-     * Get the results of a &#x60;CallSets&#x60; search request  &lt;br&gt; Clients should submit a search request using the corresponding &#x60;POST /search/callsets&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search.  &lt;br&gt;Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;CallSetsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CallSetsListResponse> searchCallsetsSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchCallsetsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<CallSetsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;CallSets&#x60; search request (asynchronously)
-     * Get the results of a &#x60;CallSets&#x60; search request  &lt;br&gt; Clients should submit a search request using the corresponding &#x60;POST /search/callsets&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search.  &lt;br&gt;Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchCallsetsSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<CallSetsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchCallsetsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CallSetsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/CallsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/CallsApi.java
deleted file mode 100644
index 5f93ce8c..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/CallsApi.java
+++ /dev/null
@@ -1,516 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.genotype;
-
-import com.google.gson.reflect.TypeToken;
-import com.squareup.okhttp.Call;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.genotype.CallQueryParams;
-import org.brapi.model.v21.genotype.CallsListResponse;
-import org.brapi.model.v21.genotype.CallsSearchRequest;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class CallsApi {
-    private ApiClient apiClient;
-
-    public CallsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public CallsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for callsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call callsGetCall(CallQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/calls";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call callsGetValidateBeforeCall(CallQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return callsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Gets a filtered list of &#x60;Call&#x60; JSON objects.
-     *
-     * @return CallsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CallsListResponse callsGet(CallQueryParams queryParams) throws ApiException {
-        ApiResponse<CallsListResponse> resp = callsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Gets a filtered list of &#x60;Call&#x60; JSON objects.
-     *
-     * @return ApiResponse&lt;CallsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CallsListResponse> callsGetWithHttpInfo(CallQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = callsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<CallsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Gets a filtered list of &#x60;Call&#x60; JSON objects.
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call callsGetAsync(CallQueryParams queryParams, final ApiCallback<CallsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = callsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CallsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for callsPut
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call callsPutCall(List<Call> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/calls";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call callsPutValidateBeforeCall(List<Call> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return callsPutCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update existing &#x60;Calls&#x60; with new genotype value or metadata
-     * Update existing &#x60;Calls&#x60; with new genotype value or metadata &lt;br/&gt;Implementation Note -  &lt;br/&gt;A &#x60;Call&#x60; object does not have a DbId of its own. It is defined by the unique combination of  &#x60;callSetDbId&#x60;, &#x60;variantDbId&#x60;, and &#x60;variantSetDbId&#x60;. These three fields MUST be present for every  &#x60;call&#x60; update request. This endpoint should not allow these fields to be modified for a given  &#x60;call&#x60;. Modifying these fields in the database is effectively moving a cell to a different location in the genotype matrix. This action is dangerous and can cause data collisions.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return CallsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CallsListResponse callsPut(List<Call> body, String authorization) throws ApiException {
-        ApiResponse<CallsListResponse> resp = callsPutWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update existing &#x60;Calls&#x60; with new genotype value or metadata
-     * Update existing &#x60;Calls&#x60; with new genotype value or metadata &lt;br/&gt;Implementation Note -  &lt;br/&gt;A &#x60;Call&#x60; object does not have a DbId of its own. It is defined by the unique combination of  &#x60;callSetDbId&#x60;, &#x60;variantDbId&#x60;, and &#x60;variantSetDbId&#x60;. These three fields MUST be present for every  &#x60;call&#x60; update request. This endpoint should not allow these fields to be modified for a given  &#x60;call&#x60;. Modifying these fields in the database is effectively moving a cell to a different location in the genotype matrix. This action is dangerous and can cause data collisions.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;CallsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CallsListResponse> callsPutWithHttpInfo(List<Call> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = callsPutValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<CallsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update existing &#x60;Calls&#x60; with new genotype value or metadata (asynchronously)
-     * Update existing &#x60;Calls&#x60; with new genotype value or metadata &lt;br/&gt;Implementation Note -  &lt;br/&gt;A &#x60;Call&#x60; object does not have a DbId of its own. It is defined by the unique combination of  &#x60;callSetDbId&#x60;, &#x60;variantDbId&#x60;, and &#x60;variantSetDbId&#x60;. These three fields MUST be present for every  &#x60;call&#x60; update request. This endpoint should not allow these fields to be modified for a given  &#x60;call&#x60;. Modifying these fields in the database is effectively moving a cell to a different location in the genotype matrix. This action is dangerous and can cause data collisions.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call callsPutAsync(List<Call> body, String authorization, final ApiCallback<CallsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = callsPutValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CallsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchCallsPost
-     *
-     * @param body                    Study Search request (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchCallsPostCall(CallsSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/calls";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchCallsPostValidateBeforeCall(CallsSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchCallsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;Calls&#x60;
-     * Submit a search request for &#x60;Calls&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/calls/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.  &lt;br/&gt; &lt;br/&gt; &lt;strong&gt;NOTE:&lt;/strong&gt; This endpoint uses Token based pagination. Please Review the  &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Pagination\&quot;&gt;Pagination documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return CallsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CallsListResponse searchCallsPost(CallsSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<CallsListResponse> resp = searchCallsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;Calls&#x60;
-     * Submit a search request for &#x60;Calls&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/calls/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.  &lt;br/&gt; &lt;br/&gt; &lt;strong&gt;NOTE:&lt;/strong&gt; This endpoint uses Token based pagination. Please Review the  &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Pagination\&quot;&gt;Pagination documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;CallsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CallsListResponse> searchCallsPostWithHttpInfo(CallsSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchCallsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<CallsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;Calls&#x60; (asynchronously)
-     * Submit a search request for &#x60;Calls&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/calls/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.  &lt;br/&gt; &lt;br/&gt; &lt;strong&gt;NOTE:&lt;/strong&gt; This endpoint uses Token based pagination. Please Review the  &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Pagination\&quot;&gt;Pagination documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchCallsPostAsync(CallsSearchRequest body, String authorization, final ApiCallback<CallsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchCallsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CallsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchCallsSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param pageToken               **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchCallsSearchResultsDbIdGetCall(String searchResultsDbId, String pageToken, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/calls/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (pageToken != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageToken", pageToken));
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchCallsSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, String pageToken, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchCallsSearchResultsDbIdGet(Async)");
-        }
-
-        return searchCallsSearchResultsDbIdGetCall(searchResultsDbId, pageToken, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;Calls&#x60; search request
-     * Get the results of a &#x60;Calls&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/calls&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details. &lt;br/&gt;
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param pageToken         **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return CallsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CallsListResponse searchCallsSearchResultsDbIdGet(String searchResultsDbId, String pageToken, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<CallsListResponse> resp = searchCallsSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, pageToken, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;Calls&#x60; search request
-     * Get the results of a &#x60;Calls&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/calls&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details. &lt;br/&gt;
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param pageToken         **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;CallsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CallsListResponse> searchCallsSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, String pageToken, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchCallsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, pageToken, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<CallsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;Calls&#x60; search request (asynchronously)
-     * Get the results of a &#x60;Calls&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/calls&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details. &lt;br/&gt;
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param pageToken         **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchCallsSearchResultsDbIdGetAsync(String searchResultsDbId, String pageToken, Integer page, Integer pageSize, String authorization, final ApiCallback<CallsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchCallsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, pageToken, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CallsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/GenomeMapsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/GenomeMapsApi.java
deleted file mode 100644
index 7ce18927..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/GenomeMapsApi.java
+++ /dev/null
@@ -1,802 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.genotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.genotype.GenomeMapQueryParams;
-import org.brapi.model.v21.genotype.*;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class GenomeMapsApi {
-    private ApiClient apiClient;
-
-    public GenomeMapsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public GenomeMapsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for mapsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call mapsGetCall(GenomeMapQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/maps";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call mapsGetValidateBeforeCall(GenomeMapQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return mapsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Genomic Maps
-     * Get list of maps
-     *
-     * @return GenomeMapListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GenomeMapListResponse mapsGet(GenomeMapQueryParams queryParams) throws ApiException {
-        ApiResponse<GenomeMapListResponse> resp = mapsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Genomic Maps
-     * Get list of maps
-     *
-     * @return ApiResponse&lt;GenomeMapListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GenomeMapListResponse> mapsGetWithHttpInfo(GenomeMapQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = mapsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<GenomeMapListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Genomic Maps (asynchronously)
-     * Get list of maps
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call mapsGetAsync(GenomeMapQueryParams queryParams, final ApiCallback<GenomeMapListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = mapsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GenomeMapListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for mapsMapDbIdGet
-     *
-     * @param mapDbId                 The ID which uniquely identifies a &#x60;GenomeMap&#x60; (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call mapsMapDbIdGetCall(String mapDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/maps/{mapDbId}"
-                .replaceAll("\\{" + "mapDbId" + "}", apiClient.escapeString(mapDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call mapsMapDbIdGetValidateBeforeCall(String mapDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'mapDbId' is set
-        if (mapDbId == null) {
-            throw new ApiException("Missing the required parameter 'mapDbId' when calling mapsMapDbIdGet(Async)");
-        }
-
-        return mapsMapDbIdGetCall(mapDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details of a specific Genomic Map
-     * Provides the number of markers on each linkageGroup and the max position on the linkageGroup
-     *
-     * @param mapDbId       The ID which uniquely identifies a &#x60;GenomeMap&#x60; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GenomeMapSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GenomeMapSingleResponse mapsMapDbIdGet(String mapDbId, String authorization) throws ApiException {
-        ApiResponse<GenomeMapSingleResponse> resp = mapsMapDbIdGetWithHttpInfo(mapDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details of a specific Genomic Map
-     * Provides the number of markers on each linkageGroup and the max position on the linkageGroup
-     *
-     * @param mapDbId       The ID which uniquely identifies a &#x60;GenomeMap&#x60; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GenomeMapSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GenomeMapSingleResponse> mapsMapDbIdGetWithHttpInfo(String mapDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = mapsMapDbIdGetValidateBeforeCall(mapDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GenomeMapSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details of a specific Genomic Map (asynchronously)
-     * Provides the number of markers on each linkageGroup and the max position on the linkageGroup
-     *
-     * @param mapDbId       The ID which uniquely identifies a &#x60;GenomeMap&#x60; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call mapsMapDbIdGetAsync(String mapDbId, String authorization, final ApiCallback<GenomeMapSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = mapsMapDbIdGetValidateBeforeCall(mapDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GenomeMapSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for mapsMapDbIdLinkagegroupsGet
-     *
-     * @param mapDbId                 The ID which uniquely identifies a &#x60;GenomeMap&#x60; (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call mapsMapDbIdLinkagegroupsGetCall(String mapDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/maps/{mapDbId}/linkagegroups"
-                .replaceAll("\\{" + "mapDbId" + "}", apiClient.escapeString(mapDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call mapsMapDbIdLinkagegroupsGetValidateBeforeCall(String mapDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'mapDbId' is set
-        if (mapDbId == null) {
-            throw new ApiException("Missing the required parameter 'mapDbId' when calling mapsMapDbIdLinkagegroupsGet(Async)");
-        }
-
-        return mapsMapDbIdLinkagegroupsGetCall(mapDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Linkage Groups of a specific Genomic Map
-     * Get the Linkage Groups of a specific Genomic Map. A Linkage Group is the BrAPI generic term for a named section of a map. A Linkage Group can represent a Chromosome, Scaffold, or Linkage Group.
-     *
-     * @param mapDbId       The ID which uniquely identifies a &#x60;GenomeMap&#x60; (required)
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return LinkageGroupListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public LinkageGroupListResponse mapsMapDbIdLinkagegroupsGet(String mapDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<LinkageGroupListResponse> resp = mapsMapDbIdLinkagegroupsGetWithHttpInfo(mapDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Linkage Groups of a specific Genomic Map
-     * Get the Linkage Groups of a specific Genomic Map. A Linkage Group is the BrAPI generic term for a named section of a map. A Linkage Group can represent a Chromosome, Scaffold, or Linkage Group.
-     *
-     * @param mapDbId       The ID which uniquely identifies a &#x60;GenomeMap&#x60; (required)
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;LinkageGroupListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<LinkageGroupListResponse> mapsMapDbIdLinkagegroupsGetWithHttpInfo(String mapDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = mapsMapDbIdLinkagegroupsGetValidateBeforeCall(mapDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<LinkageGroupListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Linkage Groups of a specific Genomic Map (asynchronously)
-     * Get the Linkage Groups of a specific Genomic Map. A Linkage Group is the BrAPI generic term for a named section of a map. A Linkage Group can represent a Chromosome, Scaffold, or Linkage Group.
-     *
-     * @param mapDbId       The ID which uniquely identifies a &#x60;GenomeMap&#x60; (required)
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call mapsMapDbIdLinkagegroupsGetAsync(String mapDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<LinkageGroupListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = mapsMapDbIdLinkagegroupsGetValidateBeforeCall(mapDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<LinkageGroupListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for markerpositionsGet
-     *
-     * @param mapDbId                 The ID which uniquely identifies a &#x60;GenomeMap&#x60; (optional)
-     * @param linkageGroupName        The Uniquely Identifiable name of a &#x60;LinkageGroup&#x60; &lt;br&gt; This might be a chromosome identifier or the generic linkage group identifier if the chromosome is not applicable. (optional)
-     * @param variantDbId             The unique id for a marker (optional)
-     * @param minPosition             The minimum position (optional)
-     * @param maxPosition             The maximum position (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call markerpositionsGetCall(String mapDbId, String linkageGroupName, String variantDbId, Integer minPosition, Integer maxPosition, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/markerpositions";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (mapDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("mapDbId", mapDbId));
-        if (linkageGroupName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("linkageGroupName", linkageGroupName));
-        if (variantDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("variantDbId", variantDbId));
-        if (minPosition != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("minPosition", minPosition));
-        if (maxPosition != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("maxPosition", maxPosition));
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call markerpositionsGetValidateBeforeCall(String mapDbId, String linkageGroupName, String variantDbId, Integer minPosition, Integer maxPosition, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return markerpositionsGetCall(mapDbId, linkageGroupName, variantDbId, minPosition, maxPosition, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get marker position info
-     * Get marker position information, based on Map, Linkage Group, and Marker ID
-     *
-     * @param mapDbId          The ID which uniquely identifies a &#x60;GenomeMap&#x60; (optional)
-     * @param linkageGroupName The Uniquely Identifiable name of a &#x60;LinkageGroup&#x60; &lt;br&gt; This might be a chromosome identifier or the generic linkage group identifier if the chromosome is not applicable. (optional)
-     * @param variantDbId      The unique id for a marker (optional)
-     * @param minPosition      The minimum position (optional)
-     * @param maxPosition      The maximum position (optional)
-     * @param page             Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize         The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization    HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return MarkerPositionListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public MarkerPositionListResponse markerpositionsGet(String mapDbId, String linkageGroupName, String variantDbId, Integer minPosition, Integer maxPosition, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<MarkerPositionListResponse> resp = markerpositionsGetWithHttpInfo(mapDbId, linkageGroupName, variantDbId, minPosition, maxPosition, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get marker position info
-     * Get marker position information, based on Map, Linkage Group, and Marker ID
-     *
-     * @param mapDbId          The ID which uniquely identifies a &#x60;GenomeMap&#x60; (optional)
-     * @param linkageGroupName The Uniquely Identifiable name of a &#x60;LinkageGroup&#x60; &lt;br&gt; This might be a chromosome identifier or the generic linkage group identifier if the chromosome is not applicable. (optional)
-     * @param variantDbId      The unique id for a marker (optional)
-     * @param minPosition      The minimum position (optional)
-     * @param maxPosition      The maximum position (optional)
-     * @param page             Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize         The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization    HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;MarkerPositionListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<MarkerPositionListResponse> markerpositionsGetWithHttpInfo(String mapDbId, String linkageGroupName, String variantDbId, Integer minPosition, Integer maxPosition, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = markerpositionsGetValidateBeforeCall(mapDbId, linkageGroupName, variantDbId, minPosition, maxPosition, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<MarkerPositionListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get marker position info (asynchronously)
-     * Get marker position information, based on Map, Linkage Group, and Marker ID
-     *
-     * @param mapDbId          The ID which uniquely identifies a &#x60;GenomeMap&#x60; (optional)
-     * @param linkageGroupName The Uniquely Identifiable name of a &#x60;LinkageGroup&#x60; &lt;br&gt; This might be a chromosome identifier or the generic linkage group identifier if the chromosome is not applicable. (optional)
-     * @param variantDbId      The unique id for a marker (optional)
-     * @param minPosition      The minimum position (optional)
-     * @param maxPosition      The maximum position (optional)
-     * @param page             Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize         The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization    HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback         The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call markerpositionsGetAsync(String mapDbId, String linkageGroupName, String variantDbId, Integer minPosition, Integer maxPosition, Integer page, Integer pageSize, String authorization, final ApiCallback<MarkerPositionListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = markerpositionsGetValidateBeforeCall(mapDbId, linkageGroupName, variantDbId, minPosition, maxPosition, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<MarkerPositionListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchMarkerpositionsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchMarkerpositionsPostCall(MarkerPositionSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/markerpositions";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchMarkerpositionsPostValidateBeforeCall(MarkerPositionSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchMarkerpositionsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;MarkerPositions&#x60;
-     * Submit a search request for &#x60;MarkerPositions&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/markerpositions/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return MarkerPositionListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public MarkerPositionListResponse searchMarkerpositionsPost(MarkerPositionSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<MarkerPositionListResponse> resp = searchMarkerpositionsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;MarkerPositions&#x60;
-     * Submit a search request for &#x60;MarkerPositions&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/markerpositions/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;MarkerPositionListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<MarkerPositionListResponse> searchMarkerpositionsPostWithHttpInfo(MarkerPositionSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchMarkerpositionsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<MarkerPositionListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;MarkerPositions&#x60; (asynchronously)
-     * Submit a search request for &#x60;MarkerPositions&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/markerpositions/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchMarkerpositionsPostAsync(MarkerPositionSearchRequest body, String authorization, final ApiCallback<MarkerPositionListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchMarkerpositionsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<MarkerPositionListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchMarkerpositionsSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchMarkerpositionsSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/markerpositions/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchMarkerpositionsSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchMarkerpositionsSearchResultsDbIdGet(Async)");
-        }
-
-        return searchMarkerpositionsSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;MarkerPositions&#x60; search request
-     * Get the results of a &#x60;MarkerPositions&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/markerpositions&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return MarkerPositionListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public MarkerPositionListResponse searchMarkerpositionsSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<MarkerPositionListResponse> resp = searchMarkerpositionsSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;MarkerPositions&#x60; search request
-     * Get the results of a &#x60;MarkerPositions&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/markerpositions&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;MarkerPositionListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<MarkerPositionListResponse> searchMarkerpositionsSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchMarkerpositionsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<MarkerPositionListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;MarkerPositions&#x60; search request (asynchronously)
-     * Get the results of a &#x60;MarkerPositions&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/markerpositions&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchMarkerpositionsSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<MarkerPositionListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchMarkerpositionsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<MarkerPositionListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/PlatesApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/PlatesApi.java
deleted file mode 100644
index 6306965e..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/PlatesApi.java
+++ /dev/null
@@ -1,745 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.genotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.genotype.PlatesQueryParams;
-import org.brapi.model.v21.genotype.PlateListResponse;
-import org.brapi.model.v21.genotype.PlateNewRequest;
-import org.brapi.model.v21.genotype.PlateSearchRequest;
-import org.brapi.model.v21.genotype.PlateSingleResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class PlatesApi {
-    private ApiClient apiClient;
-
-    public PlatesApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public PlatesApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for platesGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call platesGetCall(PlatesQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/plates";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call platesGetValidateBeforeCall(PlatesQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return platesGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a filtered list of &#x60;Plates&#x60;. Each &#x60;Plate&#x60; is a collection of &#x60;Samples&#x60; that are physically grouped together.
-     *
-     * @return PlateListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PlateListResponse platesGet(PlatesQueryParams queryParams) throws ApiException {
-        ApiResponse<PlateListResponse> resp = platesGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get a filtered list of &#x60;Plates&#x60;. Each &#x60;Plate&#x60; is a collection of &#x60;Samples&#x60; that are physically grouped together.
-     *
-     * @return ApiResponse&lt;PlateListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PlateListResponse> platesGetWithHttpInfo(PlatesQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = platesGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<PlateListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a filtered list of &#x60;Plates&#x60;. Each &#x60;Plate&#x60; is a collection of &#x60;Samples&#x60; that are physically grouped together.
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call platesGetAsync(PlatesQueryParams queryParams, final ApiCallback<PlateListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = platesGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PlateListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for platesPlateDbIdGet
-     *
-     * @param plateDbId               The ID which uniquely identifies a &#x60;Plate&#x60; (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call platesPlateDbIdGetCall(String plateDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/plates/{plateDbId}"
-                .replaceAll("\\{" + "plateDbId" + "}", apiClient.escapeString(plateDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call platesPlateDbIdGetValidateBeforeCall(String plateDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'plateDbId' is set
-        if (plateDbId == null) {
-            throw new ApiException("Missing the required parameter 'plateDbId' when calling platesPlateDbIdGet(Async)");
-        }
-
-        return platesPlateDbIdGetCall(plateDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details of a specific Plate.
-     * Get the details of a specific &#x60;Plate&#x60;. Each &#x60;Plate&#x60; is a collection of &#x60;Samples&#x60; that are physically grouped together.
-     *
-     * @param plateDbId     The ID which uniquely identifies a &#x60;Plate&#x60; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PlateSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PlateSingleResponse platesPlateDbIdGet(String plateDbId, String authorization) throws ApiException {
-        ApiResponse<PlateSingleResponse> resp = platesPlateDbIdGetWithHttpInfo(plateDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details of a specific Plate.
-     * Get the details of a specific &#x60;Plate&#x60;. Each &#x60;Plate&#x60; is a collection of &#x60;Samples&#x60; that are physically grouped together.
-     *
-     * @param plateDbId     The ID which uniquely identifies a &#x60;Plate&#x60; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PlateSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PlateSingleResponse> platesPlateDbIdGetWithHttpInfo(String plateDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = platesPlateDbIdGetValidateBeforeCall(plateDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PlateSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details of a specific Plate. (asynchronously)
-     * Get the details of a specific &#x60;Plate&#x60;. Each &#x60;Plate&#x60; is a collection of &#x60;Samples&#x60; that are physically grouped together.
-     *
-     * @param plateDbId     The ID which uniquely identifies a &#x60;Plate&#x60; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call platesPlateDbIdGetAsync(String plateDbId, String authorization, final ApiCallback<PlateSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = platesPlateDbIdGetValidateBeforeCall(plateDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PlateSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for platesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call platesPostCall(List<PlateNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/plates";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call platesPostValidateBeforeCall(List<PlateNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return platesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit new Plate entities to the server
-     * Submit new Plate entities to the server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PlateListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PlateListResponse platesPost(List<PlateNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<PlateListResponse> resp = platesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit new Plate entities to the server
-     * Submit new Plate entities to the server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PlateListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PlateListResponse> platesPostWithHttpInfo(List<PlateNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = platesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PlateListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit new Plate entities to the server (asynchronously)
-     * Submit new Plate entities to the server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call platesPostAsync(List<PlateNewRequest> body, String authorization, final ApiCallback<PlateListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = platesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PlateListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for platesPut
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call platesPutCall(Map<String, PlateNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/plates";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call platesPutValidateBeforeCall(Map<String, PlateNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return platesPutCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update the details of existing Plates
-     * Update the details of existing Plates
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PlateListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PlateListResponse platesPut(Map<String, PlateNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<PlateListResponse> resp = platesPutWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update the details of existing Plates
-     * Update the details of existing Plates
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PlateListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PlateListResponse> platesPutWithHttpInfo(Map<String, PlateNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = platesPutValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PlateListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update the details of existing Plates (asynchronously)
-     * Update the details of existing Plates
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call platesPutAsync(Map<String, PlateNewRequest> body, String authorization, final ApiCallback<PlateListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = platesPutValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PlateListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchPlatesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchPlatesPostCall(PlateSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/plates";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchPlatesPostValidateBeforeCall(PlateSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchPlatesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;Plates&#x60;
-     * Submit a search request for &#x60;Plates&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/plates/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PlateListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PlateListResponse searchPlatesPost(PlateSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<PlateListResponse> resp = searchPlatesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;Plates&#x60;
-     * Submit a search request for &#x60;Plates&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/plates/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PlateListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PlateListResponse> searchPlatesPostWithHttpInfo(PlateSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchPlatesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PlateListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;Plates&#x60; (asynchronously)
-     * Submit a search request for &#x60;Plates&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/plates/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchPlatesPostAsync(PlateSearchRequest body, String authorization, final ApiCallback<PlateListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchPlatesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PlateListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchPlatesSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchPlatesSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/plates/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchPlatesSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchPlatesSearchResultsDbIdGet(Async)");
-        }
-
-        return searchPlatesSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;Plates&#x60; search request
-     * Get the results of a &#x60;Plates&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/plates&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PlateListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PlateListResponse searchPlatesSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<PlateListResponse> resp = searchPlatesSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;Plates&#x60; search request
-     * Get the results of a &#x60;Plates&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/plates&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PlateListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PlateListResponse> searchPlatesSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchPlatesSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PlateListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;Plates&#x60; search request (asynchronously)
-     * Get the results of a &#x60;Plates&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/plates&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchPlatesSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<PlateListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchPlatesSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PlateListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/ReferenceSetsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/ReferenceSetsApi.java
deleted file mode 100644
index 421041e1..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/ReferenceSetsApi.java
+++ /dev/null
@@ -1,520 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.genotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.genotype.ReferenceSetQueryParams;
-import org.brapi.model.v21.genotype.ReferenceSetsListResponse;
-import org.brapi.model.v21.genotype.ReferenceSetsSearchRequest;
-import org.brapi.model.v21.genotype.ReferenceSetsSingleResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ReferenceSetsApi {
-    private ApiClient apiClient;
-
-    public ReferenceSetsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public ReferenceSetsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for referencesetsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call referencesetsGetCall(ReferenceSetQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/referencesets";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call referencesetsGetValidateBeforeCall(ReferenceSetQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return referencesetsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Gets a filtered list of &#x60;ReferenceSets&#x60;.
-     *
-     * @return ReferenceSetsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ReferenceSetsListResponse referencesetsGet(ReferenceSetQueryParams queryParams) throws ApiException {
-        ApiResponse<ReferenceSetsListResponse> resp = referencesetsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Gets a filtered list of &#x60;ReferenceSets&#x60;.
-     *
-     * @return ApiResponse&lt;ReferenceSetsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ReferenceSetsListResponse> referencesetsGetWithHttpInfo(ReferenceSetQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = referencesetsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<ReferenceSetsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Gets a filtered list of &#x60;ReferenceSets&#x60;.
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call referencesetsGetAsync(ReferenceSetQueryParams queryParams, final ApiCallback<ReferenceSetsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = referencesetsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ReferenceSetsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for referencesetsReferenceSetDbIdGet
-     *
-     * @param referenceSetDbId        The ID of the &#x60;ReferenceSet&#x60; to be retrieved. (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call referencesetsReferenceSetDbIdGetCall(String referenceSetDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/referencesets/{referenceSetDbId}"
-                .replaceAll("\\{" + "referenceSetDbId" + "}", apiClient.escapeString(referenceSetDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call referencesetsReferenceSetDbIdGetValidateBeforeCall(String referenceSetDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'referenceSetDbId' is set
-        if (referenceSetDbId == null) {
-            throw new ApiException("Missing the required parameter 'referenceSetDbId' when calling referencesetsReferenceSetDbIdGet(Async)");
-        }
-
-        return referencesetsReferenceSetDbIdGetCall(referenceSetDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Gets a &#x60;ReferenceSet&#x60; by ID.
-     * Gets a &#x60;ReferenceSet&#x60; by ID.
-     *
-     * @param referenceSetDbId The ID of the &#x60;ReferenceSet&#x60; to be retrieved. (required)
-     * @param authorization    HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ReferenceSetsSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ReferenceSetsSingleResponse referencesetsReferenceSetDbIdGet(String referenceSetDbId, String authorization) throws ApiException {
-        ApiResponse<ReferenceSetsSingleResponse> resp = referencesetsReferenceSetDbIdGetWithHttpInfo(referenceSetDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Gets a &#x60;ReferenceSet&#x60; by ID.
-     * Gets a &#x60;ReferenceSet&#x60; by ID.
-     *
-     * @param referenceSetDbId The ID of the &#x60;ReferenceSet&#x60; to be retrieved. (required)
-     * @param authorization    HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ReferenceSetsSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ReferenceSetsSingleResponse> referencesetsReferenceSetDbIdGetWithHttpInfo(String referenceSetDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = referencesetsReferenceSetDbIdGetValidateBeforeCall(referenceSetDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ReferenceSetsSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Gets a &#x60;ReferenceSet&#x60; by ID. (asynchronously)
-     * Gets a &#x60;ReferenceSet&#x60; by ID.
-     *
-     * @param referenceSetDbId The ID of the &#x60;ReferenceSet&#x60; to be retrieved. (required)
-     * @param authorization    HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback         The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call referencesetsReferenceSetDbIdGetAsync(String referenceSetDbId, String authorization, final ApiCallback<ReferenceSetsSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = referencesetsReferenceSetDbIdGetValidateBeforeCall(referenceSetDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ReferenceSetsSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchReferencesetsPost
-     *
-     * @param body                    (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchReferencesetsPostCall(ReferenceSetsSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/referencesets";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchReferencesetsPostValidateBeforeCall(ReferenceSetsSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'body' is set
-        if (body == null) {
-            throw new ApiException("Missing the required parameter 'body' when calling searchReferencesetsPost(Async)");
-        }
-
-        return searchReferencesetsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;ReferenceSets&#x60;
-     * Submit a search request for &#x60;ReferenceSets&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/referencesets/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ReferenceSetsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ReferenceSetsListResponse searchReferencesetsPost(ReferenceSetsSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<ReferenceSetsListResponse> resp = searchReferencesetsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;ReferenceSets&#x60;
-     * Submit a search request for &#x60;ReferenceSets&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/referencesets/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ReferenceSetsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ReferenceSetsListResponse> searchReferencesetsPostWithHttpInfo(ReferenceSetsSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchReferencesetsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ReferenceSetsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;ReferenceSets&#x60; (asynchronously)
-     * Submit a search request for &#x60;ReferenceSets&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/referencesets/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchReferencesetsPostAsync(ReferenceSetsSearchRequest body, String authorization, final ApiCallback<ReferenceSetsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchReferencesetsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ReferenceSetsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchReferencesetsSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchReferencesetsSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/referencesets/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchReferencesetsSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchReferencesetsSearchResultsDbIdGet(Async)");
-        }
-
-        return searchReferencesetsSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;ReferenceSets&#x60; search request
-     * Get the results of a &#x60;ReferenceSets&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/referencesets&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ReferenceSetsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ReferenceSetsListResponse searchReferencesetsSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<ReferenceSetsListResponse> resp = searchReferencesetsSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;ReferenceSets&#x60; search request
-     * Get the results of a &#x60;ReferenceSets&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/referencesets&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ReferenceSetsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ReferenceSetsListResponse> searchReferencesetsSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchReferencesetsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ReferenceSetsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;ReferenceSets&#x60; search request (asynchronously)
-     * Get the results of a &#x60;ReferenceSets&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/referencesets&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchReferencesetsSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<ReferenceSetsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchReferencesetsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ReferenceSetsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/ReferencesApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/ReferencesApi.java
deleted file mode 100644
index 28fe3a19..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/ReferencesApi.java
+++ /dev/null
@@ -1,658 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.genotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.genotype.ReferenceQueryParams;
-import org.brapi.model.v21.genotype.ReferenceBasesResponse;
-import org.brapi.model.v21.genotype.ReferenceSingleResponse;
-import org.brapi.model.v21.genotype.ReferencesListResponse;
-import org.brapi.model.v21.genotype.ReferencesSearchRequest;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ReferencesApi {
-    private ApiClient apiClient;
-
-    public ReferencesApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public ReferencesApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for referencesGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call referencesGetCall(ReferenceQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/references";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call referencesGetValidateBeforeCall(ReferenceQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return referencesGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Gets a filtered list of &#x60;Reference&#x60; objects.
-     * &#x60;GET /references&#x60; will return a filtered list of &#x60;Reference&#x60; JSON objects
-     *
-     * @return ReferencesListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ReferencesListResponse referencesGet(ReferenceQueryParams queryParams) throws ApiException {
-        ApiResponse<ReferencesListResponse> resp = referencesGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Gets a filtered list of &#x60;Reference&#x60; objects.
-     * &#x60;GET /references&#x60; will return a filtered list of &#x60;Reference&#x60; JSON objects.
-     *
-     * @return ApiResponse&lt;ReferencesListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ReferencesListResponse> referencesGetWithHttpInfo(ReferenceQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = referencesGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<ReferencesListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Gets a filtered list of &#x60;Reference&#x60; objects. (asynchronously)
-     * &#x60;GET /references&#x60; will return a filtered list of &#x60;Reference&#x60; JSON objects.
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call referencesGetAsync(ReferenceQueryParams queryParams, final ApiCallback<ReferencesListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = referencesGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ReferencesListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for referencesReferenceDbIdBasesGet
-     *
-     * @param referenceDbId           The ID of the &#x60;Reference&#x60; to be retrieved. (required)
-     * @param start                   The start position (0-based) of this query. Defaults to 0. Genomic positions are non-negative integers less than reference length. Requests spanning the join of circular genomes are represented as two requests one on each side of the join (position 0). (optional)
-     * @param end                     The end position (0-based, exclusive) of this query. Defaults to the length of this &#x60;Reference&#x60;. (optional)
-     * @param pageToken               The continuation token, which is used to page through large result sets. To get the next page of results, set this parameter to the value of &#x60;next_page_token&#x60; from the previous response. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call referencesReferenceDbIdBasesGetCall(String referenceDbId, Integer start, Integer end, String pageToken, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/references/{referenceDbId}/bases"
-                .replaceAll("\\{" + "referenceDbId" + "}", apiClient.escapeString(referenceDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (start != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("start", start));
-        if (end != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("end", end));
-        if (pageToken != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageToken", pageToken));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call referencesReferenceDbIdBasesGetValidateBeforeCall(String referenceDbId, Integer start, Integer end, String pageToken, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'referenceDbId' is set
-        if (referenceDbId == null) {
-            throw new ApiException("Missing the required parameter 'referenceDbId' when calling referencesReferenceDbIdBasesGet(Async)");
-        }
-
-        return referencesReferenceDbIdBasesGetCall(referenceDbId, start, end, pageToken, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Lists &#x60;Reference&#x60; bases by ID and optional range.
-     * Lists &#x60;Reference&#x60; bases by ID and optional range.
-     *
-     * @param referenceDbId The ID of the &#x60;Reference&#x60; to be retrieved. (required)
-     * @param start         The start position (0-based) of this query. Defaults to 0. Genomic positions are non-negative integers less than reference length. Requests spanning the join of circular genomes are represented as two requests one on each side of the join (position 0). (optional)
-     * @param end           The end position (0-based, exclusive) of this query. Defaults to the length of this &#x60;Reference&#x60;. (optional)
-     * @param pageToken     The continuation token, which is used to page through large result sets. To get the next page of results, set this parameter to the value of &#x60;next_page_token&#x60; from the previous response. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ReferenceBasesResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ReferenceBasesResponse referencesReferenceDbIdBasesGet(String referenceDbId, Integer start, Integer end, String pageToken, String authorization) throws ApiException {
-        ApiResponse<ReferenceBasesResponse> resp = referencesReferenceDbIdBasesGetWithHttpInfo(referenceDbId, start, end, pageToken, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Lists &#x60;Reference&#x60; bases by ID and optional range.
-     * Lists &#x60;Reference&#x60; bases by ID and optional range.
-     *
-     * @param referenceDbId The ID of the &#x60;Reference&#x60; to be retrieved. (required)
-     * @param start         The start position (0-based) of this query. Defaults to 0. Genomic positions are non-negative integers less than reference length. Requests spanning the join of circular genomes are represented as two requests one on each side of the join (position 0). (optional)
-     * @param end           The end position (0-based, exclusive) of this query. Defaults to the length of this &#x60;Reference&#x60;. (optional)
-     * @param pageToken     The continuation token, which is used to page through large result sets. To get the next page of results, set this parameter to the value of &#x60;next_page_token&#x60; from the previous response. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ReferenceBasesResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ReferenceBasesResponse> referencesReferenceDbIdBasesGetWithHttpInfo(String referenceDbId, Integer start, Integer end, String pageToken, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = referencesReferenceDbIdBasesGetValidateBeforeCall(referenceDbId, start, end, pageToken, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ReferenceBasesResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Lists &#x60;Reference&#x60; bases by ID and optional range. (asynchronously)
-     * Lists &#x60;Reference&#x60; bases by ID and optional range.
-     *
-     * @param referenceDbId The ID of the &#x60;Reference&#x60; to be retrieved. (required)
-     * @param start         The start position (0-based) of this query. Defaults to 0. Genomic positions are non-negative integers less than reference length. Requests spanning the join of circular genomes are represented as two requests one on each side of the join (position 0). (optional)
-     * @param end           The end position (0-based, exclusive) of this query. Defaults to the length of this &#x60;Reference&#x60;. (optional)
-     * @param pageToken     The continuation token, which is used to page through large result sets. To get the next page of results, set this parameter to the value of &#x60;next_page_token&#x60; from the previous response. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call referencesReferenceDbIdBasesGetAsync(String referenceDbId, Integer start, Integer end, String pageToken, String authorization, final ApiCallback<ReferenceBasesResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = referencesReferenceDbIdBasesGetValidateBeforeCall(referenceDbId, start, end, pageToken, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ReferenceBasesResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for referencesReferenceDbIdGet
-     *
-     * @param referenceDbId           The ID of the &#x60;Reference&#x60; to be retrieved. (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call referencesReferenceDbIdGetCall(String referenceDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/references/{referenceDbId}"
-                .replaceAll("\\{" + "referenceDbId" + "}", apiClient.escapeString(referenceDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call referencesReferenceDbIdGetValidateBeforeCall(String referenceDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'referenceDbId' is set
-        if (referenceDbId == null) {
-            throw new ApiException("Missing the required parameter 'referenceDbId' when calling referencesReferenceDbIdGet(Async)");
-        }
-
-        return referencesReferenceDbIdGetCall(referenceDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Gets a &#x60;Reference&#x60; by ID.
-     * &#x60;GET /references/{reference_id}&#x60; will return a JSON version of &#x60;Reference&#x60;.
-     *
-     * @param referenceDbId The ID of the &#x60;Reference&#x60; to be retrieved. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ReferenceSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ReferenceSingleResponse referencesReferenceDbIdGet(String referenceDbId, String authorization) throws ApiException {
-        ApiResponse<ReferenceSingleResponse> resp = referencesReferenceDbIdGetWithHttpInfo(referenceDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Gets a &#x60;Reference&#x60; by ID.
-     * &#x60;GET /references/{reference_id}&#x60; will return a JSON version of &#x60;Reference&#x60;.
-     *
-     * @param referenceDbId The ID of the &#x60;Reference&#x60; to be retrieved. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ReferenceSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ReferenceSingleResponse> referencesReferenceDbIdGetWithHttpInfo(String referenceDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = referencesReferenceDbIdGetValidateBeforeCall(referenceDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ReferenceSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Gets a &#x60;Reference&#x60; by ID. (asynchronously)
-     * &#x60;GET /references/{reference_id}&#x60; will return a JSON version of &#x60;Reference&#x60;.
-     *
-     * @param referenceDbId The ID of the &#x60;Reference&#x60; to be retrieved. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call referencesReferenceDbIdGetAsync(String referenceDbId, String authorization, final ApiCallback<ReferenceSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = referencesReferenceDbIdGetValidateBeforeCall(referenceDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ReferenceSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchReferencesPost
-     *
-     * @param body                    References Search request (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchReferencesPostCall(ReferencesSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/references";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchReferencesPostValidateBeforeCall(ReferencesSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchReferencesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;References&#x60;
-     * Submit a search request for &#x60;References&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/references/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          References Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ReferencesListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ReferencesListResponse searchReferencesPost(ReferencesSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<ReferencesListResponse> resp = searchReferencesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;References&#x60;
-     * Submit a search request for &#x60;References&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/references/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          References Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ReferencesListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ReferencesListResponse> searchReferencesPostWithHttpInfo(ReferencesSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchReferencesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ReferencesListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;References&#x60; (asynchronously)
-     * Submit a search request for &#x60;References&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/references/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          References Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchReferencesPostAsync(ReferencesSearchRequest body, String authorization, final ApiCallback<ReferencesListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchReferencesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ReferencesListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchReferencesSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchReferencesSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/references/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchReferencesSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchReferencesSearchResultsDbIdGet(Async)");
-        }
-
-        return searchReferencesSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;References&#x60; search request
-     * Get the results of a &#x60;References&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/references&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ReferencesListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ReferencesListResponse searchReferencesSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<ReferencesListResponse> resp = searchReferencesSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;References&#x60; search request
-     * Get the results of a &#x60;References&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/references&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ReferencesListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ReferencesListResponse> searchReferencesSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchReferencesSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ReferencesListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;References&#x60; search request (asynchronously)
-     * Get the results of a &#x60;References&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/references&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchReferencesSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<ReferencesListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchReferencesSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ReferencesListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/SamplesApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/SamplesApi.java
deleted file mode 100644
index d6e5490a..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/SamplesApi.java
+++ /dev/null
@@ -1,871 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.genotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.genotype.SampleQueryParams;
-import org.brapi.model.v21.genotype.SampleListResponse;
-import org.brapi.model.v21.genotype.SampleNewRequest;
-import org.brapi.model.v21.genotype.SampleSearchRequest;
-import org.brapi.model.v21.genotype.SampleSingleResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class SamplesApi {
-    private ApiClient apiClient;
-
-    public SamplesApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public SamplesApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for samplesGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call samplesGetCall(SampleQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/samples";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call samplesGetValidateBeforeCall(SampleQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return samplesGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Samples
-     * Used to retrieve list of Samples from a Sample Tracking system based on some search criteria.
-     *
-     * @return SampleListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SampleListResponse samplesGet(SampleQueryParams queryParams) throws ApiException {
-        ApiResponse<SampleListResponse> resp = samplesGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Samples
-     * Used to retrieve list of Samples from a Sample Tracking system based on some search criteria.
-     *
-     * @return ApiResponse&lt;SampleListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SampleListResponse> samplesGetWithHttpInfo(SampleQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = samplesGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<SampleListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Samples (asynchronously)
-     * Used to retrieve list of Samples from a Sample Tracking system based on some search criteria.
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call samplesGetAsync(SampleQueryParams queryParams, final ApiCallback<SampleListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = samplesGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SampleListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for samplesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call samplesPostCall(List<SampleNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/samples";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call samplesPostValidateBeforeCall(List<SampleNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return samplesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Add new Samples
-     * Call to register the event of a sample being taken. Sample ID is assigned as a result of the operation and returned in response.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return SampleListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SampleListResponse samplesPost(List<SampleNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<SampleListResponse> resp = samplesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Add new Samples
-     * Call to register the event of a sample being taken. Sample ID is assigned as a result of the operation and returned in response.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;SampleListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SampleListResponse> samplesPostWithHttpInfo(List<SampleNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = samplesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<SampleListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Add new Samples (asynchronously)
-     * Call to register the event of a sample being taken. Sample ID is assigned as a result of the operation and returned in response.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call samplesPostAsync(List<SampleNewRequest> body, String authorization, final ApiCallback<SampleListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = samplesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SampleListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for samplesPut
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call samplesPutCall(Map<String, SampleNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/samples";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call samplesPutValidateBeforeCall(Map<String, SampleNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return samplesPutCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update the details of existing Samples
-     * Update the details of existing Samples
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return SampleListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SampleListResponse samplesPut(Map<String, SampleNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<SampleListResponse> resp = samplesPutWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update the details of existing Samples
-     * Update the details of existing Samples
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;SampleListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SampleListResponse> samplesPutWithHttpInfo(Map<String, SampleNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = samplesPutValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<SampleListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update the details of existing Samples (asynchronously)
-     * Update the details of existing Samples
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call samplesPutAsync(Map<String, SampleNewRequest> body, String authorization, final ApiCallback<SampleListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = samplesPutValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SampleListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for samplesSampleDbIdGet
-     *
-     * @param sampleDbId              The unique identifier for a &#x60;Sample&#x60; (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call samplesSampleDbIdGetCall(String sampleDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/samples/{sampleDbId}"
-                .replaceAll("\\{" + "sampleDbId" + "}", apiClient.escapeString(sampleDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call samplesSampleDbIdGetValidateBeforeCall(String sampleDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'sampleDbId' is set
-        if (sampleDbId == null) {
-            throw new ApiException("Missing the required parameter 'sampleDbId' when calling samplesSampleDbIdGet(Async)");
-        }
-
-        return samplesSampleDbIdGetCall(sampleDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details of a specific Sample
-     * Used to retrieve the details of a single Sample from a Sample Tracking system.
-     *
-     * @param sampleDbId    The unique identifier for a &#x60;Sample&#x60; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return SampleSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SampleSingleResponse samplesSampleDbIdGet(String sampleDbId, String authorization) throws ApiException {
-        ApiResponse<SampleSingleResponse> resp = samplesSampleDbIdGetWithHttpInfo(sampleDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details of a specific Sample
-     * Used to retrieve the details of a single Sample from a Sample Tracking system.
-     *
-     * @param sampleDbId    The unique identifier for a &#x60;Sample&#x60; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;SampleSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SampleSingleResponse> samplesSampleDbIdGetWithHttpInfo(String sampleDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = samplesSampleDbIdGetValidateBeforeCall(sampleDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<SampleSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details of a specific Sample (asynchronously)
-     * Used to retrieve the details of a single Sample from a Sample Tracking system.
-     *
-     * @param sampleDbId    The unique identifier for a &#x60;Sample&#x60; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call samplesSampleDbIdGetAsync(String sampleDbId, String authorization, final ApiCallback<SampleSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = samplesSampleDbIdGetValidateBeforeCall(sampleDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SampleSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for samplesSampleDbIdPut
-     *
-     * @param sampleDbId              The unique identifier for a &#x60;Sample&#x60; (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call samplesSampleDbIdPutCall(String sampleDbId, SampleNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/samples/{sampleDbId}"
-                .replaceAll("\\{" + "sampleDbId" + "}", apiClient.escapeString(sampleDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call samplesSampleDbIdPutValidateBeforeCall(String sampleDbId, SampleNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'sampleDbId' is set
-        if (sampleDbId == null) {
-            throw new ApiException("Missing the required parameter 'sampleDbId' when calling samplesSampleDbIdPut(Async)");
-        }
-
-        return samplesSampleDbIdPutCall(sampleDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update the details of an existing Sample
-     * **Deprecated in v2.1** Please use &#x60;PUT /samples&#x60;. Github issue number #462  &lt;br/&gt;Update the details of an existing Sample
-     *
-     * @param sampleDbId    The unique identifier for a &#x60;Sample&#x60; (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return SampleSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SampleSingleResponse samplesSampleDbIdPut(String sampleDbId, SampleNewRequest body, String authorization) throws ApiException {
-        ApiResponse<SampleSingleResponse> resp = samplesSampleDbIdPutWithHttpInfo(sampleDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update the details of an existing Sample
-     * **Deprecated in v2.1** Please use &#x60;PUT /samples&#x60;. Github issue number #462  &lt;br/&gt;Update the details of an existing Sample
-     *
-     * @param sampleDbId    The unique identifier for a &#x60;Sample&#x60; (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;SampleSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SampleSingleResponse> samplesSampleDbIdPutWithHttpInfo(String sampleDbId, SampleNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = samplesSampleDbIdPutValidateBeforeCall(sampleDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<SampleSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update the details of an existing Sample (asynchronously)
-     * **Deprecated in v2.1** Please use &#x60;PUT /samples&#x60;. Github issue number #462  &lt;br/&gt;Update the details of an existing Sample
-     *
-     * @param sampleDbId    The unique identifier for a &#x60;Sample&#x60; (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call samplesSampleDbIdPutAsync(String sampleDbId, SampleNewRequest body, String authorization, final ApiCallback<SampleSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = samplesSampleDbIdPutValidateBeforeCall(sampleDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SampleSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchSamplesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchSamplesPostCall(SampleSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/samples";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchSamplesPostValidateBeforeCall(SampleSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchSamplesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;Samples&#x60;
-     * Submit a search request for &#x60;Samples&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/samples/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return SampleListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SampleListResponse searchSamplesPost(SampleSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<SampleListResponse> resp = searchSamplesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;Samples&#x60;
-     * Submit a search request for &#x60;Samples&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/samples/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;SampleListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SampleListResponse> searchSamplesPostWithHttpInfo(SampleSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchSamplesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<SampleListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;Samples&#x60; (asynchronously)
-     * Submit a search request for &#x60;Samples&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/samples/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchSamplesPostAsync(SampleSearchRequest body, String authorization, final ApiCallback<SampleListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchSamplesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SampleListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchSamplesSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchSamplesSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/samples/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchSamplesSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchSamplesSearchResultsDbIdGet(Async)");
-        }
-
-        return searchSamplesSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;Samples&#x60; search request
-     * Get the results of a &#x60;Samples&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/samples&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return SampleListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SampleListResponse searchSamplesSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<SampleListResponse> resp = searchSamplesSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;Samples&#x60; search request
-     * Get the results of a &#x60;Samples&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/samples&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;SampleListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SampleListResponse> searchSamplesSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchSamplesSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<SampleListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;Samples&#x60; search request (asynchronously)
-     * Get the results of a &#x60;Samples&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/samples&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchSamplesSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<SampleListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchSamplesSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SampleListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/VariantSetsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/VariantSetsApi.java
deleted file mode 100644
index 4a05d92e..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/VariantSetsApi.java
+++ /dev/null
@@ -1,1078 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.genotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.genotype.VariantSetQueryParams;
-import org.brapi.model.v21.genotype.*;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class VariantSetsApi {
-    private ApiClient apiClient;
-
-    public VariantSetsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public VariantSetsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for searchVariantsetsPost
-     *
-     * @param body                    Study Search request (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchVariantsetsPostCall(VariantSetsSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/variantsets";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchVariantsetsPostValidateBeforeCall(VariantSetsSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchVariantsetsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;VariantSets&#x60;
-     * Submit a search request for &#x60;VariantSets&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/variantsets/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return VariantSetsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VariantSetsListResponse searchVariantsetsPost(VariantSetsSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<VariantSetsListResponse> resp = searchVariantsetsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;VariantSets&#x60;
-     * Submit a search request for &#x60;VariantSets&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/variantsets/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;VariantSetsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VariantSetsListResponse> searchVariantsetsPostWithHttpInfo(VariantSetsSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchVariantsetsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<VariantSetsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;VariantSets&#x60; (asynchronously)
-     * Submit a search request for &#x60;VariantSets&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/variantsets/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchVariantsetsPostAsync(VariantSetsSearchRequest body, String authorization, final ApiCallback<VariantSetsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchVariantsetsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VariantSetsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchVariantsetsSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchVariantsetsSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/variantsets/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchVariantsetsSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchVariantsetsSearchResultsDbIdGet(Async)");
-        }
-
-        return searchVariantsetsSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;VariantSets&#x60; search request
-     * Get the results of a &#x60;VariantSets&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/variantsets&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return VariantSetsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VariantSetsListResponse searchVariantsetsSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<VariantSetsListResponse> resp = searchVariantsetsSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;VariantSets&#x60; search request
-     * Get the results of a &#x60;VariantSets&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/variantsets&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;VariantSetsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VariantSetsListResponse> searchVariantsetsSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchVariantsetsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<VariantSetsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;VariantSets&#x60; search request (asynchronously)
-     * Get the results of a &#x60;VariantSets&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/variantsets&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchVariantsetsSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<VariantSetsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchVariantsetsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VariantSetsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for variantsetsExtractPost
-     *
-     * @param body                    Study Search request (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call variantsetsExtractPostCall(VariantSetsExtractRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/variantsets/extract";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call variantsetsExtractPostValidateBeforeCall(VariantSetsExtractRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return variantsetsExtractPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Create new &#x60;VariantSet&#x60; based on search results
-     * Will perform a search for &#x60;Calls&#x60; which match the search criteria in &#x60;variantSetsExtractRequest&#x60;. The results of the search will be used to create a new &#x60;VariantSet&#x60; on the server. The new &#x60;VariantSet&#x60; will be returned.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return VariantSetResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VariantSetResponse variantsetsExtractPost(VariantSetsExtractRequest body, String authorization) throws ApiException {
-        ApiResponse<VariantSetResponse> resp = variantsetsExtractPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Create new &#x60;VariantSet&#x60; based on search results
-     * Will perform a search for &#x60;Calls&#x60; which match the search criteria in &#x60;variantSetsExtractRequest&#x60;. The results of the search will be used to create a new &#x60;VariantSet&#x60; on the server. The new &#x60;VariantSet&#x60; will be returned.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;VariantSetResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VariantSetResponse> variantsetsExtractPostWithHttpInfo(VariantSetsExtractRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = variantsetsExtractPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<VariantSetResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Create new &#x60;VariantSet&#x60; based on search results (asynchronously)
-     * Will perform a search for &#x60;Calls&#x60; which match the search criteria in &#x60;variantSetsExtractRequest&#x60;. The results of the search will be used to create a new &#x60;VariantSet&#x60; on the server. The new &#x60;VariantSet&#x60; will be returned.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call variantsetsExtractPostAsync(VariantSetsExtractRequest body, String authorization, final ApiCallback<VariantSetResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = variantsetsExtractPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VariantSetResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for variantsetsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call variantsetsGetCall(VariantSetQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/variantsets";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call variantsetsGetValidateBeforeCall(VariantSetQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return variantsetsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Gets a filtered list of &#x60;VariantSets&#x60;.
-     *
-     * @return VariantSetsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VariantSetsListResponse variantsetsGet(VariantSetQueryParams queryParams) throws ApiException {
-        ApiResponse<VariantSetsListResponse> resp = variantsetsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Gets a filtered list of &#x60;VariantSets&#x60;.
-     *
-     * @return ApiResponse&lt;VariantSetsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VariantSetsListResponse> variantsetsGetWithHttpInfo(VariantSetQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = variantsetsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<VariantSetsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Gets a filtered list of &#x60;VariantSets&#x60;. (asynchronously)
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call variantsetsGetAsync(VariantSetQueryParams queryParams, final ApiCallback<VariantSetsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = variantsetsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VariantSetsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for variantsetsVariantSetDbIdCallsGet
-     *
-     * @param variantSetDbId          The ID of the &#x60;VariantSet&#x60; to be retrieved. (required)
-     * @param expandHomozygotes       Should homozygotes be expanded (true) or collapsed into a single occurrence (false) (optional)
-     * @param unknownString           The string to use as a representation for missing data (optional)
-     * @param sepPhased               The string to use as a separator for phased allele calls (optional)
-     * @param sepUnphased             The string to use as a separator for unphased allele calls (optional)
-     * @param pageToken               **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call variantsetsVariantSetDbIdCallsGetCall(String variantSetDbId, Boolean expandHomozygotes, String unknownString, String sepPhased, String sepUnphased, String pageToken, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/variantsets/{variantSetDbId}/calls"
-                .replaceAll("\\{" + "variantSetDbId" + "}", apiClient.escapeString(variantSetDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (expandHomozygotes != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("expandHomozygotes", expandHomozygotes));
-        if (unknownString != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("unknownString", unknownString));
-        if (sepPhased != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("sepPhased", sepPhased));
-        if (sepUnphased != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("sepUnphased", sepUnphased));
-        if (pageToken != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageToken", pageToken));
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call variantsetsVariantSetDbIdCallsGetValidateBeforeCall(String variantSetDbId, Boolean expandHomozygotes, String unknownString, String sepPhased, String sepUnphased, String pageToken, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'variantSetDbId' is set
-        if (variantSetDbId == null) {
-            throw new ApiException("Missing the required parameter 'variantSetDbId' when calling variantsetsVariantSetDbIdCallsGet(Async)");
-        }
-
-        return variantsetsVariantSetDbIdCallsGetCall(variantSetDbId, expandHomozygotes, unknownString, sepPhased, sepUnphased, pageToken, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Gets a list of &#x60;Calls&#x60; associated with a &#x60;VariantSet&#x60;.
-     * Gets a list of &#x60;Calls&#x60; associated with a &#x60;VariantSet&#x60;.
-     *
-     * @param variantSetDbId    The ID of the &#x60;VariantSet&#x60; to be retrieved. (required)
-     * @param expandHomozygotes Should homozygotes be expanded (true) or collapsed into a single occurrence (false) (optional)
-     * @param unknownString     The string to use as a representation for missing data (optional)
-     * @param sepPhased         The string to use as a separator for phased allele calls (optional)
-     * @param sepUnphased       The string to use as a separator for unphased allele calls (optional)
-     * @param pageToken         **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return CallsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CallsListResponse variantsetsVariantSetDbIdCallsGet(String variantSetDbId, Boolean expandHomozygotes, String unknownString, String sepPhased, String sepUnphased, String pageToken, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<CallsListResponse> resp = variantsetsVariantSetDbIdCallsGetWithHttpInfo(variantSetDbId, expandHomozygotes, unknownString, sepPhased, sepUnphased, pageToken, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Gets a list of &#x60;Calls&#x60; associated with a &#x60;VariantSet&#x60;.
-     * Gets a list of &#x60;Calls&#x60; associated with a &#x60;VariantSet&#x60;.
-     *
-     * @param variantSetDbId    The ID of the &#x60;VariantSet&#x60; to be retrieved. (required)
-     * @param expandHomozygotes Should homozygotes be expanded (true) or collapsed into a single occurrence (false) (optional)
-     * @param unknownString     The string to use as a representation for missing data (optional)
-     * @param sepPhased         The string to use as a separator for phased allele calls (optional)
-     * @param sepUnphased       The string to use as a separator for unphased allele calls (optional)
-     * @param pageToken         **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;CallsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CallsListResponse> variantsetsVariantSetDbIdCallsGetWithHttpInfo(String variantSetDbId, Boolean expandHomozygotes, String unknownString, String sepPhased, String sepUnphased, String pageToken, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = variantsetsVariantSetDbIdCallsGetValidateBeforeCall(variantSetDbId, expandHomozygotes, unknownString, sepPhased, sepUnphased, pageToken, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<CallsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Gets a list of &#x60;Calls&#x60; associated with a &#x60;VariantSet&#x60;. (asynchronously)
-     * Gets a list of &#x60;Calls&#x60; associated with a &#x60;VariantSet&#x60;.
-     *
-     * @param variantSetDbId    The ID of the &#x60;VariantSet&#x60; to be retrieved. (required)
-     * @param expandHomozygotes Should homozygotes be expanded (true) or collapsed into a single occurrence (false) (optional)
-     * @param unknownString     The string to use as a representation for missing data (optional)
-     * @param sepPhased         The string to use as a separator for phased allele calls (optional)
-     * @param sepUnphased       The string to use as a separator for unphased allele calls (optional)
-     * @param pageToken         **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call variantsetsVariantSetDbIdCallsGetAsync(String variantSetDbId, Boolean expandHomozygotes, String unknownString, String sepPhased, String sepUnphased, String pageToken, Integer page, Integer pageSize, String authorization, final ApiCallback<CallsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = variantsetsVariantSetDbIdCallsGetValidateBeforeCall(variantSetDbId, expandHomozygotes, unknownString, sepPhased, sepUnphased, pageToken, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CallsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for variantsetsVariantSetDbIdCallsetsGet
-     *
-     * @param variantSetDbId          The ID of the &#x60;VariantSet&#x60; to be retrieved. (required)
-     * @param callSetDbId             The ID of the &#x60;CallSet&#x60; to be retrieved. (optional)
-     * @param callSetName             The human readable name of the &#x60;CallSet&#x60; to be retrieved. (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call variantsetsVariantSetDbIdCallsetsGetCall(String variantSetDbId, String callSetDbId, String callSetName, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/variantsets/{variantSetDbId}/callsets"
-                .replaceAll("\\{" + "variantSetDbId" + "}", apiClient.escapeString(variantSetDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (callSetDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("callSetDbId", callSetDbId));
-        if (callSetName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("callSetName", callSetName));
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call variantsetsVariantSetDbIdCallsetsGetValidateBeforeCall(String variantSetDbId, String callSetDbId, String callSetName, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'variantSetDbId' is set
-        if (variantSetDbId == null) {
-            throw new ApiException("Missing the required parameter 'variantSetDbId' when calling variantsetsVariantSetDbIdCallsetsGet(Async)");
-        }
-
-        return variantsetsVariantSetDbIdCallsetsGetCall(variantSetDbId, callSetDbId, callSetName, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Gets a list of &#x60;CallSets&#x60; associated with a &#x60;VariantSet&#x60;.
-     * Gets a list of &#x60;CallSets&#x60; associated with a &#x60;VariantSet&#x60;.
-     *
-     * @param variantSetDbId The ID of the &#x60;VariantSet&#x60; to be retrieved. (required)
-     * @param callSetDbId    The ID of the &#x60;CallSet&#x60; to be retrieved. (optional)
-     * @param callSetName    The human readable name of the &#x60;CallSet&#x60; to be retrieved. (optional)
-     * @param page           Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize       The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization  HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return CallSetsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CallSetsListResponse variantsetsVariantSetDbIdCallsetsGet(String variantSetDbId, String callSetDbId, String callSetName, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<CallSetsListResponse> resp = variantsetsVariantSetDbIdCallsetsGetWithHttpInfo(variantSetDbId, callSetDbId, callSetName, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Gets a list of &#x60;CallSets&#x60; associated with a &#x60;VariantSet&#x60;.
-     * Gets a list of &#x60;CallSets&#x60; associated with a &#x60;VariantSet&#x60;.
-     *
-     * @param variantSetDbId The ID of the &#x60;VariantSet&#x60; to be retrieved. (required)
-     * @param callSetDbId    The ID of the &#x60;CallSet&#x60; to be retrieved. (optional)
-     * @param callSetName    The human readable name of the &#x60;CallSet&#x60; to be retrieved. (optional)
-     * @param page           Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize       The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization  HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;CallSetsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CallSetsListResponse> variantsetsVariantSetDbIdCallsetsGetWithHttpInfo(String variantSetDbId, String callSetDbId, String callSetName, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = variantsetsVariantSetDbIdCallsetsGetValidateBeforeCall(variantSetDbId, callSetDbId, callSetName, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<CallSetsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Gets a list of &#x60;CallSets&#x60; associated with a &#x60;VariantSet&#x60;. (asynchronously)
-     * Gets a list of &#x60;CallSets&#x60; associated with a &#x60;VariantSet&#x60;.
-     *
-     * @param variantSetDbId The ID of the &#x60;VariantSet&#x60; to be retrieved. (required)
-     * @param callSetDbId    The ID of the &#x60;CallSet&#x60; to be retrieved. (optional)
-     * @param callSetName    The human readable name of the &#x60;CallSet&#x60; to be retrieved. (optional)
-     * @param page           Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize       The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization  HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback       The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call variantsetsVariantSetDbIdCallsetsGetAsync(String variantSetDbId, String callSetDbId, String callSetName, Integer page, Integer pageSize, String authorization, final ApiCallback<CallSetsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = variantsetsVariantSetDbIdCallsetsGetValidateBeforeCall(variantSetDbId, callSetDbId, callSetName, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CallSetsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for variantsetsVariantSetDbIdGet
-     *
-     * @param variantSetDbId          The ID of the &#x60;Variant&#x60; to be retrieved. (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call variantsetsVariantSetDbIdGetCall(String variantSetDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/variantsets/{variantSetDbId}"
-                .replaceAll("\\{" + "variantSetDbId" + "}", apiClient.escapeString(variantSetDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call variantsetsVariantSetDbIdGetValidateBeforeCall(String variantSetDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'variantSetDbId' is set
-        if (variantSetDbId == null) {
-            throw new ApiException("Missing the required parameter 'variantSetDbId' when calling variantsetsVariantSetDbIdGet(Async)");
-        }
-
-        return variantsetsVariantSetDbIdGetCall(variantSetDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Gets a &#x60;VariantSet&#x60; by ID.
-     * This call will return a JSON version of a &#x60;VariantSet&#x60;.
-     *
-     * @param variantSetDbId The ID of the &#x60;Variant&#x60; to be retrieved. (required)
-     * @param authorization  HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return VariantSetResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VariantSetResponse variantsetsVariantSetDbIdGet(String variantSetDbId, String authorization) throws ApiException {
-        ApiResponse<VariantSetResponse> resp = variantsetsVariantSetDbIdGetWithHttpInfo(variantSetDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Gets a &#x60;VariantSet&#x60; by ID.
-     * This call will return a JSON version of a &#x60;VariantSet&#x60;.
-     *
-     * @param variantSetDbId The ID of the &#x60;Variant&#x60; to be retrieved. (required)
-     * @param authorization  HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;VariantSetResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VariantSetResponse> variantsetsVariantSetDbIdGetWithHttpInfo(String variantSetDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = variantsetsVariantSetDbIdGetValidateBeforeCall(variantSetDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<VariantSetResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Gets a &#x60;VariantSet&#x60; by ID. (asynchronously)
-     * This call will return a JSON version of a &#x60;VariantSet&#x60;.
-     *
-     * @param variantSetDbId The ID of the &#x60;Variant&#x60; to be retrieved. (required)
-     * @param authorization  HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback       The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call variantsetsVariantSetDbIdGetAsync(String variantSetDbId, String authorization, final ApiCallback<VariantSetResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = variantsetsVariantSetDbIdGetValidateBeforeCall(variantSetDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VariantSetResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for variantsetsVariantSetDbIdVariantsGet
-     *
-     * @param variantSetDbId          The ID of the &#x60;VariantSet&#x60; to be retrieved. (required)
-     * @param variantDbId             The ID of the &#x60;Variant&#x60; to be retrieved. (optional)
-     * @param pageToken               **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call variantsetsVariantSetDbIdVariantsGetCall(String variantSetDbId, String variantDbId, String pageToken, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/variantsets/{variantSetDbId}/variants"
-                .replaceAll("\\{" + "variantSetDbId" + "}", apiClient.escapeString(variantSetDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (variantDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("variantDbId", variantDbId));
-        if (pageToken != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageToken", pageToken));
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call variantsetsVariantSetDbIdVariantsGetValidateBeforeCall(String variantSetDbId, String variantDbId, String pageToken, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'variantSetDbId' is set
-        if (variantSetDbId == null) {
-            throw new ApiException("Missing the required parameter 'variantSetDbId' when calling variantsetsVariantSetDbIdVariantsGet(Async)");
-        }
-
-        return variantsetsVariantSetDbIdVariantsGetCall(variantSetDbId, variantDbId, pageToken, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Gets a &#x60;Variants&#x60; for a given &#x60;VariantSet&#x60;.
-     * This call will return an array of &#x60;Variants&#x60;.
-     *
-     * @param variantSetDbId The ID of the &#x60;VariantSet&#x60; to be retrieved. (required)
-     * @param variantDbId    The ID of the &#x60;Variant&#x60; to be retrieved. (optional)
-     * @param pageToken      **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page           Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize       The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization  HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return VariantsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VariantsListResponse variantsetsVariantSetDbIdVariantsGet(String variantSetDbId, String variantDbId, String pageToken, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<VariantsListResponse> resp = variantsetsVariantSetDbIdVariantsGetWithHttpInfo(variantSetDbId, variantDbId, pageToken, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Gets a &#x60;Variants&#x60; for a given &#x60;VariantSet&#x60;.
-     * This call will return an array of &#x60;Variants&#x60;.
-     *
-     * @param variantSetDbId The ID of the &#x60;VariantSet&#x60; to be retrieved. (required)
-     * @param variantDbId    The ID of the &#x60;Variant&#x60; to be retrieved. (optional)
-     * @param pageToken      **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page           Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize       The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization  HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;VariantsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VariantsListResponse> variantsetsVariantSetDbIdVariantsGetWithHttpInfo(String variantSetDbId, String variantDbId, String pageToken, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = variantsetsVariantSetDbIdVariantsGetValidateBeforeCall(variantSetDbId, variantDbId, pageToken, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<VariantsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Gets a &#x60;Variants&#x60; for a given &#x60;VariantSet&#x60;. (asynchronously)
-     * This call will return an array of &#x60;Variants&#x60;.
-     *
-     * @param variantSetDbId The ID of the &#x60;VariantSet&#x60; to be retrieved. (required)
-     * @param variantDbId    The ID of the &#x60;Variant&#x60; to be retrieved. (optional)
-     * @param pageToken      **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page           Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize       The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization  HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback       The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call variantsetsVariantSetDbIdVariantsGetAsync(String variantSetDbId, String variantDbId, String pageToken, Integer page, Integer pageSize, String authorization, final ApiCallback<VariantsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = variantsetsVariantSetDbIdVariantsGetValidateBeforeCall(variantSetDbId, variantDbId, pageToken, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VariantsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/VariantsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/VariantsApi.java
deleted file mode 100644
index 1474a7b8..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/VariantsApi.java
+++ /dev/null
@@ -1,685 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.genotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.genotype.VariantQueryParams;
-import org.brapi.model.v21.genotype.CallsListResponse;
-import org.brapi.model.v21.genotype.VariantSingleResponse;
-import org.brapi.model.v21.genotype.VariantsListResponse;
-import org.brapi.model.v21.genotype.VariantsSearchRequest;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class VariantsApi {
-    private ApiClient apiClient;
-
-    public VariantsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public VariantsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for searchVariantsPost
-     *
-     * @param body                    Study Search request (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchVariantsPostCall(VariantsSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/variants";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchVariantsPostValidateBeforeCall(VariantsSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchVariantsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;Variants&#x60;
-     * Submit a search request for &#x60;Variants&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/variants/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details. &lt;br/&gt; &lt;br/&gt; &lt;strong&gt;NOTE:&lt;/strong&gt; This endpoint uses Token based pagination. Please Review the  &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Pagination\&quot;&gt;Pagination documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return VariantsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VariantsListResponse searchVariantsPost(VariantsSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<VariantsListResponse> resp = searchVariantsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;Variants&#x60;
-     * Submit a search request for &#x60;Variants&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/variants/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details. &lt;br/&gt; &lt;br/&gt; &lt;strong&gt;NOTE:&lt;/strong&gt; This endpoint uses Token based pagination. Please Review the  &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Pagination\&quot;&gt;Pagination documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;VariantsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VariantsListResponse> searchVariantsPostWithHttpInfo(VariantsSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchVariantsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<VariantsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;Variants&#x60; (asynchronously)
-     * Submit a search request for &#x60;Variants&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/variants/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details. &lt;br/&gt; &lt;br/&gt; &lt;strong&gt;NOTE:&lt;/strong&gt; This endpoint uses Token based pagination. Please Review the  &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Pagination\&quot;&gt;Pagination documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          Study Search request (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchVariantsPostAsync(VariantsSearchRequest body, String authorization, final ApiCallback<VariantsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchVariantsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VariantsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchVariantsSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param pageToken               **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchVariantsSearchResultsDbIdGetCall(String searchResultsDbId, String pageToken, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/variants/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (pageToken != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageToken", pageToken));
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchVariantsSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, String pageToken, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchVariantsSearchResultsDbIdGet(Async)");
-        }
-
-        return searchVariantsSearchResultsDbIdGetCall(searchResultsDbId, pageToken, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;Variants&#x60; search request
-     * Get the results of a &#x60;Variants&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/variants&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details. &lt;br/&gt;
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param pageToken         **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return VariantsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VariantsListResponse searchVariantsSearchResultsDbIdGet(String searchResultsDbId, String pageToken, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<VariantsListResponse> resp = searchVariantsSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, pageToken, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;Variants&#x60; search request
-     * Get the results of a &#x60;Variants&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/variants&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details. &lt;br/&gt;
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param pageToken         **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;VariantsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VariantsListResponse> searchVariantsSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, String pageToken, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchVariantsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, pageToken, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<VariantsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;Variants&#x60; search request (asynchronously)
-     * Get the results of a &#x60;Variants&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/variants&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details. &lt;br/&gt;
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param pageToken         **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchVariantsSearchResultsDbIdGetAsync(String searchResultsDbId, String pageToken, Integer page, Integer pageSize, String authorization, final ApiCallback<VariantsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchVariantsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, pageToken, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VariantsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for variantsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call variantsGetCall(VariantQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/variants";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call variantsGetValidateBeforeCall(VariantQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return variantsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Gets a filtered list of &#x60;Variants&#x60;.
-     *
-     * @return VariantsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VariantsListResponse variantsGet(VariantQueryParams queryParams) throws ApiException {
-        ApiResponse<VariantsListResponse> resp = variantsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Gets a filtered list of &#x60;Variants&#x60;.
-     *
-     * @return ApiResponse&lt;VariantsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VariantsListResponse> variantsGetWithHttpInfo(VariantQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = variantsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<VariantsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Gets a filtered list of &#x60;Variants&#x60;. (asynchronously)
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call variantsGetAsync(VariantQueryParams queryParams, final ApiCallback<VariantsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = variantsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VariantsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for variantsVariantDbIdCallsGet
-     *
-     * @param variantDbId             The ID which uniquely identifies a &#x60;Variant&#x60; (required)
-     * @param expandHomozygotes       Should homozygotes be expanded (true) or collapsed into a single occurrence (false) (optional)
-     * @param unknownString           The string to use as a representation for missing data (optional)
-     * @param sepPhased               The string to use as a separator for phased allele calls (optional)
-     * @param sepUnphased             The string to use as a separator for unphased allele calls (optional)
-     * @param pageToken               **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call variantsVariantDbIdCallsGetCall(String variantDbId, Boolean expandHomozygotes, String unknownString, String sepPhased, String sepUnphased, String pageToken, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/variants/{variantDbId}/calls"
-                .replaceAll("\\{" + "variantDbId" + "}", apiClient.escapeString(variantDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (expandHomozygotes != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("expandHomozygotes", expandHomozygotes));
-        if (unknownString != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("unknownString", unknownString));
-        if (sepPhased != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("sepPhased", sepPhased));
-        if (sepUnphased != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("sepUnphased", sepUnphased));
-        if (pageToken != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageToken", pageToken));
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call variantsVariantDbIdCallsGetValidateBeforeCall(String variantDbId, Boolean expandHomozygotes, String unknownString, String sepPhased, String sepUnphased, String pageToken, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'variantDbId' is set
-        if (variantDbId == null) {
-            throw new ApiException("Missing the required parameter 'variantDbId' when calling variantsVariantDbIdCallsGet(Async)");
-        }
-
-        return variantsVariantDbIdCallsGetCall(variantDbId, expandHomozygotes, unknownString, sepPhased, sepUnphased, pageToken, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Gets a list of &#x60;Calls&#x60; associated with a &#x60;Variant&#x60;.
-     * The variant calls for this particular variant. Each one represents the determination of genotype with respect to this variant. &#x60;Calls&#x60; in this array are implicitly associated with this &#x60;Variant&#x60;.
-     *
-     * @param variantDbId       The ID which uniquely identifies a &#x60;Variant&#x60; (required)
-     * @param expandHomozygotes Should homozygotes be expanded (true) or collapsed into a single occurrence (false) (optional)
-     * @param unknownString     The string to use as a representation for missing data (optional)
-     * @param sepPhased         The string to use as a separator for phased allele calls (optional)
-     * @param sepUnphased       The string to use as a separator for unphased allele calls (optional)
-     * @param pageToken         **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return CallsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CallsListResponse variantsVariantDbIdCallsGet(String variantDbId, Boolean expandHomozygotes, String unknownString, String sepPhased, String sepUnphased, String pageToken, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<CallsListResponse> resp = variantsVariantDbIdCallsGetWithHttpInfo(variantDbId, expandHomozygotes, unknownString, sepPhased, sepUnphased, pageToken, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Gets a list of &#x60;Calls&#x60; associated with a &#x60;Variant&#x60;.
-     * The variant calls for this particular variant. Each one represents the determination of genotype with respect to this variant. &#x60;Calls&#x60; in this array are implicitly associated with this &#x60;Variant&#x60;.
-     *
-     * @param variantDbId       The ID which uniquely identifies a &#x60;Variant&#x60; (required)
-     * @param expandHomozygotes Should homozygotes be expanded (true) or collapsed into a single occurrence (false) (optional)
-     * @param unknownString     The string to use as a representation for missing data (optional)
-     * @param sepPhased         The string to use as a separator for phased allele calls (optional)
-     * @param sepUnphased       The string to use as a separator for unphased allele calls (optional)
-     * @param pageToken         **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;CallsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CallsListResponse> variantsVariantDbIdCallsGetWithHttpInfo(String variantDbId, Boolean expandHomozygotes, String unknownString, String sepPhased, String sepUnphased, String pageToken, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = variantsVariantDbIdCallsGetValidateBeforeCall(variantDbId, expandHomozygotes, unknownString, sepPhased, sepUnphased, pageToken, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<CallsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Gets a list of &#x60;Calls&#x60; associated with a &#x60;Variant&#x60;. (asynchronously)
-     * The variant calls for this particular variant. Each one represents the determination of genotype with respect to this variant. &#x60;Calls&#x60; in this array are implicitly associated with this &#x60;Variant&#x60;.
-     *
-     * @param variantDbId       The ID which uniquely identifies a &#x60;Variant&#x60; (required)
-     * @param expandHomozygotes Should homozygotes be expanded (true) or collapsed into a single occurrence (false) (optional)
-     * @param unknownString     The string to use as a representation for missing data (optional)
-     * @param sepPhased         The string to use as a separator for phased allele calls (optional)
-     * @param sepUnphased       The string to use as a separator for unphased allele calls (optional)
-     * @param pageToken         **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt; Used to request a specific page of data to be returned. &lt;br&gt; Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.  (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call variantsVariantDbIdCallsGetAsync(String variantDbId, Boolean expandHomozygotes, String unknownString, String sepPhased, String sepUnphased, String pageToken, Integer page, Integer pageSize, String authorization, final ApiCallback<CallsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = variantsVariantDbIdCallsGetValidateBeforeCall(variantDbId, expandHomozygotes, unknownString, sepPhased, sepUnphased, pageToken, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CallsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for variantsVariantDbIdGet
-     *
-     * @param variantDbId             The ID which uniquely identifies a &#x60;Variant&#x60; (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call variantsVariantDbIdGetCall(String variantDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/variants/{variantDbId}"
-                .replaceAll("\\{" + "variantDbId" + "}", apiClient.escapeString(variantDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call variantsVariantDbIdGetValidateBeforeCall(String variantDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'variantDbId' is set
-        if (variantDbId == null) {
-            throw new ApiException("Missing the required parameter 'variantDbId' when calling variantsVariantDbIdGet(Async)");
-        }
-
-        return variantsVariantDbIdGetCall(variantDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Gets a &#x60;Variant&#x60; by ID.
-     * The endpoint &#x60;GET /variants/{id}&#x60; will return a JSON version of &#x60;Variant&#x60;.
-     *
-     * @param variantDbId   The ID which uniquely identifies a &#x60;Variant&#x60; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return VariantSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VariantSingleResponse variantsVariantDbIdGet(String variantDbId, String authorization) throws ApiException {
-        ApiResponse<VariantSingleResponse> resp = variantsVariantDbIdGetWithHttpInfo(variantDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Gets a &#x60;Variant&#x60; by ID.
-     * The endpoint &#x60;GET /variants/{id}&#x60; will return a JSON version of &#x60;Variant&#x60;.
-     *
-     * @param variantDbId   The ID which uniquely identifies a &#x60;Variant&#x60; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;VariantSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VariantSingleResponse> variantsVariantDbIdGetWithHttpInfo(String variantDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = variantsVariantDbIdGetValidateBeforeCall(variantDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<VariantSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Gets a &#x60;Variant&#x60; by ID. (asynchronously)
-     * The endpoint &#x60;GET /variants/{id}&#x60; will return a JSON version of &#x60;Variant&#x60;.
-     *
-     * @param variantDbId   The ID which uniquely identifies a &#x60;Variant&#x60; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call variantsVariantDbIdGetAsync(String variantDbId, String authorization, final ApiCallback<VariantSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = variantsVariantDbIdGetValidateBeforeCall(variantDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VariantSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/VendorApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/VendorApi.java
deleted file mode 100644
index b30b0fff..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/genotype/VendorApi.java
+++ /dev/null
@@ -1,991 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.genotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.core.VendorQueryParams;
-import org.brapi.model.v21.genotype.*;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class VendorApi {
-    private ApiClient apiClient;
-
-    public VendorApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public VendorApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for vendorOrdersGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call vendorOrdersGetCall(VendorQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/vendor/orders";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call vendorOrdersGetValidateBeforeCall(VendorQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return vendorOrdersGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * List current available orders
-     *
-     * @return VendorOrderListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VendorOrderListResponse vendorOrdersGet(VendorQueryParams queryParams) throws ApiException {
-        ApiResponse<VendorOrderListResponse> resp = vendorOrdersGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * List current available orders
-     *
-     * @return ApiResponse&lt;VendorOrderListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VendorOrderListResponse> vendorOrdersGetWithHttpInfo(VendorQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = vendorOrdersGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<VendorOrderListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * List current available orders (asynchronously)
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call vendorOrdersGetAsync(VendorQueryParams queryParams, final ApiCallback<VendorOrderListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = vendorOrdersGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VendorOrderListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for vendorOrdersOrderIdPlatesGet
-     *
-     * @param orderId                 The order id returned by the vendor when the order was successfully submitted. (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call vendorOrdersOrderIdPlatesGetCall(String orderId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/vendor/orders/{orderId}/plates"
-                .replaceAll("\\{" + "orderId" + "}", apiClient.escapeString(orderId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call vendorOrdersOrderIdPlatesGetValidateBeforeCall(String orderId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'orderId' is set
-        if (orderId == null) {
-            throw new ApiException("Missing the required parameter 'orderId' when calling vendorOrdersOrderIdPlatesGet(Async)");
-        }
-
-        return vendorOrdersOrderIdPlatesGetCall(orderId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Plates for a specific Order
-     * Retrieve the plate and sample details of an order being processed
-     *
-     * @param orderId       The order id returned by the vendor when the order was successfully submitted. (required)
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return VendorPlateListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VendorPlateListResponse vendorOrdersOrderIdPlatesGet(String orderId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<VendorPlateListResponse> resp = vendorOrdersOrderIdPlatesGetWithHttpInfo(orderId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Plates for a specific Order
-     * Retrieve the plate and sample details of an order being processed
-     *
-     * @param orderId       The order id returned by the vendor when the order was successfully submitted. (required)
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;VendorPlateListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VendorPlateListResponse> vendorOrdersOrderIdPlatesGetWithHttpInfo(String orderId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = vendorOrdersOrderIdPlatesGetValidateBeforeCall(orderId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<VendorPlateListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Plates for a specific Order (asynchronously)
-     * Retrieve the plate and sample details of an order being processed
-     *
-     * @param orderId       The order id returned by the vendor when the order was successfully submitted. (required)
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call vendorOrdersOrderIdPlatesGetAsync(String orderId, Integer page, Integer pageSize, String authorization, final ApiCallback<VendorPlateListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = vendorOrdersOrderIdPlatesGetValidateBeforeCall(orderId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VendorPlateListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for vendorOrdersOrderIdResultsGet
-     *
-     * @param orderId                 The order id returned by the vendor when the order was successfully submitted. (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call vendorOrdersOrderIdResultsGetCall(String orderId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/vendor/orders/{orderId}/results"
-                .replaceAll("\\{" + "orderId" + "}", apiClient.escapeString(orderId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call vendorOrdersOrderIdResultsGetValidateBeforeCall(String orderId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'orderId' is set
-        if (orderId == null) {
-            throw new ApiException("Missing the required parameter 'orderId' when calling vendorOrdersOrderIdResultsGet(Async)");
-        }
-
-        return vendorOrdersOrderIdResultsGetCall(orderId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a specific Order
-     * Retrieve the data files generated by the vendors analysis
-     *
-     * @param orderId       The order id returned by the vendor when the order was successfully submitted. (required)
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return VendorResultFileListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VendorResultFileListResponse vendorOrdersOrderIdResultsGet(String orderId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<VendorResultFileListResponse> resp = vendorOrdersOrderIdResultsGetWithHttpInfo(orderId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a specific Order
-     * Retrieve the data files generated by the vendors analysis
-     *
-     * @param orderId       The order id returned by the vendor when the order was successfully submitted. (required)
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;VendorResultFileListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VendorResultFileListResponse> vendorOrdersOrderIdResultsGetWithHttpInfo(String orderId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = vendorOrdersOrderIdResultsGetValidateBeforeCall(orderId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<VendorResultFileListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a specific Order (asynchronously)
-     * Retrieve the data files generated by the vendors analysis
-     *
-     * @param orderId       The order id returned by the vendor when the order was successfully submitted. (required)
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call vendorOrdersOrderIdResultsGetAsync(String orderId, Integer page, Integer pageSize, String authorization, final ApiCallback<VendorResultFileListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = vendorOrdersOrderIdResultsGetValidateBeforeCall(orderId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VendorResultFileListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for vendorOrdersOrderIdStatusGet
-     *
-     * @param orderId                 The order id returned by the vendor when the order was successfully submitted. (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call vendorOrdersOrderIdStatusGetCall(String orderId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/vendor/orders/{orderId}/status"
-                .replaceAll("\\{" + "orderId" + "}", apiClient.escapeString(orderId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call vendorOrdersOrderIdStatusGetValidateBeforeCall(String orderId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'orderId' is set
-        if (orderId == null) {
-            throw new ApiException("Missing the required parameter 'orderId' when calling vendorOrdersOrderIdStatusGet(Async)");
-        }
-
-        return vendorOrdersOrderIdStatusGetCall(orderId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the status of a specific Order
-     * Retrieve the current status of an order being processed
-     *
-     * @param orderId       The order id returned by the vendor when the order was successfully submitted. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return VendorOrderStatusResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VendorOrderStatusResponse vendorOrdersOrderIdStatusGet(String orderId, String authorization) throws ApiException {
-        ApiResponse<VendorOrderStatusResponse> resp = vendorOrdersOrderIdStatusGetWithHttpInfo(orderId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the status of a specific Order
-     * Retrieve the current status of an order being processed
-     *
-     * @param orderId       The order id returned by the vendor when the order was successfully submitted. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;VendorOrderStatusResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VendorOrderStatusResponse> vendorOrdersOrderIdStatusGetWithHttpInfo(String orderId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = vendorOrdersOrderIdStatusGetValidateBeforeCall(orderId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<VendorOrderStatusResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the status of a specific Order (asynchronously)
-     * Retrieve the current status of an order being processed
-     *
-     * @param orderId       The order id returned by the vendor when the order was successfully submitted. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call vendorOrdersOrderIdStatusGetAsync(String orderId, String authorization, final ApiCallback<VendorOrderStatusResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = vendorOrdersOrderIdStatusGetValidateBeforeCall(orderId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VendorOrderStatusResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for vendorOrdersPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call vendorOrdersPostCall(VendorOrderSubmissionRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/vendor/orders";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call vendorOrdersPostValidateBeforeCall(VendorOrderSubmissionRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return vendorOrdersPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit New Order
-     * Submit a new order to a vendor
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return VendorOrderSubmissionSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VendorOrderSubmissionSingleResponse vendorOrdersPost(VendorOrderSubmissionRequest body, String authorization) throws ApiException {
-        ApiResponse<VendorOrderSubmissionSingleResponse> resp = vendorOrdersPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit New Order
-     * Submit a new order to a vendor
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;VendorOrderSubmissionSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VendorOrderSubmissionSingleResponse> vendorOrdersPostWithHttpInfo(VendorOrderSubmissionRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = vendorOrdersPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<VendorOrderSubmissionSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit New Order (asynchronously)
-     * Submit a new order to a vendor
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call vendorOrdersPostAsync(VendorOrderSubmissionRequest body, String authorization, final ApiCallback<VendorOrderSubmissionSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = vendorOrdersPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VendorOrderSubmissionSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for vendorPlatesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call vendorPlatesPostCall(VendorPlateSubmissionRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/vendor/plates";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call vendorPlatesPostValidateBeforeCall(VendorPlateSubmissionRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return vendorPlatesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a new set of Sample data
-     * Submit a new set of Sample data
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return VendorPlateSubmissionIdSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VendorPlateSubmissionIdSingleResponse vendorPlatesPost(VendorPlateSubmissionRequest body, String authorization) throws ApiException {
-        ApiResponse<VendorPlateSubmissionIdSingleResponse> resp = vendorPlatesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a new set of Sample data
-     * Submit a new set of Sample data
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;VendorPlateSubmissionIdSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VendorPlateSubmissionIdSingleResponse> vendorPlatesPostWithHttpInfo(VendorPlateSubmissionRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = vendorPlatesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<VendorPlateSubmissionIdSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a new set of Sample data (asynchronously)
-     * Submit a new set of Sample data
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call vendorPlatesPostAsync(VendorPlateSubmissionRequest body, String authorization, final ApiCallback<VendorPlateSubmissionIdSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = vendorPlatesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VendorPlateSubmissionIdSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for vendorPlatesSubmissionIdGet
-     *
-     * @param submissionId            The submission id returned by the vendor when a set of plates was successfully submitted. From response of \&quot;POST /vendor/plates\&quot; (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call vendorPlatesSubmissionIdGetCall(String submissionId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/vendor/plates/{submissionId}"
-                .replaceAll("\\{" + "submissionId" + "}", apiClient.escapeString(submissionId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call vendorPlatesSubmissionIdGetValidateBeforeCall(String submissionId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'submissionId' is set
-        if (submissionId == null) {
-            throw new ApiException("Missing the required parameter 'submissionId' when calling vendorPlatesSubmissionIdGet(Async)");
-        }
-
-        return vendorPlatesSubmissionIdGetCall(submissionId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the data for a submitted set of plates
-     * Get data for a submitted set of plates
-     *
-     * @param submissionId  The submission id returned by the vendor when a set of plates was successfully submitted. From response of \&quot;POST /vendor/plates\&quot; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return VendorPlateSubmissionSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VendorPlateSubmissionSingleResponse vendorPlatesSubmissionIdGet(String submissionId, String authorization) throws ApiException {
-        ApiResponse<VendorPlateSubmissionSingleResponse> resp = vendorPlatesSubmissionIdGetWithHttpInfo(submissionId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the data for a submitted set of plates
-     * Get data for a submitted set of plates
-     *
-     * @param submissionId  The submission id returned by the vendor when a set of plates was successfully submitted. From response of \&quot;POST /vendor/plates\&quot; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;VendorPlateSubmissionSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VendorPlateSubmissionSingleResponse> vendorPlatesSubmissionIdGetWithHttpInfo(String submissionId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = vendorPlatesSubmissionIdGetValidateBeforeCall(submissionId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<VendorPlateSubmissionSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the data for a submitted set of plates (asynchronously)
-     * Get data for a submitted set of plates
-     *
-     * @param submissionId  The submission id returned by the vendor when a set of plates was successfully submitted. From response of \&quot;POST /vendor/plates\&quot; (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call vendorPlatesSubmissionIdGetAsync(String submissionId, String authorization, final ApiCallback<VendorPlateSubmissionSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = vendorPlatesSubmissionIdGetValidateBeforeCall(submissionId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VendorPlateSubmissionSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for vendorSpecificationsGet
-     *
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call vendorSpecificationsGetCall(String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/vendor/specifications";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call vendorSpecificationsGetValidateBeforeCall(String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return vendorSpecificationsGetCall(authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Vendor Specifications
-     * Defines the plate format specification for the vendor.
-     *
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return VendorSpecificationSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public VendorSpecificationSingleResponse vendorSpecificationsGet(String authorization) throws ApiException {
-        ApiResponse<VendorSpecificationSingleResponse> resp = vendorSpecificationsGetWithHttpInfo(authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Vendor Specifications
-     * Defines the plate format specification for the vendor.
-     *
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;VendorSpecificationSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<VendorSpecificationSingleResponse> vendorSpecificationsGetWithHttpInfo(String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = vendorSpecificationsGetValidateBeforeCall(authorization, null, null);
-        Type localVarReturnType = new TypeToken<VendorSpecificationSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Vendor Specifications (asynchronously)
-     * Defines the plate format specification for the vendor.
-     *
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call vendorSpecificationsGetAsync(String authorization, final ApiCallback<VendorSpecificationSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = vendorSpecificationsGetValidateBeforeCall(authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<VendorSpecificationSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/CrossesApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/CrossesApi.java
deleted file mode 100644
index 38ee74c4..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/CrossesApi.java
+++ /dev/null
@@ -1,791 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.germplasm;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.germplasm.CrossQueryParams;
-import org.brapi.model.v21.germplasm.CrossNewRequest;
-import org.brapi.model.v21.germplasm.CrossesListResponse;
-import org.brapi.model.v21.germplasm.PlannedCrossNewRequest;
-import org.brapi.model.v21.germplasm.PlannedCrossesListResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class CrossesApi {
-    private ApiClient apiClient;
-
-    public CrossesApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public CrossesApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for crossesGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call crossesGetCall(CrossQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/crosses";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call crossesGetValidateBeforeCall(CrossQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return crossesGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a filtered list of Cross entities
-     *
-     * @return CrossesListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CrossesListResponse crossesGet(CrossQueryParams queryParams) throws ApiException {
-        ApiResponse<CrossesListResponse> resp = crossesGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get a filtered list of Cross entities
-     *
-     * @return ApiResponse&lt;CrossesListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CrossesListResponse> crossesGetWithHttpInfo(CrossQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = crossesGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<CrossesListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a filtered list of Cross entities (asynchronously)
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call crossesGetAsync(CrossQueryParams queryParams, final ApiCallback<CrossesListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = crossesGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CrossesListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for crossesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call crossesPostCall(List<CrossNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/crosses";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call crossesPostValidateBeforeCall(List<CrossNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return crossesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Create new Cross entities on this server
-     * Create new Cross entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return CrossesListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CrossesListResponse crossesPost(List<CrossNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<CrossesListResponse> resp = crossesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Create new Cross entities on this server
-     * Create new Cross entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;CrossesListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CrossesListResponse> crossesPostWithHttpInfo(List<CrossNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = crossesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<CrossesListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Create new Cross entities on this server (asynchronously)
-     * Create new Cross entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call crossesPostAsync(List<CrossNewRequest> body, String authorization, final ApiCallback<CrossesListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = crossesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CrossesListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for crossesPut
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call crossesPutCall(Map<String, CrossNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/crosses";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call crossesPutValidateBeforeCall(Map<String, CrossNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return crossesPutCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update existing Cross entities on this server
-     * Update existing Cross entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return CrossesListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CrossesListResponse crossesPut(Map<String, CrossNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<CrossesListResponse> resp = crossesPutWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update existing Cross entities on this server
-     * Update existing Cross entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;CrossesListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CrossesListResponse> crossesPutWithHttpInfo(Map<String, CrossNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = crossesPutValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<CrossesListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update existing Cross entities on this server (asynchronously)
-     * Update existing Cross entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call crossesPutAsync(Map<String, CrossNewRequest> body, String authorization, final ApiCallback<CrossesListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = crossesPutValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CrossesListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for plannedcrossesGet
-     *
-     * @param crossingProjectDbId     Search for Crossing Projects with this unique id (optional)
-     * @param crossingProjectName     The human readable name for a crossing project (optional)
-     * @param plannedCrossDbId        Search for Planned Cross with this unique id (optional)
-     * @param plannedCrossName        Search for Planned Cross with this human readable name (optional)
-     * @param status                  The status of this planned cross. Is it waiting to be performed (&#x27;TODO&#x27;), has it been completed successfully (&#x27;DONE&#x27;), or has it not been done on purpose (&#x27;SKIPPED&#x27;). (optional)
-     * @param commonCropName          The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crop.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server. (optional)
-     * @param programDbId             Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param externalReferenceID     **Deprecated in v2.1** Please use &#x60;externalReferenceId&#x60;. Github issue number #460  &lt;br&gt;An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
-     * @param externalReferenceId     An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
-     * @param externalReferenceSource An identifier for the source system or database of an external reference (use with &#x60;externalReferenceId&#x60; parameter) (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call plannedcrossesGetCall(String crossingProjectDbId, String crossingProjectName, String plannedCrossDbId, String plannedCrossName, String status, String commonCropName, String programDbId, String externalReferenceID, String externalReferenceId, String externalReferenceSource, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/plannedcrosses";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (crossingProjectDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("crossingProjectDbId", crossingProjectDbId));
-        if (crossingProjectName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("crossingProjectName", crossingProjectName));
-        if (plannedCrossDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("plannedCrossDbId", plannedCrossDbId));
-        if (plannedCrossName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("plannedCrossName", plannedCrossName));
-        if (status != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("status", status));
-        if (commonCropName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-        if (externalReferenceID != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceID", externalReferenceID));
-        if (externalReferenceId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceId", externalReferenceId));
-        if (externalReferenceSource != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceSource", externalReferenceSource));
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call plannedcrossesGetValidateBeforeCall(String crossingProjectDbId, String crossingProjectName, String plannedCrossDbId, String plannedCrossName, String status, String commonCropName, String programDbId, String externalReferenceID, String externalReferenceId, String externalReferenceSource, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return plannedcrossesGetCall(crossingProjectDbId, crossingProjectName, plannedCrossDbId, plannedCrossName, status, commonCropName, programDbId, externalReferenceID, externalReferenceId, externalReferenceSource, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a filtered list of Planned Cross entities
-     * Get a filtered list of Planned Cross entities.
-     *
-     * @param crossingProjectDbId     Search for Crossing Projects with this unique id (optional)
-     * @param crossingProjectName     The human readable name for a crossing project (optional)
-     * @param plannedCrossDbId        Search for Planned Cross with this unique id (optional)
-     * @param plannedCrossName        Search for Planned Cross with this human readable name (optional)
-     * @param status                  The status of this planned cross. Is it waiting to be performed (&#x27;TODO&#x27;), has it been completed successfully (&#x27;DONE&#x27;), or has it not been done on purpose (&#x27;SKIPPED&#x27;). (optional)
-     * @param commonCropName          The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crop.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server. (optional)
-     * @param programDbId             Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param externalReferenceID     **Deprecated in v2.1** Please use &#x60;externalReferenceId&#x60;. Github issue number #460  &lt;br&gt;An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
-     * @param externalReferenceId     An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
-     * @param externalReferenceSource An identifier for the source system or database of an external reference (use with &#x60;externalReferenceId&#x60; parameter) (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PlannedCrossesListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PlannedCrossesListResponse plannedcrossesGet(String crossingProjectDbId, String crossingProjectName, String plannedCrossDbId, String plannedCrossName, String status, String commonCropName, String programDbId, String externalReferenceID, String externalReferenceId, String externalReferenceSource, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<PlannedCrossesListResponse> resp = plannedcrossesGetWithHttpInfo(crossingProjectDbId, crossingProjectName, plannedCrossDbId, plannedCrossName, status, commonCropName, programDbId, externalReferenceID, externalReferenceId, externalReferenceSource, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get a filtered list of Planned Cross entities
-     * Get a filtered list of Planned Cross entities.
-     *
-     * @param crossingProjectDbId     Search for Crossing Projects with this unique id (optional)
-     * @param crossingProjectName     The human readable name for a crossing project (optional)
-     * @param plannedCrossDbId        Search for Planned Cross with this unique id (optional)
-     * @param plannedCrossName        Search for Planned Cross with this human readable name (optional)
-     * @param status                  The status of this planned cross. Is it waiting to be performed (&#x27;TODO&#x27;), has it been completed successfully (&#x27;DONE&#x27;), or has it not been done on purpose (&#x27;SKIPPED&#x27;). (optional)
-     * @param commonCropName          The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crop.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server. (optional)
-     * @param programDbId             Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param externalReferenceID     **Deprecated in v2.1** Please use &#x60;externalReferenceId&#x60;. Github issue number #460  &lt;br&gt;An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
-     * @param externalReferenceId     An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
-     * @param externalReferenceSource An identifier for the source system or database of an external reference (use with &#x60;externalReferenceId&#x60; parameter) (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PlannedCrossesListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PlannedCrossesListResponse> plannedcrossesGetWithHttpInfo(String crossingProjectDbId, String crossingProjectName, String plannedCrossDbId, String plannedCrossName, String status, String commonCropName, String programDbId, String externalReferenceID, String externalReferenceId, String externalReferenceSource, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = plannedcrossesGetValidateBeforeCall(crossingProjectDbId, crossingProjectName, plannedCrossDbId, plannedCrossName, status, commonCropName, programDbId, externalReferenceID, externalReferenceId, externalReferenceSource, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PlannedCrossesListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a filtered list of Planned Cross entities (asynchronously)
-     * Get a filtered list of Planned Cross entities.
-     *
-     * @param crossingProjectDbId     Search for Crossing Projects with this unique id (optional)
-     * @param crossingProjectName     The human readable name for a crossing project (optional)
-     * @param plannedCrossDbId        Search for Planned Cross with this unique id (optional)
-     * @param plannedCrossName        Search for Planned Cross with this human readable name (optional)
-     * @param status                  The status of this planned cross. Is it waiting to be performed (&#x27;TODO&#x27;), has it been completed successfully (&#x27;DONE&#x27;), or has it not been done on purpose (&#x27;SKIPPED&#x27;). (optional)
-     * @param commonCropName          The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crop.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server. (optional)
-     * @param programDbId             Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param externalReferenceID     **Deprecated in v2.1** Please use &#x60;externalReferenceId&#x60;. Github issue number #460  &lt;br&gt;An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
-     * @param externalReferenceId     An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
-     * @param externalReferenceSource An identifier for the source system or database of an external reference (use with &#x60;externalReferenceId&#x60; parameter) (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback                The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call plannedcrossesGetAsync(String crossingProjectDbId, String crossingProjectName, String plannedCrossDbId, String plannedCrossName, String status, String commonCropName, String programDbId, String externalReferenceID, String externalReferenceId, String externalReferenceSource, Integer page, Integer pageSize, String authorization, final ApiCallback<PlannedCrossesListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = plannedcrossesGetValidateBeforeCall(crossingProjectDbId, crossingProjectName, plannedCrossDbId, plannedCrossName, status, commonCropName, programDbId, externalReferenceID, externalReferenceId, externalReferenceSource, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PlannedCrossesListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for plannedcrossesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call plannedcrossesPostCall(List<PlannedCrossNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/plannedcrosses";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call plannedcrossesPostValidateBeforeCall(List<PlannedCrossNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return plannedcrossesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Create new Planned Cross entities on this server
-     * Create new Planned Cross entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PlannedCrossesListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PlannedCrossesListResponse plannedcrossesPost(List<PlannedCrossNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<PlannedCrossesListResponse> resp = plannedcrossesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Create new Planned Cross entities on this server
-     * Create new Planned Cross entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PlannedCrossesListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PlannedCrossesListResponse> plannedcrossesPostWithHttpInfo(List<PlannedCrossNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = plannedcrossesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PlannedCrossesListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Create new Planned Cross entities on this server (asynchronously)
-     * Create new Planned Cross entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call plannedcrossesPostAsync(List<PlannedCrossNewRequest> body, String authorization, final ApiCallback<PlannedCrossesListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = plannedcrossesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PlannedCrossesListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for plannedcrossesPut
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call plannedcrossesPutCall(Map<String, PlannedCrossNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/plannedcrosses";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call plannedcrossesPutValidateBeforeCall(Map<String, PlannedCrossNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return plannedcrossesPutCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update existing Planned Cross entities on this server
-     * Update existing Planned Cross entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PlannedCrossesListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PlannedCrossesListResponse plannedcrossesPut(Map<String, PlannedCrossNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<PlannedCrossesListResponse> resp = plannedcrossesPutWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update existing Planned Cross entities on this server
-     * Update existing Planned Cross entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PlannedCrossesListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PlannedCrossesListResponse> plannedcrossesPutWithHttpInfo(Map<String, PlannedCrossNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = plannedcrossesPutValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PlannedCrossesListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update existing Planned Cross entities on this server (asynchronously)
-     * Update existing Planned Cross entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call plannedcrossesPutAsync(Map<String, PlannedCrossNewRequest> body, String authorization, final ApiCallback<PlannedCrossesListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = plannedcrossesPutValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PlannedCrossesListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/CrossingProjectsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/CrossingProjectsApi.java
deleted file mode 100644
index 8949434c..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/CrossingProjectsApi.java
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.germplasm;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.germplasm.CrossingProjectQueryParams;
-import org.brapi.model.v21.germplasm.CrossingProjectNewRequest;
-import org.brapi.model.v21.germplasm.CrossingProjectsListResponse;
-import org.brapi.model.v21.germplasm.CrossingProjectsSingleResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class CrossingProjectsApi {
-    private ApiClient apiClient;
-
-    public CrossingProjectsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public CrossingProjectsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for crossingprojectsCrossingProjectDbIdGet
-     *
-     * @param crossingProjectDbId     The unique identifier for a crossing project (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call crossingprojectsCrossingProjectDbIdGetCall(String crossingProjectDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/crossingprojects/{crossingProjectDbId}"
-                .replaceAll("\\{" + "crossingProjectDbId" + "}", apiClient.escapeString(crossingProjectDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call crossingprojectsCrossingProjectDbIdGetValidateBeforeCall(String crossingProjectDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'crossingProjectDbId' is set
-        if (crossingProjectDbId == null) {
-            throw new ApiException("Missing the required parameter 'crossingProjectDbId' when calling crossingprojectsCrossingProjectDbIdGet(Async)");
-        }
-
-        return crossingprojectsCrossingProjectDbIdGetCall(crossingProjectDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a filtered list of Crossing Projects
-     * Get a filtered list of Crossing Projects.
-     *
-     * @param crossingProjectDbId The unique identifier for a crossing project (required)
-     * @param authorization       HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return CrossingProjectsSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CrossingProjectsSingleResponse crossingprojectsCrossingProjectDbIdGet(String crossingProjectDbId, String authorization) throws ApiException {
-        ApiResponse<CrossingProjectsSingleResponse> resp = crossingprojectsCrossingProjectDbIdGetWithHttpInfo(crossingProjectDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get a filtered list of Crossing Projects
-     * Get a filtered list of Crossing Projects.
-     *
-     * @param crossingProjectDbId The unique identifier for a crossing project (required)
-     * @param authorization       HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;CrossingProjectsSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CrossingProjectsSingleResponse> crossingprojectsCrossingProjectDbIdGetWithHttpInfo(String crossingProjectDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = crossingprojectsCrossingProjectDbIdGetValidateBeforeCall(crossingProjectDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<CrossingProjectsSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a filtered list of Crossing Projects (asynchronously)
-     * Get a filtered list of Crossing Projects.
-     *
-     * @param crossingProjectDbId The unique identifier for a crossing project (required)
-     * @param authorization       HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback            The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call crossingprojectsCrossingProjectDbIdGetAsync(String crossingProjectDbId, String authorization, final ApiCallback<CrossingProjectsSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = crossingprojectsCrossingProjectDbIdGetValidateBeforeCall(crossingProjectDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CrossingProjectsSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for crossingprojectsCrossingProjectDbIdPut
-     *
-     * @param crossingProjectDbId     Search for Crossing Projects with this unique id (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call crossingprojectsCrossingProjectDbIdPutCall(String crossingProjectDbId, CrossingProjectNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/crossingprojects/{crossingProjectDbId}"
-                .replaceAll("\\{" + "crossingProjectDbId" + "}", apiClient.escapeString(crossingProjectDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call crossingprojectsCrossingProjectDbIdPutValidateBeforeCall(String crossingProjectDbId, CrossingProjectNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'crossingProjectDbId' is set
-        if (crossingProjectDbId == null) {
-            throw new ApiException("Missing the required parameter 'crossingProjectDbId' when calling crossingprojectsCrossingProjectDbIdPut(Async)");
-        }
-
-        return crossingprojectsCrossingProjectDbIdPutCall(crossingProjectDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update an existing Crossing Project
-     * Update an existing Crossing Project entity on this server
-     *
-     * @param crossingProjectDbId Search for Crossing Projects with this unique id (required)
-     * @param body                (optional)
-     * @param authorization       HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return CrossingProjectsSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CrossingProjectsSingleResponse crossingprojectsCrossingProjectDbIdPut(String crossingProjectDbId, CrossingProjectNewRequest body, String authorization) throws ApiException {
-        ApiResponse<CrossingProjectsSingleResponse> resp = crossingprojectsCrossingProjectDbIdPutWithHttpInfo(crossingProjectDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update an existing Crossing Project
-     * Update an existing Crossing Project entity on this server
-     *
-     * @param crossingProjectDbId Search for Crossing Projects with this unique id (required)
-     * @param body                (optional)
-     * @param authorization       HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;CrossingProjectsSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CrossingProjectsSingleResponse> crossingprojectsCrossingProjectDbIdPutWithHttpInfo(String crossingProjectDbId, CrossingProjectNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = crossingprojectsCrossingProjectDbIdPutValidateBeforeCall(crossingProjectDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<CrossingProjectsSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update an existing Crossing Project (asynchronously)
-     * Update an existing Crossing Project entity on this server
-     *
-     * @param crossingProjectDbId Search for Crossing Projects with this unique id (required)
-     * @param body                (optional)
-     * @param authorization       HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback            The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call crossingprojectsCrossingProjectDbIdPutAsync(String crossingProjectDbId, CrossingProjectNewRequest body, String authorization, final ApiCallback<CrossingProjectsSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = crossingprojectsCrossingProjectDbIdPutValidateBeforeCall(crossingProjectDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CrossingProjectsSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for crossingprojectsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call crossingprojectsGetCall(CrossingProjectQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/crossingprojects";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call crossingprojectsGetValidateBeforeCall(CrossingProjectQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return crossingprojectsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a filtered list of Crossing Projects
-     *
-     * @return CrossingProjectsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CrossingProjectsListResponse crossingprojectsGet(CrossingProjectQueryParams queryParams) throws ApiException {
-        ApiResponse<CrossingProjectsListResponse> resp = crossingprojectsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get a filtered list of Crossing Projects
-     *
-     * @return ApiResponse&lt;CrossingProjectsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CrossingProjectsListResponse> crossingprojectsGetWithHttpInfo(CrossingProjectQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = crossingprojectsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<CrossingProjectsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a filtered list of Crossing Projects (asynchronously)
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call crossingprojectsGetAsync(CrossingProjectQueryParams queryParams, final ApiCallback<CrossingProjectsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = crossingprojectsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CrossingProjectsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for crossingprojectsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call crossingprojectsPostCall(List<CrossingProjectNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/crossingprojects";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call crossingprojectsPostValidateBeforeCall(List<CrossingProjectNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return crossingprojectsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Create new Crossing Project entities on this server
-     * Create new Crossing Project entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return CrossingProjectsListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public CrossingProjectsListResponse crossingprojectsPost(List<CrossingProjectNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<CrossingProjectsListResponse> resp = crossingprojectsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Create new Crossing Project entities on this server
-     * Create new Crossing Project entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;CrossingProjectsListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<CrossingProjectsListResponse> crossingprojectsPostWithHttpInfo(List<CrossingProjectNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = crossingprojectsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<CrossingProjectsListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Create new Crossing Project entities on this server (asynchronously)
-     * Create new Crossing Project entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call crossingprojectsPostAsync(List<CrossingProjectNewRequest> body, String authorization, final ApiCallback<CrossingProjectsListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = crossingprojectsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<CrossingProjectsListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/GermplasmApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/GermplasmApi.java
deleted file mode 100644
index 91ce8ba7..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/GermplasmApi.java
+++ /dev/null
@@ -1,1369 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.germplasm;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.germplasm.GermplasmQueryParams;
-import org.brapi.model.v21.germplasm.*;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class GermplasmApi {
-    private ApiClient apiClient;
-
-    public GermplasmApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public GermplasmApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for breedingmethodsBreedingMethodDbIdGet
-     *
-     * @param breedingMethodDbId      Internal database identifier for a breeding method (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call breedingmethodsBreedingMethodDbIdGetCall(String breedingMethodDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/breedingmethods/{breedingMethodDbId}"
-                .replaceAll("\\{" + "breedingMethodDbId" + "}", apiClient.escapeString(breedingMethodDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call breedingmethodsBreedingMethodDbIdGetValidateBeforeCall(String breedingMethodDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'breedingMethodDbId' is set
-        if (breedingMethodDbId == null) {
-            throw new ApiException("Missing the required parameter 'breedingMethodDbId' when calling breedingmethodsBreedingMethodDbIdGet(Async)");
-        }
-
-        return breedingmethodsBreedingMethodDbIdGetCall(breedingMethodDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details of a specific Breeding Method
-     * Get the details of a specific Breeding Method used to produce Germplasm
-     *
-     * @param breedingMethodDbId Internal database identifier for a breeding method (required)
-     * @param authorization      HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return BreedingMethodSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public BreedingMethodSingleResponse breedingmethodsBreedingMethodDbIdGet(String breedingMethodDbId, String authorization) throws ApiException {
-        ApiResponse<BreedingMethodSingleResponse> resp = breedingmethodsBreedingMethodDbIdGetWithHttpInfo(breedingMethodDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details of a specific Breeding Method
-     * Get the details of a specific Breeding Method used to produce Germplasm
-     *
-     * @param breedingMethodDbId Internal database identifier for a breeding method (required)
-     * @param authorization      HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;BreedingMethodSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<BreedingMethodSingleResponse> breedingmethodsBreedingMethodDbIdGetWithHttpInfo(String breedingMethodDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = breedingmethodsBreedingMethodDbIdGetValidateBeforeCall(breedingMethodDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<BreedingMethodSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details of a specific Breeding Method (asynchronously)
-     * Get the details of a specific Breeding Method used to produce Germplasm
-     *
-     * @param breedingMethodDbId Internal database identifier for a breeding method (required)
-     * @param authorization      HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback           The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call breedingmethodsBreedingMethodDbIdGetAsync(String breedingMethodDbId, String authorization, final ApiCallback<BreedingMethodSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = breedingmethodsBreedingMethodDbIdGetValidateBeforeCall(breedingMethodDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<BreedingMethodSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for breedingmethodsGet
-     *
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call breedingmethodsGetCall(Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/breedingmethods";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call breedingmethodsGetValidateBeforeCall(Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return breedingmethodsGetCall(page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Breeding Methods
-     * Get the list of germplasm breeding methods available in a system.
-     *
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return BreedingMethodListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public BreedingMethodListResponse breedingmethodsGet(Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<BreedingMethodListResponse> resp = breedingmethodsGetWithHttpInfo(page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Breeding Methods
-     * Get the list of germplasm breeding methods available in a system.
-     *
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;BreedingMethodListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<BreedingMethodListResponse> breedingmethodsGetWithHttpInfo(Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = breedingmethodsGetValidateBeforeCall(page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<BreedingMethodListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Breeding Methods (asynchronously)
-     * Get the list of germplasm breeding methods available in a system.
-     *
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call breedingmethodsGetAsync(Integer page, Integer pageSize, String authorization, final ApiCallback<BreedingMethodListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = breedingmethodsGetValidateBeforeCall(page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<BreedingMethodListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for germplasmGermplasmDbIdGet
-     *
-     * @param germplasmDbId           The internal id of the germplasm (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call germplasmGermplasmDbIdGetCall(String germplasmDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/germplasm/{germplasmDbId}"
-                .replaceAll("\\{" + "germplasmDbId" + "}", apiClient.escapeString(germplasmDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call germplasmGermplasmDbIdGetValidateBeforeCall(String germplasmDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'germplasmDbId' is set
-        if (germplasmDbId == null) {
-            throw new ApiException("Missing the required parameter 'germplasmDbId' when calling germplasmGermplasmDbIdGet(Async)");
-        }
-
-        return germplasmGermplasmDbIdGetCall(germplasmDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details of a specific Germplasm
-     * Germplasm Details by germplasmDbId was merged with Germplasm Multi Crop Passport Data. The MCPD fields are optional and marked with the prefix [MCPD].
-     *
-     * @param germplasmDbId The internal id of the germplasm (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmSingleResponse germplasmGermplasmDbIdGet(String germplasmDbId, String authorization) throws ApiException {
-        ApiResponse<GermplasmSingleResponse> resp = germplasmGermplasmDbIdGetWithHttpInfo(germplasmDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details of a specific Germplasm
-     * Germplasm Details by germplasmDbId was merged with Germplasm Multi Crop Passport Data. The MCPD fields are optional and marked with the prefix [MCPD].
-     *
-     * @param germplasmDbId The internal id of the germplasm (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmSingleResponse> germplasmGermplasmDbIdGetWithHttpInfo(String germplasmDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = germplasmGermplasmDbIdGetValidateBeforeCall(germplasmDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details of a specific Germplasm (asynchronously)
-     * Germplasm Details by germplasmDbId was merged with Germplasm Multi Crop Passport Data. The MCPD fields are optional and marked with the prefix [MCPD].
-     *
-     * @param germplasmDbId The internal id of the germplasm (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call germplasmGermplasmDbIdGetAsync(String germplasmDbId, String authorization, final ApiCallback<GermplasmSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = germplasmGermplasmDbIdGetValidateBeforeCall(germplasmDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for germplasmGermplasmDbIdMcpdGet
-     *
-     * @param germplasmDbId           the internal id of the germplasm (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call germplasmGermplasmDbIdMcpdGetCall(String germplasmDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/germplasm/{germplasmDbId}/mcpd"
-                .replaceAll("\\{" + "germplasmDbId" + "}", apiClient.escapeString(germplasmDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call germplasmGermplasmDbIdMcpdGetValidateBeforeCall(String germplasmDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'germplasmDbId' is set
-        if (germplasmDbId == null) {
-            throw new ApiException("Missing the required parameter 'germplasmDbId' when calling germplasmGermplasmDbIdMcpdGet(Async)");
-        }
-
-        return germplasmGermplasmDbIdMcpdGetCall(germplasmDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details of a specific Germplasm in MCPD format
-     * Get all MCPD details of a germplasm  &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://www.bioversityInternational.org/fileadmin/user_upload/online_library/publications/pdfs/FAOBIOVERSITY_MULTI-CROP_PASSPORT_DESCRIPTORS_V.2.1_2015_2020.pdf\&quot;&gt; MCPD v2.1 spec can be found here &lt;/a&gt;  Implementation Notes  - When the MCPD spec identifies a field which can have multiple values returned, the JSON response should be an array instead of a semi-colon separated string.
-     *
-     * @param germplasmDbId the internal id of the germplasm (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmMCPDResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmMCPDResponse germplasmGermplasmDbIdMcpdGet(String germplasmDbId, String authorization) throws ApiException {
-        ApiResponse<GermplasmMCPDResponse> resp = germplasmGermplasmDbIdMcpdGetWithHttpInfo(germplasmDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details of a specific Germplasm in MCPD format
-     * Get all MCPD details of a germplasm  &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://www.bioversityInternational.org/fileadmin/user_upload/online_library/publications/pdfs/FAOBIOVERSITY_MULTI-CROP_PASSPORT_DESCRIPTORS_V.2.1_2015_2020.pdf\&quot;&gt; MCPD v2.1 spec can be found here &lt;/a&gt;  Implementation Notes  - When the MCPD spec identifies a field which can have multiple values returned, the JSON response should be an array instead of a semi-colon separated string.
-     *
-     * @param germplasmDbId the internal id of the germplasm (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmMCPDResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmMCPDResponse> germplasmGermplasmDbIdMcpdGetWithHttpInfo(String germplasmDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = germplasmGermplasmDbIdMcpdGetValidateBeforeCall(germplasmDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmMCPDResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details of a specific Germplasm in MCPD format (asynchronously)
-     * Get all MCPD details of a germplasm  &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://www.bioversityInternational.org/fileadmin/user_upload/online_library/publications/pdfs/FAOBIOVERSITY_MULTI-CROP_PASSPORT_DESCRIPTORS_V.2.1_2015_2020.pdf\&quot;&gt; MCPD v2.1 spec can be found here &lt;/a&gt;  Implementation Notes  - When the MCPD spec identifies a field which can have multiple values returned, the JSON response should be an array instead of a semi-colon separated string.
-     *
-     * @param germplasmDbId the internal id of the germplasm (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call germplasmGermplasmDbIdMcpdGetAsync(String germplasmDbId, String authorization, final ApiCallback<GermplasmMCPDResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = germplasmGermplasmDbIdMcpdGetValidateBeforeCall(germplasmDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmMCPDResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for germplasmGermplasmDbIdPedigreeGet
-     *
-     * @param germplasmDbId           the internal id of the germplasm (required)
-     * @param notation                text representation of the pedigree (optional)
-     * @param includeSiblings         include array of siblings in response (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call germplasmGermplasmDbIdPedigreeGetCall(String germplasmDbId, String notation, Boolean includeSiblings, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/germplasm/{germplasmDbId}/pedigree"
-                .replaceAll("\\{" + "germplasmDbId" + "}", apiClient.escapeString(germplasmDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (notation != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("notation", notation));
-        if (includeSiblings != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("includeSiblings", includeSiblings));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call germplasmGermplasmDbIdPedigreeGetValidateBeforeCall(String germplasmDbId, String notation, Boolean includeSiblings, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'germplasmDbId' is set
-        if (germplasmDbId == null) {
-            throw new ApiException("Missing the required parameter 'germplasmDbId' when calling germplasmGermplasmDbIdPedigreeGet(Async)");
-        }
-
-        return germplasmGermplasmDbIdPedigreeGetCall(germplasmDbId, notation, includeSiblings, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;GET /pedigree?germplasmDbId&#x3D;{germplasmDbId}&#x60;. Github issue number #481  &lt;br/&gt; Get the pedigree details of a specific Germplasm
-     * **Deprecated in v2.1** Please use &#x60;GET /pedigree?germplasmDbId&#x3D;{germplasmDbId}&#x60;. Github issue number #481  &lt;br/&gt; Get the parentage information of a specific Germplasm
-     *
-     * @param germplasmDbId   the internal id of the germplasm (required)
-     * @param notation        text representation of the pedigree (optional)
-     * @param includeSiblings include array of siblings in response (optional)
-     * @param authorization   HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmPedigreeResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmPedigreeResponse germplasmGermplasmDbIdPedigreeGet(String germplasmDbId, String notation, Boolean includeSiblings, String authorization) throws ApiException {
-        ApiResponse<GermplasmPedigreeResponse> resp = germplasmGermplasmDbIdPedigreeGetWithHttpInfo(germplasmDbId, notation, includeSiblings, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;GET /pedigree?germplasmDbId&#x3D;{germplasmDbId}&#x60;. Github issue number #481  &lt;br/&gt; Get the pedigree details of a specific Germplasm
-     * **Deprecated in v2.1** Please use &#x60;GET /pedigree?germplasmDbId&#x3D;{germplasmDbId}&#x60;. Github issue number #481  &lt;br/&gt; Get the parentage information of a specific Germplasm
-     *
-     * @param germplasmDbId   the internal id of the germplasm (required)
-     * @param notation        text representation of the pedigree (optional)
-     * @param includeSiblings include array of siblings in response (optional)
-     * @param authorization   HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmPedigreeResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmPedigreeResponse> germplasmGermplasmDbIdPedigreeGetWithHttpInfo(String germplasmDbId, String notation, Boolean includeSiblings, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = germplasmGermplasmDbIdPedigreeGetValidateBeforeCall(germplasmDbId, notation, includeSiblings, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmPedigreeResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;GET /pedigree?germplasmDbId&#x3D;{germplasmDbId}&#x60;. Github issue number #481  &lt;br/&gt; Get the pedigree details of a specific Germplasm (asynchronously)
-     * **Deprecated in v2.1** Please use &#x60;GET /pedigree?germplasmDbId&#x3D;{germplasmDbId}&#x60;. Github issue number #481  &lt;br/&gt; Get the parentage information of a specific Germplasm
-     *
-     * @param germplasmDbId   the internal id of the germplasm (required)
-     * @param notation        text representation of the pedigree (optional)
-     * @param includeSiblings include array of siblings in response (optional)
-     * @param authorization   HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback        The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call germplasmGermplasmDbIdPedigreeGetAsync(String germplasmDbId, String notation, Boolean includeSiblings, String authorization, final ApiCallback<GermplasmPedigreeResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = germplasmGermplasmDbIdPedigreeGetValidateBeforeCall(germplasmDbId, notation, includeSiblings, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmPedigreeResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for germplasmGermplasmDbIdProgenyGet
-     *
-     * @param germplasmDbId           the internal id of the germplasm (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call germplasmGermplasmDbIdProgenyGetCall(String germplasmDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/germplasm/{germplasmDbId}/progeny"
-                .replaceAll("\\{" + "germplasmDbId" + "}", apiClient.escapeString(germplasmDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call germplasmGermplasmDbIdProgenyGetValidateBeforeCall(String germplasmDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'germplasmDbId' is set
-        if (germplasmDbId == null) {
-            throw new ApiException("Missing the required parameter 'germplasmDbId' when calling germplasmGermplasmDbIdProgenyGet(Async)");
-        }
-
-        return germplasmGermplasmDbIdProgenyGetCall(germplasmDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;GET /pedigree?germplasmDbId&#x3D;{germplasmDbId}&#x60;. Github issue number #481  &lt;br/&gt; Get the progeny details of a specific Germplasm
-     * **Deprecated in v2.1** Please use &#x60;GET /pedigree?germplasmDbId&#x3D;{germplasmDbId}&#x60;. Github issue number #481  &lt;br/&gt; Get the germplasmDbIds for all the Progeny of a particular germplasm. &lt;br/&gt; Implementation Notes &lt;br/&gt; - Regarding the &#x27;&#x27;parentType&#x27;&#x27; field in the progeny object. Given a germplasm A having a progeny B and C, &#x27;&#x27;parentType&#x27;&#x27; for progeny B refers to the &#x27;&#x27;parentType&#x27;&#x27; of A toward B.
-     *
-     * @param germplasmDbId the internal id of the germplasm (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmProgenyResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmProgenyResponse germplasmGermplasmDbIdProgenyGet(String germplasmDbId, String authorization) throws ApiException {
-        ApiResponse<GermplasmProgenyResponse> resp = germplasmGermplasmDbIdProgenyGetWithHttpInfo(germplasmDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;GET /pedigree?germplasmDbId&#x3D;{germplasmDbId}&#x60;. Github issue number #481  &lt;br/&gt; Get the progeny details of a specific Germplasm
-     * **Deprecated in v2.1** Please use &#x60;GET /pedigree?germplasmDbId&#x3D;{germplasmDbId}&#x60;. Github issue number #481  &lt;br/&gt; Get the germplasmDbIds for all the Progeny of a particular germplasm. &lt;br/&gt; Implementation Notes &lt;br/&gt; - Regarding the &#x27;&#x27;parentType&#x27;&#x27; field in the progeny object. Given a germplasm A having a progeny B and C, &#x27;&#x27;parentType&#x27;&#x27; for progeny B refers to the &#x27;&#x27;parentType&#x27;&#x27; of A toward B.
-     *
-     * @param germplasmDbId the internal id of the germplasm (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmProgenyResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmProgenyResponse> germplasmGermplasmDbIdProgenyGetWithHttpInfo(String germplasmDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = germplasmGermplasmDbIdProgenyGetValidateBeforeCall(germplasmDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmProgenyResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;GET /pedigree?germplasmDbId&#x3D;{germplasmDbId}&#x60;. Github issue number #481  &lt;br/&gt; Get the progeny details of a specific Germplasm (asynchronously)
-     * **Deprecated in v2.1** Please use &#x60;GET /pedigree?germplasmDbId&#x3D;{germplasmDbId}&#x60;. Github issue number #481  &lt;br/&gt; Get the germplasmDbIds for all the Progeny of a particular germplasm. &lt;br/&gt; Implementation Notes &lt;br/&gt; - Regarding the &#x27;&#x27;parentType&#x27;&#x27; field in the progeny object. Given a germplasm A having a progeny B and C, &#x27;&#x27;parentType&#x27;&#x27; for progeny B refers to the &#x27;&#x27;parentType&#x27;&#x27; of A toward B.
-     *
-     * @param germplasmDbId the internal id of the germplasm (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call germplasmGermplasmDbIdProgenyGetAsync(String germplasmDbId, String authorization, final ApiCallback<GermplasmProgenyResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = germplasmGermplasmDbIdProgenyGetValidateBeforeCall(germplasmDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmProgenyResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for germplasmGermplasmDbIdPut
-     *
-     * @param germplasmDbId           The internal id of the germplasm (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call germplasmGermplasmDbIdPutCall(String germplasmDbId, GermplasmNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/germplasm/{germplasmDbId}"
-                .replaceAll("\\{" + "germplasmDbId" + "}", apiClient.escapeString(germplasmDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call germplasmGermplasmDbIdPutValidateBeforeCall(String germplasmDbId, GermplasmNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'germplasmDbId' is set
-        if (germplasmDbId == null) {
-            throw new ApiException("Missing the required parameter 'germplasmDbId' when calling germplasmGermplasmDbIdPut(Async)");
-        }
-
-        return germplasmGermplasmDbIdPutCall(germplasmDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update the details of an existing Germplasm
-     * Germplasm Details by germplasmDbId was merged with Germplasm Multi Crop Passport Data. The MCPD fields are optional and marked with the prefix [MCPD].
-     *
-     * @param germplasmDbId The internal id of the germplasm (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmSingleResponse germplasmGermplasmDbIdPut(String germplasmDbId, GermplasmNewRequest body, String authorization) throws ApiException {
-        ApiResponse<GermplasmSingleResponse> resp = germplasmGermplasmDbIdPutWithHttpInfo(germplasmDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update the details of an existing Germplasm
-     * Germplasm Details by germplasmDbId was merged with Germplasm Multi Crop Passport Data. The MCPD fields are optional and marked with the prefix [MCPD].
-     *
-     * @param germplasmDbId The internal id of the germplasm (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmSingleResponse> germplasmGermplasmDbIdPutWithHttpInfo(String germplasmDbId, GermplasmNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = germplasmGermplasmDbIdPutValidateBeforeCall(germplasmDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update the details of an existing Germplasm (asynchronously)
-     * Germplasm Details by germplasmDbId was merged with Germplasm Multi Crop Passport Data. The MCPD fields are optional and marked with the prefix [MCPD].
-     *
-     * @param germplasmDbId The internal id of the germplasm (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call germplasmGermplasmDbIdPutAsync(String germplasmDbId, GermplasmNewRequest body, String authorization, final ApiCallback<GermplasmSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = germplasmGermplasmDbIdPutValidateBeforeCall(germplasmDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for germplasmGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call germplasmGetCall(GermplasmQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/germplasm";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call germplasmGetValidateBeforeCall(GermplasmQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return germplasmGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a filtered list of Germplasm
-     * Addresses these needs  - General germplasm search mechanism that accepts POST for complex queries   - Possibility to search germplasm by more parameters than those allowed by the existing germplasm search   - Possibility to get MCPD details by PUID rather than dbId
-     *
-     * @return GermplasmListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmListResponse germplasmGet(GermplasmQueryParams queryParams) throws ApiException {
-        ApiResponse<GermplasmListResponse> resp = germplasmGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get a filtered list of Germplasm
-     * Addresses these needs  - General germplasm search mechanism that accepts POST for complex queries   - Possibility to search germplasm by more parameters than those allowed by the existing germplasm search   - Possibility to get MCPD details by PUID rather than dbId
-     *
-     * @return ApiResponse&lt;GermplasmListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmListResponse> germplasmGetWithHttpInfo(GermplasmQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = germplasmGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a filtered list of Germplasm (asynchronously)
-     * Addresses these needs  - General germplasm search mechanism that accepts POST for complex queries   - Possibility to search germplasm by more parameters than those allowed by the existing germplasm search   - Possibility to get MCPD details by PUID rather than dbId
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call germplasmGetAsync(GermplasmQueryParams queryParams, final ApiCallback<GermplasmListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = germplasmGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for germplasmPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call germplasmPostCall(List<GermplasmNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/germplasm";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call germplasmPostValidateBeforeCall(List<GermplasmNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return germplasmPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Create new Germplasm entities on this server
-     * Create new Germplasm entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmListResponse germplasmPost(List<GermplasmNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<GermplasmListResponse> resp = germplasmPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Create new Germplasm entities on this server
-     * Create new Germplasm entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmListResponse> germplasmPostWithHttpInfo(List<GermplasmNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = germplasmPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Create new Germplasm entities on this server (asynchronously)
-     * Create new Germplasm entities on this server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call germplasmPostAsync(List<GermplasmNewRequest> body, String authorization, final ApiCallback<GermplasmListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = germplasmPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchGermplasmPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchGermplasmPostCall(GermplasmSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/germplasm";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchGermplasmPostValidateBeforeCall(GermplasmSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchGermplasmPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;Germplasm&#x60;
-     * Submit a search request for &#x60;Germplasm&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/germplasm/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmListResponse searchGermplasmPost(GermplasmSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<GermplasmListResponse> resp = searchGermplasmPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;Germplasm&#x60;
-     * Submit a search request for &#x60;Germplasm&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/germplasm/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmListResponse> searchGermplasmPostWithHttpInfo(GermplasmSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchGermplasmPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;Germplasm&#x60; (asynchronously)
-     * Submit a search request for &#x60;Germplasm&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/germplasm/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchGermplasmPostAsync(GermplasmSearchRequest body, String authorization, final ApiCallback<GermplasmListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchGermplasmPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchGermplasmSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchGermplasmSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/germplasm/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchGermplasmSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchGermplasmSearchResultsDbIdGet(Async)");
-        }
-
-        return searchGermplasmSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;Germplasm&#x60; search request
-     * Get the results of a &#x60;Germplasm&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/germplasm&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmListResponse searchGermplasmSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<GermplasmListResponse> resp = searchGermplasmSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;Germplasm&#x60; search request
-     * Get the results of a &#x60;Germplasm&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/germplasm&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmListResponse> searchGermplasmSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchGermplasmSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;Germplasm&#x60; search request (asynchronously)
-     * Get the results of a &#x60;Germplasm&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/germplasm&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchGermplasmSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<GermplasmListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchGermplasmSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/GermplasmAttributeValuesApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/GermplasmAttributeValuesApi.java
deleted file mode 100644
index 1247d097..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/GermplasmAttributeValuesApi.java
+++ /dev/null
@@ -1,754 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.germplasm;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.germplasm.GermplasmAttributeValueQueryParams;
-import org.brapi.model.v21.germplasm.GermplasmAttributeValueListResponse;
-import org.brapi.model.v21.germplasm.GermplasmAttributeValueNewRequest;
-import org.brapi.model.v21.germplasm.GermplasmAttributeValueSearchRequest;
-import org.brapi.model.v21.germplasm.GermplasmAttributeValueSingleResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class GermplasmAttributeValuesApi {
-    private ApiClient apiClient;
-
-    public GermplasmAttributeValuesApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public GermplasmAttributeValuesApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for attributevaluesAttributeValueDbIdGet
-     *
-     * @param attributeValueDbId      The unique id for an attribute value (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call attributevaluesAttributeValueDbIdGetCall(String attributeValueDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/attributevalues/{attributeValueDbId}"
-                .replaceAll("\\{" + "attributeValueDbId" + "}", apiClient.escapeString(attributeValueDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call attributevaluesAttributeValueDbIdGetValidateBeforeCall(String attributeValueDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'attributeValueDbId' is set
-        if (attributeValueDbId == null) {
-            throw new ApiException("Missing the required parameter 'attributeValueDbId' when calling attributevaluesAttributeValueDbIdGet(Async)");
-        }
-
-        return attributevaluesAttributeValueDbIdGetCall(attributeValueDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details for a specific Germplasm Attribute
-     * Get the details for a specific Germplasm Attribute
-     *
-     * @param attributeValueDbId The unique id for an attribute value (required)
-     * @param authorization      HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmAttributeValueSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmAttributeValueSingleResponse attributevaluesAttributeValueDbIdGet(String attributeValueDbId, String authorization) throws ApiException {
-        ApiResponse<GermplasmAttributeValueSingleResponse> resp = attributevaluesAttributeValueDbIdGetWithHttpInfo(attributeValueDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details for a specific Germplasm Attribute
-     * Get the details for a specific Germplasm Attribute
-     *
-     * @param attributeValueDbId The unique id for an attribute value (required)
-     * @param authorization      HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmAttributeValueSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmAttributeValueSingleResponse> attributevaluesAttributeValueDbIdGetWithHttpInfo(String attributeValueDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = attributevaluesAttributeValueDbIdGetValidateBeforeCall(attributeValueDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeValueSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details for a specific Germplasm Attribute (asynchronously)
-     * Get the details for a specific Germplasm Attribute
-     *
-     * @param attributeValueDbId The unique id for an attribute value (required)
-     * @param authorization      HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback           The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call attributevaluesAttributeValueDbIdGetAsync(String attributeValueDbId, String authorization, final ApiCallback<GermplasmAttributeValueSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = attributevaluesAttributeValueDbIdGetValidateBeforeCall(attributeValueDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeValueSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for attributevaluesAttributeValueDbIdPut
-     *
-     * @param attributeValueDbId      The unique id for an attribute value (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call attributevaluesAttributeValueDbIdPutCall(String attributeValueDbId, GermplasmAttributeValueNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/attributevalues/{attributeValueDbId}"
-                .replaceAll("\\{" + "attributeValueDbId" + "}", apiClient.escapeString(attributeValueDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call attributevaluesAttributeValueDbIdPutValidateBeforeCall(String attributeValueDbId, GermplasmAttributeValueNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'attributeValueDbId' is set
-        if (attributeValueDbId == null) {
-            throw new ApiException("Missing the required parameter 'attributeValueDbId' when calling attributevaluesAttributeValueDbIdPut(Async)");
-        }
-
-        return attributevaluesAttributeValueDbIdPutCall(attributeValueDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update an existing Germplasm Attribute Value
-     * Update an existing Germplasm Attribute Value
-     *
-     * @param attributeValueDbId The unique id for an attribute value (required)
-     * @param body               (optional)
-     * @param authorization      HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmAttributeValueSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmAttributeValueSingleResponse attributevaluesAttributeValueDbIdPut(String attributeValueDbId, GermplasmAttributeValueNewRequest body, String authorization) throws ApiException {
-        ApiResponse<GermplasmAttributeValueSingleResponse> resp = attributevaluesAttributeValueDbIdPutWithHttpInfo(attributeValueDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update an existing Germplasm Attribute Value
-     * Update an existing Germplasm Attribute Value
-     *
-     * @param attributeValueDbId The unique id for an attribute value (required)
-     * @param body               (optional)
-     * @param authorization      HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmAttributeValueSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmAttributeValueSingleResponse> attributevaluesAttributeValueDbIdPutWithHttpInfo(String attributeValueDbId, GermplasmAttributeValueNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = attributevaluesAttributeValueDbIdPutValidateBeforeCall(attributeValueDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeValueSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update an existing Germplasm Attribute Value (asynchronously)
-     * Update an existing Germplasm Attribute Value
-     *
-     * @param attributeValueDbId The unique id for an attribute value (required)
-     * @param body               (optional)
-     * @param authorization      HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback           The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call attributevaluesAttributeValueDbIdPutAsync(String attributeValueDbId, GermplasmAttributeValueNewRequest body, String authorization, final ApiCallback<GermplasmAttributeValueSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = attributevaluesAttributeValueDbIdPutValidateBeforeCall(attributeValueDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeValueSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for attributevaluesGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call attributevaluesGetCall(GermplasmAttributeValueQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/attributevalues";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call attributevaluesGetValidateBeforeCall(GermplasmAttributeValueQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return attributevaluesGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Germplasm Attribute Values
-     *
-     * @return GermplasmAttributeValueListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmAttributeValueListResponse attributevaluesGet(GermplasmAttributeValueQueryParams queryParams) throws ApiException {
-        ApiResponse<GermplasmAttributeValueListResponse> resp = attributevaluesGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Germplasm Attribute Values
-     *
-     * @return ApiResponse&lt;GermplasmAttributeValueListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmAttributeValueListResponse> attributevaluesGetWithHttpInfo(GermplasmAttributeValueQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = attributevaluesGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeValueListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Germplasm Attribute Values (asynchronously)
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call attributevaluesGetAsync(GermplasmAttributeValueQueryParams queryParams, final ApiCallback<GermplasmAttributeValueListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = attributevaluesGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeValueListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for attributevaluesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call attributevaluesPostCall(List<GermplasmAttributeValueNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/attributevalues";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call attributevaluesPostValidateBeforeCall(List<GermplasmAttributeValueNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return attributevaluesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Create new Germplasm Attribute Values
-     * Create new Germplasm Attribute Values
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmAttributeValueListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmAttributeValueListResponse attributevaluesPost(List<GermplasmAttributeValueNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<GermplasmAttributeValueListResponse> resp = attributevaluesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Create new Germplasm Attribute Values
-     * Create new Germplasm Attribute Values
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmAttributeValueListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmAttributeValueListResponse> attributevaluesPostWithHttpInfo(List<GermplasmAttributeValueNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = attributevaluesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeValueListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Create new Germplasm Attribute Values (asynchronously)
-     * Create new Germplasm Attribute Values
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call attributevaluesPostAsync(List<GermplasmAttributeValueNewRequest> body, String authorization, final ApiCallback<GermplasmAttributeValueListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = attributevaluesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeValueListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchAttributevaluesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchAttributevaluesPostCall(GermplasmAttributeValueSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/attributevalues";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchAttributevaluesPostValidateBeforeCall(GermplasmAttributeValueSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchAttributevaluesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for Germplasm &#x60;AttributeValues&#x60;
-     * Submit a search request for Germplasm &#x60;AttributeValues&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/attributevalues/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmAttributeValueListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmAttributeValueListResponse searchAttributevaluesPost(GermplasmAttributeValueSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<GermplasmAttributeValueListResponse> resp = searchAttributevaluesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for Germplasm &#x60;AttributeValues&#x60;
-     * Submit a search request for Germplasm &#x60;AttributeValues&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/attributevalues/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmAttributeValueListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmAttributeValueListResponse> searchAttributevaluesPostWithHttpInfo(GermplasmAttributeValueSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchAttributevaluesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeValueListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for Germplasm &#x60;AttributeValues&#x60; (asynchronously)
-     * Submit a search request for Germplasm &#x60;AttributeValues&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/attributevalues/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchAttributevaluesPostAsync(GermplasmAttributeValueSearchRequest body, String authorization, final ApiCallback<GermplasmAttributeValueListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchAttributevaluesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeValueListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchAttributevaluesSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchAttributevaluesSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/attributevalues/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchAttributevaluesSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchAttributevaluesSearchResultsDbIdGet(Async)");
-        }
-
-        return searchAttributevaluesSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a Germplasm &#x60;AttributeValues&#x60; search request
-     * Get the results of a Germplasm &#x60;AttributeValues&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/attributevalues&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmAttributeValueListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmAttributeValueListResponse searchAttributevaluesSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<GermplasmAttributeValueListResponse> resp = searchAttributevaluesSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a Germplasm &#x60;AttributeValues&#x60; search request
-     * Get the results of a Germplasm &#x60;AttributeValues&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/attributevalues&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmAttributeValueListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmAttributeValueListResponse> searchAttributevaluesSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchAttributevaluesSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeValueListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a Germplasm &#x60;AttributeValues&#x60; search request (asynchronously)
-     * Get the results of a Germplasm &#x60;AttributeValues&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/attributevalues&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchAttributevaluesSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<GermplasmAttributeValueListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchAttributevaluesSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeValueListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/GermplasmAttributesApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/GermplasmAttributesApi.java
deleted file mode 100644
index 1824fa51..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/GermplasmAttributesApi.java
+++ /dev/null
@@ -1,877 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.germplasm;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.germplasm.GermplasmAttributeQueryParams;
-import org.brapi.model.v21.germplasm.*;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class GermplasmAttributesApi {
-    private ApiClient apiClient;
-
-    public GermplasmAttributesApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public GermplasmAttributesApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for attributesAttributeDbIdGet
-     *
-     * @param attributeDbId           The unique id for an attribute (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call attributesAttributeDbIdGetCall(String attributeDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/attributes/{attributeDbId}"
-                .replaceAll("\\{" + "attributeDbId" + "}", apiClient.escapeString(attributeDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call attributesAttributeDbIdGetValidateBeforeCall(String attributeDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'attributeDbId' is set
-        if (attributeDbId == null) {
-            throw new ApiException("Missing the required parameter 'attributeDbId' when calling attributesAttributeDbIdGet(Async)");
-        }
-
-        return attributesAttributeDbIdGetCall(attributeDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details for a specific Germplasm Attribute
-     * Get the details for a specific Germplasm Attribute
-     *
-     * @param attributeDbId The unique id for an attribute (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmAttributeSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmAttributeSingleResponse attributesAttributeDbIdGet(String attributeDbId, String authorization) throws ApiException {
-        ApiResponse<GermplasmAttributeSingleResponse> resp = attributesAttributeDbIdGetWithHttpInfo(attributeDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details for a specific Germplasm Attribute
-     * Get the details for a specific Germplasm Attribute
-     *
-     * @param attributeDbId The unique id for an attribute (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmAttributeSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmAttributeSingleResponse> attributesAttributeDbIdGetWithHttpInfo(String attributeDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = attributesAttributeDbIdGetValidateBeforeCall(attributeDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details for a specific Germplasm Attribute (asynchronously)
-     * Get the details for a specific Germplasm Attribute
-     *
-     * @param attributeDbId The unique id for an attribute (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call attributesAttributeDbIdGetAsync(String attributeDbId, String authorization, final ApiCallback<GermplasmAttributeSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = attributesAttributeDbIdGetValidateBeforeCall(attributeDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for attributesAttributeDbIdPut
-     *
-     * @param attributeDbId           The unique id for an attribute (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call attributesAttributeDbIdPutCall(String attributeDbId, GermplasmAttributeNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/attributes/{attributeDbId}"
-                .replaceAll("\\{" + "attributeDbId" + "}", apiClient.escapeString(attributeDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call attributesAttributeDbIdPutValidateBeforeCall(String attributeDbId, GermplasmAttributeNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'attributeDbId' is set
-        if (attributeDbId == null) {
-            throw new ApiException("Missing the required parameter 'attributeDbId' when calling attributesAttributeDbIdPut(Async)");
-        }
-
-        return attributesAttributeDbIdPutCall(attributeDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update an existing Germplasm Attribute
-     * Update an existing Germplasm Attribute
-     *
-     * @param attributeDbId The unique id for an attribute (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmAttributeSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmAttributeSingleResponse attributesAttributeDbIdPut(String attributeDbId, GermplasmAttributeNewRequest body, String authorization) throws ApiException {
-        ApiResponse<GermplasmAttributeSingleResponse> resp = attributesAttributeDbIdPutWithHttpInfo(attributeDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update an existing Germplasm Attribute
-     * Update an existing Germplasm Attribute
-     *
-     * @param attributeDbId The unique id for an attribute (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmAttributeSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmAttributeSingleResponse> attributesAttributeDbIdPutWithHttpInfo(String attributeDbId, GermplasmAttributeNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = attributesAttributeDbIdPutValidateBeforeCall(attributeDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update an existing Germplasm Attribute (asynchronously)
-     * Update an existing Germplasm Attribute
-     *
-     * @param attributeDbId The unique id for an attribute (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call attributesAttributeDbIdPutAsync(String attributeDbId, GermplasmAttributeNewRequest body, String authorization, final ApiCallback<GermplasmAttributeSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = attributesAttributeDbIdPutValidateBeforeCall(attributeDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for attributesCategoriesGet
-     *
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call attributesCategoriesGetCall(Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/attributes/categories";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call attributesCategoriesGetValidateBeforeCall(Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return attributesCategoriesGetCall(page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Categories of Germplasm Attributes
-     * List all available attribute categories.
-     *
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmAttributeCategoryListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmAttributeCategoryListResponse attributesCategoriesGet(Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<GermplasmAttributeCategoryListResponse> resp = attributesCategoriesGetWithHttpInfo(page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Categories of Germplasm Attributes
-     * List all available attribute categories.
-     *
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmAttributeCategoryListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmAttributeCategoryListResponse> attributesCategoriesGetWithHttpInfo(Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = attributesCategoriesGetValidateBeforeCall(page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeCategoryListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Categories of Germplasm Attributes (asynchronously)
-     * List all available attribute categories.
-     *
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call attributesCategoriesGetAsync(Integer page, Integer pageSize, String authorization, final ApiCallback<GermplasmAttributeCategoryListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = attributesCategoriesGetValidateBeforeCall(page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeCategoryListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for attributesGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call attributesGetCall(GermplasmAttributeQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/attributes";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call attributesGetValidateBeforeCall(GermplasmAttributeQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return attributesGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Germplasm Attributes
-     * List available attributes.
-     *
-     * @return GermplasmAttributeListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmAttributeListResponse attributesGet(GermplasmAttributeQueryParams queryParams) throws ApiException {
-        ApiResponse<GermplasmAttributeListResponse> resp = attributesGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Germplasm Attributes
-     * List available attributes.
-     *
-     * @return ApiResponse&lt;GermplasmAttributeListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmAttributeListResponse> attributesGetWithHttpInfo(GermplasmAttributeQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = attributesGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Germplasm Attributes (asynchronously)
-     * List available attributes.
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call attributesGetAsync(GermplasmAttributeQueryParams queryParams, final ApiCallback<GermplasmAttributeListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = attributesGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for attributesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call attributesPostCall(List<GermplasmAttributeNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/attributes";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call attributesPostValidateBeforeCall(List<GermplasmAttributeNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return attributesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Create new Germplasm Attributes
-     * Create new Germplasm Attributes
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmAttributeListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmAttributeListResponse attributesPost(List<GermplasmAttributeNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<GermplasmAttributeListResponse> resp = attributesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Create new Germplasm Attributes
-     * Create new Germplasm Attributes
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmAttributeListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmAttributeListResponse> attributesPostWithHttpInfo(List<GermplasmAttributeNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = attributesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Create new Germplasm Attributes (asynchronously)
-     * Create new Germplasm Attributes
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call attributesPostAsync(List<GermplasmAttributeNewRequest> body, String authorization, final ApiCallback<GermplasmAttributeListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = attributesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchAttributesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchAttributesPostCall(GermplasmAttributeSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/attributes";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchAttributesPostValidateBeforeCall(GermplasmAttributeSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchAttributesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for Germplasm &#x60;Attributes&#x60;
-     * Submit a search request for Germplasm &#x60;Attributes&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/attributes/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmAttributeListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmAttributeListResponse searchAttributesPost(GermplasmAttributeSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<GermplasmAttributeListResponse> resp = searchAttributesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for Germplasm &#x60;Attributes&#x60;
-     * Submit a search request for Germplasm &#x60;Attributes&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/attributes/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmAttributeListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmAttributeListResponse> searchAttributesPostWithHttpInfo(GermplasmAttributeSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchAttributesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for Germplasm &#x60;Attributes&#x60; (asynchronously)
-     * Submit a search request for Germplasm &#x60;Attributes&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/attributes/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchAttributesPostAsync(GermplasmAttributeSearchRequest body, String authorization, final ApiCallback<GermplasmAttributeListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchAttributesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchAttributesSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchAttributesSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/attributes/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchAttributesSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchAttributesSearchResultsDbIdGet(Async)");
-        }
-
-        return searchAttributesSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a Germplasm &#x60;Attributes&#x60; search request
-     * Get the results of a Germplasm &#x60;Attributes&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/attributes&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return GermplasmAttributeListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public GermplasmAttributeListResponse searchAttributesSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<GermplasmAttributeListResponse> resp = searchAttributesSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a Germplasm &#x60;Attributes&#x60; search request
-     * Get the results of a Germplasm &#x60;Attributes&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/attributes&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;GermplasmAttributeListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<GermplasmAttributeListResponse> searchAttributesSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchAttributesSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a Germplasm &#x60;Attributes&#x60; search request (asynchronously)
-     * Get the results of a Germplasm &#x60;Attributes&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/attributes&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchAttributesSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<GermplasmAttributeListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchAttributesSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<GermplasmAttributeListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/PedigreeApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/PedigreeApi.java
deleted file mode 100644
index e41f07af..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/PedigreeApi.java
+++ /dev/null
@@ -1,624 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.germplasm;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.germplasm.PedigreeQueryParams;
-import org.brapi.model.v21.germplasm.PedigreeListResponse;
-import org.brapi.model.v21.germplasm.PedigreeNode;
-import org.brapi.model.v21.germplasm.PedigreeSearchRequest;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class PedigreeApi {
-    private ApiClient apiClient;
-
-    public PedigreeApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public PedigreeApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for pedigreeGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call pedigreeGetCall(PedigreeQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/pedigree";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call pedigreeGetValidateBeforeCall(PedigreeQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return pedigreeGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a filtered list of pedigree nodes which represent a subset of a pedigree tree
-     *
-     * @return PedigreeListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PedigreeListResponse pedigreeGet(PedigreeQueryParams queryParams) throws ApiException {
-        ApiResponse<PedigreeListResponse> resp = pedigreeGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get a filtered list of pedigree nodes which represent a subset of a pedigree tree
-     *
-     * @return ApiResponse&lt;PedigreeListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PedigreeListResponse> pedigreeGetWithHttpInfo(PedigreeQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = pedigreeGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<PedigreeListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a filtered list of pedigree nodes which represent a subset of a pedigree tree (asynchronously)
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call pedigreeGetAsync(PedigreeQueryParams queryParams, final ApiCallback<PedigreeListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = pedigreeGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PedigreeListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for pedigreePost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call pedigreePostCall(List<PedigreeNode> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/pedigree";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call pedigreePostValidateBeforeCall(List<PedigreeNode> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return pedigreePostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Send a list of new pedigree nodes to a server
-     * Send a list of new pedigree nodes to a server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PedigreeListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PedigreeListResponse pedigreePost(List<PedigreeNode> body, String authorization) throws ApiException {
-        ApiResponse<PedigreeListResponse> resp = pedigreePostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Send a list of new pedigree nodes to a server
-     * Send a list of new pedigree nodes to a server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PedigreeListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PedigreeListResponse> pedigreePostWithHttpInfo(List<PedigreeNode> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = pedigreePostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PedigreeListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Send a list of new pedigree nodes to a server (asynchronously)
-     * Send a list of new pedigree nodes to a server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call pedigreePostAsync(List<PedigreeNode> body, String authorization, final ApiCallback<PedigreeListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = pedigreePostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PedigreeListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for pedigreePut
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call pedigreePutCall(Map<String, PedigreeNode> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/pedigree";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call pedigreePutValidateBeforeCall(Map<String, PedigreeNode> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return pedigreePutCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Send a list of pedigree nodes to update existing information on a server
-     * Send a list of pedigree nodes to update existing information on a server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PedigreeListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PedigreeListResponse pedigreePut(Map<String, PedigreeNode> body, String authorization) throws ApiException {
-        ApiResponse<PedigreeListResponse> resp = pedigreePutWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Send a list of pedigree nodes to update existing information on a server
-     * Send a list of pedigree nodes to update existing information on a server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PedigreeListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PedigreeListResponse> pedigreePutWithHttpInfo(Map<String, PedigreeNode> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = pedigreePutValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PedigreeListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Send a list of pedigree nodes to update existing information on a server (asynchronously)
-     * Send a list of pedigree nodes to update existing information on a server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call pedigreePutAsync(Map<String, PedigreeNode> body, String authorization, final ApiCallback<PedigreeListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = pedigreePutValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PedigreeListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchPedigreePost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchPedigreePostCall(PedigreeSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/pedigree";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchPedigreePostValidateBeforeCall(PedigreeSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchPedigreePostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;Pedigree&#x60;
-     * Submit a search request for &#x60;Pedigree&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/germplasm/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PedigreeListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PedigreeListResponse searchPedigreePost(PedigreeSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<PedigreeListResponse> resp = searchPedigreePostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;Pedigree&#x60;
-     * Submit a search request for &#x60;Pedigree&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/germplasm/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PedigreeListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PedigreeListResponse> searchPedigreePostWithHttpInfo(PedigreeSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchPedigreePostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PedigreeListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;Pedigree&#x60; (asynchronously)
-     * Submit a search request for &#x60;Pedigree&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/germplasm/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchPedigreePostAsync(PedigreeSearchRequest body, String authorization, final ApiCallback<PedigreeListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchPedigreePostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PedigreeListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchPedigreeSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchPedigreeSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/pedigree/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchPedigreeSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchPedigreeSearchResultsDbIdGet(Async)");
-        }
-
-        return searchPedigreeSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;Pedigree&#x60; search request
-     * Get the results of a &#x60;Pedigree&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/germplasm&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return PedigreeListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public PedigreeListResponse searchPedigreeSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<PedigreeListResponse> resp = searchPedigreeSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;Pedigree&#x60; search request
-     * Get the results of a &#x60;Pedigree&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/germplasm&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;PedigreeListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<PedigreeListResponse> searchPedigreeSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchPedigreeSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<PedigreeListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;Pedigree&#x60; search request (asynchronously)
-     * Get the results of a &#x60;Pedigree&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/germplasm&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchPedigreeSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<PedigreeListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchPedigreeSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<PedigreeListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/SeedLotsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/SeedLotsApi.java
deleted file mode 100644
index baeb5cf9..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/germplasm/SeedLotsApi.java
+++ /dev/null
@@ -1,953 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.germplasm;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.germplasm.SeedLotQueryParams;
-import org.brapi.model.v21.germplasm.*;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class SeedLotsApi {
-    private ApiClient apiClient;
-
-    public SeedLotsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public SeedLotsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for seedlotsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call seedlotsGetCall(SeedLotQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/seedlots";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call seedlotsGetValidateBeforeCall(SeedLotQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return seedlotsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a filtered list of Seed Lot descriptions
-     *
-     * @return SeedLotListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SeedLotListResponse seedlotsGet(SeedLotQueryParams queryParams) throws ApiException {
-        ApiResponse<SeedLotListResponse> resp = seedlotsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get a filtered list of Seed Lot descriptions
-     *
-     * @return ApiResponse&lt;SeedLotListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SeedLotListResponse> seedlotsGetWithHttpInfo(SeedLotQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = seedlotsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<SeedLotListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a filtered list of Seed Lot descriptions (asynchronously)
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call seedlotsGetAsync(SeedLotQueryParams queryParams, final ApiCallback<SeedLotListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = seedlotsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SeedLotListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for seedlotsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call seedlotsPostCall(List<SeedLotNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/seedlots";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call seedlotsPostValidateBeforeCall(List<SeedLotNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return seedlotsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Add new Seed Lot descriptions to a server
-     * Add new Seed Lot descriptions to a server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return SeedLotListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SeedLotListResponse seedlotsPost(List<SeedLotNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<SeedLotListResponse> resp = seedlotsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Add new Seed Lot descriptions to a server
-     * Add new Seed Lot descriptions to a server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;SeedLotListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SeedLotListResponse> seedlotsPostWithHttpInfo(List<SeedLotNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = seedlotsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<SeedLotListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Add new Seed Lot descriptions to a server (asynchronously)
-     * Add new Seed Lot descriptions to a server
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call seedlotsPostAsync(List<SeedLotNewRequest> body, String authorization, final ApiCallback<SeedLotListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = seedlotsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SeedLotListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for seedlotsSeedLotDbIdGet
-     *
-     * @param seedLotDbId             Unique id for a seed lot on this server (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call seedlotsSeedLotDbIdGetCall(String seedLotDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/seedlots/{seedLotDbId}"
-                .replaceAll("\\{" + "seedLotDbId" + "}", apiClient.escapeString(seedLotDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call seedlotsSeedLotDbIdGetValidateBeforeCall(String seedLotDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'seedLotDbId' is set
-        if (seedLotDbId == null) {
-            throw new ApiException("Missing the required parameter 'seedLotDbId' when calling seedlotsSeedLotDbIdGet(Async)");
-        }
-
-        return seedlotsSeedLotDbIdGetCall(seedLotDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a specific Seed Lot
-     * Get a specific Seed Lot by seedLotDbId
-     *
-     * @param seedLotDbId   Unique id for a seed lot on this server (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return SeedLotSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SeedLotSingleResponse seedlotsSeedLotDbIdGet(String seedLotDbId, String authorization) throws ApiException {
-        ApiResponse<SeedLotSingleResponse> resp = seedlotsSeedLotDbIdGetWithHttpInfo(seedLotDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get a specific Seed Lot
-     * Get a specific Seed Lot by seedLotDbId
-     *
-     * @param seedLotDbId   Unique id for a seed lot on this server (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;SeedLotSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SeedLotSingleResponse> seedlotsSeedLotDbIdGetWithHttpInfo(String seedLotDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = seedlotsSeedLotDbIdGetValidateBeforeCall(seedLotDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<SeedLotSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a specific Seed Lot (asynchronously)
-     * Get a specific Seed Lot by seedLotDbId
-     *
-     * @param seedLotDbId   Unique id for a seed lot on this server (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call seedlotsSeedLotDbIdGetAsync(String seedLotDbId, String authorization, final ApiCallback<SeedLotSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = seedlotsSeedLotDbIdGetValidateBeforeCall(seedLotDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SeedLotSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for seedlotsSeedLotDbIdPut
-     *
-     * @param seedLotDbId             Unique id for a seed lot on this server (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call seedlotsSeedLotDbIdPutCall(String seedLotDbId, SeedLotNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/seedlots/{seedLotDbId}"
-                .replaceAll("\\{" + "seedLotDbId" + "}", apiClient.escapeString(seedLotDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call seedlotsSeedLotDbIdPutValidateBeforeCall(String seedLotDbId, SeedLotNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'seedLotDbId' is set
-        if (seedLotDbId == null) {
-            throw new ApiException("Missing the required parameter 'seedLotDbId' when calling seedlotsSeedLotDbIdPut(Async)");
-        }
-
-        return seedlotsSeedLotDbIdPutCall(seedLotDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update an existing Seed Lot
-     * Update an existing Seed Lot
-     *
-     * @param seedLotDbId   Unique id for a seed lot on this server (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return SeedLotSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SeedLotSingleResponse seedlotsSeedLotDbIdPut(String seedLotDbId, SeedLotNewRequest body, String authorization) throws ApiException {
-        ApiResponse<SeedLotSingleResponse> resp = seedlotsSeedLotDbIdPutWithHttpInfo(seedLotDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update an existing Seed Lot
-     * Update an existing Seed Lot
-     *
-     * @param seedLotDbId   Unique id for a seed lot on this server (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;SeedLotSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SeedLotSingleResponse> seedlotsSeedLotDbIdPutWithHttpInfo(String seedLotDbId, SeedLotNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = seedlotsSeedLotDbIdPutValidateBeforeCall(seedLotDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<SeedLotSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update an existing Seed Lot (asynchronously)
-     * Update an existing Seed Lot
-     *
-     * @param seedLotDbId   Unique id for a seed lot on this server (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call seedlotsSeedLotDbIdPutAsync(String seedLotDbId, SeedLotNewRequest body, String authorization, final ApiCallback<SeedLotSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = seedlotsSeedLotDbIdPutValidateBeforeCall(seedLotDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SeedLotSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for seedlotsSeedLotDbIdTransactionsGet
-     *
-     * @param seedLotDbId             Unique id for a seed lot on this server (required)
-     * @param transactionDbId         Unique id for a Transaction that has occurred (optional)
-     * @param transactionDirection    Filter results to only include transactions directed to the specific Seed Lot (TO), away from the specific Seed Lot (FROM), or both (BOTH). The default value for this parameter is BOTH (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call seedlotsSeedLotDbIdTransactionsGetCall(String seedLotDbId, String transactionDbId, String transactionDirection, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/seedlots/{seedLotDbId}/transactions"
-                .replaceAll("\\{" + "seedLotDbId" + "}", apiClient.escapeString(seedLotDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (transactionDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("transactionDbId", transactionDbId));
-        if (transactionDirection != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("transactionDirection", transactionDirection));
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call seedlotsSeedLotDbIdTransactionsGetValidateBeforeCall(String seedLotDbId, String transactionDbId, String transactionDirection, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'seedLotDbId' is set
-        if (seedLotDbId == null) {
-            throw new ApiException("Missing the required parameter 'seedLotDbId' when calling seedlotsSeedLotDbIdTransactionsGet(Async)");
-        }
-
-        return seedlotsSeedLotDbIdTransactionsGetCall(seedLotDbId, transactionDbId, transactionDirection, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get all Transactions related to a specific Seed Lot
-     * Get all Transactions related to a specific Seed Lot
-     *
-     * @param seedLotDbId          Unique id for a seed lot on this server (required)
-     * @param transactionDbId      Unique id for a Transaction that has occurred (optional)
-     * @param transactionDirection Filter results to only include transactions directed to the specific Seed Lot (TO), away from the specific Seed Lot (FROM), or both (BOTH). The default value for this parameter is BOTH (optional)
-     * @param page                 Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize             The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization        HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return SeedLotTransactionListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SeedLotTransactionListResponse seedlotsSeedLotDbIdTransactionsGet(String seedLotDbId, String transactionDbId, String transactionDirection, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<SeedLotTransactionListResponse> resp = seedlotsSeedLotDbIdTransactionsGetWithHttpInfo(seedLotDbId, transactionDbId, transactionDirection, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get all Transactions related to a specific Seed Lot
-     * Get all Transactions related to a specific Seed Lot
-     *
-     * @param seedLotDbId          Unique id for a seed lot on this server (required)
-     * @param transactionDbId      Unique id for a Transaction that has occurred (optional)
-     * @param transactionDirection Filter results to only include transactions directed to the specific Seed Lot (TO), away from the specific Seed Lot (FROM), or both (BOTH). The default value for this parameter is BOTH (optional)
-     * @param page                 Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize             The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization        HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;SeedLotTransactionListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SeedLotTransactionListResponse> seedlotsSeedLotDbIdTransactionsGetWithHttpInfo(String seedLotDbId, String transactionDbId, String transactionDirection, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = seedlotsSeedLotDbIdTransactionsGetValidateBeforeCall(seedLotDbId, transactionDbId, transactionDirection, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<SeedLotTransactionListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get all Transactions related to a specific Seed Lot (asynchronously)
-     * Get all Transactions related to a specific Seed Lot
-     *
-     * @param seedLotDbId          Unique id for a seed lot on this server (required)
-     * @param transactionDbId      Unique id for a Transaction that has occurred (optional)
-     * @param transactionDirection Filter results to only include transactions directed to the specific Seed Lot (TO), away from the specific Seed Lot (FROM), or both (BOTH). The default value for this parameter is BOTH (optional)
-     * @param page                 Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize             The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization        HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback             The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call seedlotsSeedLotDbIdTransactionsGetAsync(String seedLotDbId, String transactionDbId, String transactionDirection, Integer page, Integer pageSize, String authorization, final ApiCallback<SeedLotTransactionListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = seedlotsSeedLotDbIdTransactionsGetValidateBeforeCall(seedLotDbId, transactionDbId, transactionDirection, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SeedLotTransactionListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for seedlotsTransactionsGet
-     *
-     * @param transactionDbId         Unique id for a transaction on this server (optional)
-     * @param seedLotDbId             Unique id for a seed lot on this server (optional)
-     * @param crossDbId               Search for Cross with this unique id (optional)
-     * @param crossName               Search for Cross with this human readable name (optional)
-     * @param commonCropName          The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crop.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server. (optional)
-     * @param programDbId             Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param germplasmDbId           Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
-     * @param germplasmName           Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; by its human readable name.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
-     * @param externalReferenceID     **Deprecated in v2.1** Please use &#x60;externalReferenceId&#x60;. Github issue number #460  &lt;br&gt;An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
-     * @param externalReferenceId     An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
-     * @param externalReferenceSource An identifier for the source system or database of an external reference (use with &#x60;externalReferenceId&#x60; parameter) (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call seedlotsTransactionsGetCall(String transactionDbId, String seedLotDbId, String crossDbId, String crossName, String commonCropName, String programDbId, String germplasmDbId, String germplasmName, String externalReferenceID, String externalReferenceId, String externalReferenceSource, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/seedlots/transactions";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (transactionDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("transactionDbId", transactionDbId));
-        if (seedLotDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("seedLotDbId", seedLotDbId));
-        if (crossDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("crossDbId", crossDbId));
-        if (crossName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("crossName", crossName));
-        if (commonCropName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("commonCropName", commonCropName));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-        if (germplasmDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("germplasmDbId", germplasmDbId));
-        if (germplasmName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("germplasmName", germplasmName));
-        if (externalReferenceID != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceID", externalReferenceID));
-        if (externalReferenceId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceId", externalReferenceId));
-        if (externalReferenceSource != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("externalReferenceSource", externalReferenceSource));
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call seedlotsTransactionsGetValidateBeforeCall(String transactionDbId, String seedLotDbId, String crossDbId, String crossName, String commonCropName, String programDbId, String germplasmDbId, String germplasmName, String externalReferenceID, String externalReferenceId, String externalReferenceSource, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return seedlotsTransactionsGetCall(transactionDbId, seedLotDbId, crossDbId, crossName, commonCropName, programDbId, germplasmDbId, germplasmName, externalReferenceID, externalReferenceId, externalReferenceSource, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a filtered list of Seed Lot Transactions
-     * Get a filtered list of Seed Lot Transactions
-     *
-     * @param transactionDbId         Unique id for a transaction on this server (optional)
-     * @param seedLotDbId             Unique id for a seed lot on this server (optional)
-     * @param crossDbId               Search for Cross with this unique id (optional)
-     * @param crossName               Search for Cross with this human readable name (optional)
-     * @param commonCropName          The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crop.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server. (optional)
-     * @param programDbId             Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param germplasmDbId           Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
-     * @param germplasmName           Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; by its human readable name.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
-     * @param externalReferenceID     **Deprecated in v2.1** Please use &#x60;externalReferenceId&#x60;. Github issue number #460  &lt;br&gt;An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
-     * @param externalReferenceId     An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
-     * @param externalReferenceSource An identifier for the source system or database of an external reference (use with &#x60;externalReferenceId&#x60; parameter) (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return SeedLotTransactionListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SeedLotTransactionListResponse seedlotsTransactionsGet(String transactionDbId, String seedLotDbId, String crossDbId, String crossName, String commonCropName, String programDbId, String germplasmDbId, String germplasmName, String externalReferenceID, String externalReferenceId, String externalReferenceSource, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<SeedLotTransactionListResponse> resp = seedlotsTransactionsGetWithHttpInfo(transactionDbId, seedLotDbId, crossDbId, crossName, commonCropName, programDbId, germplasmDbId, germplasmName, externalReferenceID, externalReferenceId, externalReferenceSource, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get a filtered list of Seed Lot Transactions
-     * Get a filtered list of Seed Lot Transactions
-     *
-     * @param transactionDbId         Unique id for a transaction on this server (optional)
-     * @param seedLotDbId             Unique id for a seed lot on this server (optional)
-     * @param crossDbId               Search for Cross with this unique id (optional)
-     * @param crossName               Search for Cross with this human readable name (optional)
-     * @param commonCropName          The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crop.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server. (optional)
-     * @param programDbId             Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param germplasmDbId           Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
-     * @param germplasmName           Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; by its human readable name.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
-     * @param externalReferenceID     **Deprecated in v2.1** Please use &#x60;externalReferenceId&#x60;. Github issue number #460  &lt;br&gt;An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
-     * @param externalReferenceId     An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
-     * @param externalReferenceSource An identifier for the source system or database of an external reference (use with &#x60;externalReferenceId&#x60; parameter) (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;SeedLotTransactionListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SeedLotTransactionListResponse> seedlotsTransactionsGetWithHttpInfo(String transactionDbId, String seedLotDbId, String crossDbId, String crossName, String commonCropName, String programDbId, String germplasmDbId, String germplasmName, String externalReferenceID, String externalReferenceId, String externalReferenceSource, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = seedlotsTransactionsGetValidateBeforeCall(transactionDbId, seedLotDbId, crossDbId, crossName, commonCropName, programDbId, germplasmDbId, germplasmName, externalReferenceID, externalReferenceId, externalReferenceSource, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<SeedLotTransactionListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a filtered list of Seed Lot Transactions (asynchronously)
-     * Get a filtered list of Seed Lot Transactions
-     *
-     * @param transactionDbId         Unique id for a transaction on this server (optional)
-     * @param seedLotDbId             Unique id for a seed lot on this server (optional)
-     * @param crossDbId               Search for Cross with this unique id (optional)
-     * @param crossName               Search for Cross with this human readable name (optional)
-     * @param commonCropName          The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crop.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server. (optional)
-     * @param programDbId             Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param germplasmDbId           Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
-     * @param germplasmName           Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; by its human readable name.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
-     * @param externalReferenceID     **Deprecated in v2.1** Please use &#x60;externalReferenceId&#x60;. Github issue number #460  &lt;br&gt;An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
-     * @param externalReferenceId     An external reference ID. Could be a simple string or a URI. (use with &#x60;externalReferenceSource&#x60; parameter) (optional)
-     * @param externalReferenceSource An identifier for the source system or database of an external reference (use with &#x60;externalReferenceId&#x60; parameter) (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback                The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call seedlotsTransactionsGetAsync(String transactionDbId, String seedLotDbId, String crossDbId, String crossName, String commonCropName, String programDbId, String germplasmDbId, String germplasmName, String externalReferenceID, String externalReferenceId, String externalReferenceSource, Integer page, Integer pageSize, String authorization, final ApiCallback<SeedLotTransactionListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = seedlotsTransactionsGetValidateBeforeCall(transactionDbId, seedLotDbId, crossDbId, crossName, commonCropName, programDbId, germplasmDbId, germplasmName, externalReferenceID, externalReferenceId, externalReferenceSource, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SeedLotTransactionListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for seedlotsTransactionsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call seedlotsTransactionsPostCall(List<SeedLotTransactionNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/seedlots/transactions";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call seedlotsTransactionsPostValidateBeforeCall(List<SeedLotTransactionNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return seedlotsTransactionsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Add new Seed Lot Transaction to be recorded
-     * Add new Seed Lot Transaction to be recorded
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return SeedLotTransactionListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public SeedLotTransactionListResponse seedlotsTransactionsPost(List<SeedLotTransactionNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<SeedLotTransactionListResponse> resp = seedlotsTransactionsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Add new Seed Lot Transaction to be recorded
-     * Add new Seed Lot Transaction to be recorded
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;SeedLotTransactionListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<SeedLotTransactionListResponse> seedlotsTransactionsPostWithHttpInfo(List<SeedLotTransactionNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = seedlotsTransactionsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<SeedLotTransactionListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Add new Seed Lot Transaction to be recorded (asynchronously)
-     * Add new Seed Lot Transaction to be recorded
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call seedlotsTransactionsPostAsync(List<SeedLotTransactionNewRequest> body, String authorization, final ApiCallback<SeedLotTransactionListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = seedlotsTransactionsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<SeedLotTransactionListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/EventsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/EventsApi.java
deleted file mode 100644
index 78c215d5..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/EventsApi.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.phenotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.phenotype.EventQueryParams;
-import org.brapi.model.v21.phenotype.EventsResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class EventsApi {
-    private ApiClient apiClient;
-
-    public EventsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public EventsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for eventsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call eventsGetCall(EventQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/events";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call eventsGetValidateBeforeCall(EventQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return eventsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Events
-     * Get list of events
-     *
-     * @return EventsResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public EventsResponse eventsGet(EventQueryParams queryParams) throws ApiException {
-        ApiResponse<EventsResponse> resp = eventsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Events
-     * Get list of events
-     *
-     * @return ApiResponse&lt;EventsResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<EventsResponse> eventsGetWithHttpInfo(EventQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = eventsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<EventsResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Events (asynchronously)
-     * Get list of events
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call eventsGetAsync(EventQueryParams queryParams, final ApiCallback<EventsResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = eventsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<EventsResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ImagesApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ImagesApi.java
deleted file mode 100644
index 471d542b..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ImagesApi.java
+++ /dev/null
@@ -1,991 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.phenotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.phenotype.ImageQueryParams;
-import org.brapi.model.v21.phenotype.*;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ImagesApi {
-    private ApiClient apiClient;
-
-    public ImagesApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public ImagesApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for deleteImagesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call deleteImagesPostCall(ImageSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/delete/images";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call deleteImagesPostValidateBeforeCall(ImageSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return deleteImagesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a delete request for &#x60;Images&#x60;
-     * Submit a delete request for &#x60;Images&#x60;
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ImageDeleteResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ImageDeleteResponse deleteImagesPost(ImageSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<ImageDeleteResponse> resp = deleteImagesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a delete request for &#x60;Images&#x60;
-     * Submit a delete request for &#x60;Images&#x60;
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ImageDeleteResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ImageDeleteResponse> deleteImagesPostWithHttpInfo(ImageSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = deleteImagesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ImageDeleteResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a delete request for &#x60;Images&#x60; (asynchronously)
-     * Submit a delete request for &#x60;Images&#x60;
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call deleteImagesPostAsync(ImageSearchRequest body, String authorization, final ApiCallback<ImageDeleteResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = deleteImagesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ImageDeleteResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for imagesGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call imagesGetCall(ImageQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/images";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call imagesGetValidateBeforeCall(ImageQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return imagesGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the image metadata summaries
-     * Get filtered set of image metadata  Implementation Notes  - &#x27;&#x27;imageURL&#x27;&#x27; should be a complete URL describing the location of the image. There is no BrAPI call for  retrieving the image content, so it could be on a different path, or a different host.  - &#x27;&#x27;descriptiveOntologyTerm&#x27;&#x27; can be thought of as Tags for the image. These could be simple descriptive  words, or ontology references, or full ontology URI&#x27;&#x27;s.
-     *
-     * @return ImageListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ImageListResponse imagesGet(ImageQueryParams queryParams) throws ApiException {
-        ApiResponse<ImageListResponse> resp = imagesGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get the image metadata summaries
-     * Get filtered set of image metadata  Implementation Notes  - &#x27;&#x27;imageURL&#x27;&#x27; should be a complete URL describing the location of the image. There is no BrAPI call for  retrieving the image content, so it could be on a different path, or a different host.  - &#x27;&#x27;descriptiveOntologyTerm&#x27;&#x27; can be thought of as Tags for the image. These could be simple descriptive  words, or ontology references, or full ontology URI&#x27;&#x27;s.
-     *
-     * @return ApiResponse&lt;ImageListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ImageListResponse> imagesGetWithHttpInfo(ImageQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = imagesGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<ImageListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the image metadata summaries (asynchronously)
-     * Get filtered set of image metadata  Implementation Notes  - &#x27;&#x27;imageURL&#x27;&#x27; should be a complete URL describing the location of the image. There is no BrAPI call for  retrieving the image content, so it could be on a different path, or a different host.  - &#x27;&#x27;descriptiveOntologyTerm&#x27;&#x27; can be thought of as Tags for the image. These could be simple descriptive  words, or ontology references, or full ontology URI&#x27;&#x27;s.
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call imagesGetAsync(ImageQueryParams queryParams, final ApiCallback<ImageListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = imagesGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ImageListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for imagesImageDbIdGet
-     *
-     * @param imageDbId               The unique identifier for a image (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call imagesImageDbIdGetCall(String imageDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/images/{imageDbId}"
-                .replaceAll("\\{" + "imageDbId" + "}", apiClient.escapeString(imageDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call imagesImageDbIdGetValidateBeforeCall(String imageDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'imageDbId' is set
-        if (imageDbId == null) {
-            throw new ApiException("Missing the required parameter 'imageDbId' when calling imagesImageDbIdGet(Async)");
-        }
-
-        return imagesImageDbIdGetCall(imageDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the an image metadata summary
-     * Get one image metadata object  Implementation Notes  - &#x27;&#x27;imageURL&#x27;&#x27; should be a complete URL describing the location of the image. There is no BrAPI call for  retrieving the image content, so it could be on a different path, or a different host.  - &#x27;&#x27;descriptiveOntologyTerm&#x27;&#x27; can be thought of as Tags for the image. These could be simple descriptive  words, or ontology references, or full ontology URI&#x27;&#x27;s.
-     *
-     * @param imageDbId     The unique identifier for a image (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ImageSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ImageSingleResponse imagesImageDbIdGet(String imageDbId, String authorization) throws ApiException {
-        ApiResponse<ImageSingleResponse> resp = imagesImageDbIdGetWithHttpInfo(imageDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the an image metadata summary
-     * Get one image metadata object  Implementation Notes  - &#x27;&#x27;imageURL&#x27;&#x27; should be a complete URL describing the location of the image. There is no BrAPI call for  retrieving the image content, so it could be on a different path, or a different host.  - &#x27;&#x27;descriptiveOntologyTerm&#x27;&#x27; can be thought of as Tags for the image. These could be simple descriptive  words, or ontology references, or full ontology URI&#x27;&#x27;s.
-     *
-     * @param imageDbId     The unique identifier for a image (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ImageSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ImageSingleResponse> imagesImageDbIdGetWithHttpInfo(String imageDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = imagesImageDbIdGetValidateBeforeCall(imageDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ImageSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the an image metadata summary (asynchronously)
-     * Get one image metadata object  Implementation Notes  - &#x27;&#x27;imageURL&#x27;&#x27; should be a complete URL describing the location of the image. There is no BrAPI call for  retrieving the image content, so it could be on a different path, or a different host.  - &#x27;&#x27;descriptiveOntologyTerm&#x27;&#x27; can be thought of as Tags for the image. These could be simple descriptive  words, or ontology references, or full ontology URI&#x27;&#x27;s.
-     *
-     * @param imageDbId     The unique identifier for a image (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call imagesImageDbIdGetAsync(String imageDbId, String authorization, final ApiCallback<ImageSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = imagesImageDbIdGetValidateBeforeCall(imageDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ImageSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for imagesImageDbIdImagecontentPut
-     *
-     * @param imageDbId               The unique identifier for an image (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call imagesImageDbIdImagecontentPutCall(String imageDbId, Object body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/images/{imageDbId}/imagecontent"
-                .replaceAll("\\{" + "imageDbId" + "}", apiClient.escapeString(imageDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "image/_*"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call imagesImageDbIdImagecontentPutValidateBeforeCall(String imageDbId, Object body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'imageDbId' is set
-        if (imageDbId == null) {
-            throw new ApiException("Missing the required parameter 'imageDbId' when calling imagesImageDbIdImagecontentPut(Async)");
-        }
-
-        return imagesImageDbIdImagecontentPutCall(imageDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Attach an image binary file to an existing image metadata record
-     * This endpoint is used to attach an image binary file to an existing image metadata record. All of the other Images endpoints  deal with the JSON for image metadata, but &#x27;PUT /images/{imageDbId}/imagecontent&#x27; allows you to send any binary file with a Content  Type (MIME) of image/_*. When the real image is uploaded, the server may choose to update some of the metadata to reflect the  reality of the image that was uploaded, and should respond with the updated JSON.  Implementation Notes  - This endpoint should be implemented with &#x27;POST /images&#x27; for full image upload capability  - This endpoint should be implemented with &#x27;PUT /images/{imageDbId}&#x27; for full image update capability  - A server may choose to modify the image metadata object based on the actually image which has been uploaded by this endpoint.   - Image data may be stored in a database or file system. Servers should generate and provide the \&quot;imageURL\&quot; for retrieving the    image binary file.   An example use case is available on the BrAPI Wiki -&gt; https://wiki.brapi.org/index.php/Image_Upload
-     *
-     * @param imageDbId     The unique identifier for an image (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ImageSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ImageSingleResponse imagesImageDbIdImagecontentPut(String imageDbId, Object body, String authorization) throws ApiException {
-        ApiResponse<ImageSingleResponse> resp = imagesImageDbIdImagecontentPutWithHttpInfo(imageDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Attach an image binary file to an existing image metadata record
-     * This endpoint is used to attach an image binary file to an existing image metadata record. All of the other Images endpoints  deal with the JSON for image metadata, but &#x27;PUT /images/{imageDbId}/imagecontent&#x27; allows you to send any binary file with a Content  Type (MIME) of image/_*. When the real image is uploaded, the server may choose to update some of the metadata to reflect the  reality of the image that was uploaded, and should respond with the updated JSON.  Implementation Notes  - This endpoint should be implemented with &#x27;POST /images&#x27; for full image upload capability  - This endpoint should be implemented with &#x27;PUT /images/{imageDbId}&#x27; for full image update capability  - A server may choose to modify the image metadata object based on the actually image which has been uploaded by this endpoint.   - Image data may be stored in a database or file system. Servers should generate and provide the \&quot;imageURL\&quot; for retrieving the    image binary file.   An example use case is available on the BrAPI Wiki -&gt; https://wiki.brapi.org/index.php/Image_Upload
-     *
-     * @param imageDbId     The unique identifier for an image (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ImageSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ImageSingleResponse> imagesImageDbIdImagecontentPutWithHttpInfo(String imageDbId, Object body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = imagesImageDbIdImagecontentPutValidateBeforeCall(imageDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ImageSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Attach an image binary file to an existing image metadata record (asynchronously)
-     * This endpoint is used to attach an image binary file to an existing image metadata record. All of the other Images endpoints  deal with the JSON for image metadata, but &#x27;PUT /images/{imageDbId}/imagecontent&#x27; allows you to send any binary file with a Content  Type (MIME) of image/_*. When the real image is uploaded, the server may choose to update some of the metadata to reflect the  reality of the image that was uploaded, and should respond with the updated JSON.  Implementation Notes  - This endpoint should be implemented with &#x27;POST /images&#x27; for full image upload capability  - This endpoint should be implemented with &#x27;PUT /images/{imageDbId}&#x27; for full image update capability  - A server may choose to modify the image metadata object based on the actually image which has been uploaded by this endpoint.   - Image data may be stored in a database or file system. Servers should generate and provide the \&quot;imageURL\&quot; for retrieving the    image binary file.   An example use case is available on the BrAPI Wiki -&gt; https://wiki.brapi.org/index.php/Image_Upload
-     *
-     * @param imageDbId     The unique identifier for an image (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call imagesImageDbIdImagecontentPutAsync(String imageDbId, Object body, String authorization, final ApiCallback<ImageSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = imagesImageDbIdImagecontentPutValidateBeforeCall(imageDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ImageSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for imagesImageDbIdPut
-     *
-     * @param imageDbId               The unique identifier for a image (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call imagesImageDbIdPutCall(String imageDbId, ImageNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/images/{imageDbId}"
-                .replaceAll("\\{" + "imageDbId" + "}", apiClient.escapeString(imageDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call imagesImageDbIdPutValidateBeforeCall(String imageDbId, ImageNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'imageDbId' is set
-        if (imageDbId == null) {
-            throw new ApiException("Missing the required parameter 'imageDbId' when calling imagesImageDbIdPut(Async)");
-        }
-
-        return imagesImageDbIdPutCall(imageDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update an existing image metadata record
-     * Update an existing image metadata record  Implementation Notes  - This endpoint should be implemented with &#x27;PUT /images/{imageDbId}/imagecontent&#x27; for full image update capability  - A server may choose to modify the image metadata object based on the actually image which has been uploaded.   - Image data may be stored in a database or file system. Servers should generate and provide the \&quot;imageURL\&quot; as an  absolute path for retrieving the image, wherever it happens to live.   - &#x27;descriptiveOntologyTerm&#x27; can be thought of as Tags for the image. These could be simple descriptive words, or  ontology references, or full ontology URI&#x27;s.   - The &#x27;/images&#x27; calls support a GeoJSON object structure for describing their location. The BrAPI spec for GeoJSON  only supports two of the possible geometries; Points and Polygons.   - With most images, the Point geometry should be used, and it should indicate the longitude and latitude of the camera.   - For top down images (ie from drones, cranes, etc), the Point geometry may be used to indicate the longitude and  latitude of the centroid of the image content, and the Polygon geometry may be used to indicate the border of the  image content.  An example use case is available on the BrAPI Wiki -&gt; https://wiki.brapi.org/index.php/Image_Upload
-     *
-     * @param imageDbId     The unique identifier for a image (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ImageSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ImageSingleResponse imagesImageDbIdPut(String imageDbId, ImageNewRequest body, String authorization) throws ApiException {
-        ApiResponse<ImageSingleResponse> resp = imagesImageDbIdPutWithHttpInfo(imageDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update an existing image metadata record
-     * Update an existing image metadata record  Implementation Notes  - This endpoint should be implemented with &#x27;PUT /images/{imageDbId}/imagecontent&#x27; for full image update capability  - A server may choose to modify the image metadata object based on the actually image which has been uploaded.   - Image data may be stored in a database or file system. Servers should generate and provide the \&quot;imageURL\&quot; as an  absolute path for retrieving the image, wherever it happens to live.   - &#x27;descriptiveOntologyTerm&#x27; can be thought of as Tags for the image. These could be simple descriptive words, or  ontology references, or full ontology URI&#x27;s.   - The &#x27;/images&#x27; calls support a GeoJSON object structure for describing their location. The BrAPI spec for GeoJSON  only supports two of the possible geometries; Points and Polygons.   - With most images, the Point geometry should be used, and it should indicate the longitude and latitude of the camera.   - For top down images (ie from drones, cranes, etc), the Point geometry may be used to indicate the longitude and  latitude of the centroid of the image content, and the Polygon geometry may be used to indicate the border of the  image content.  An example use case is available on the BrAPI Wiki -&gt; https://wiki.brapi.org/index.php/Image_Upload
-     *
-     * @param imageDbId     The unique identifier for a image (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ImageSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ImageSingleResponse> imagesImageDbIdPutWithHttpInfo(String imageDbId, ImageNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = imagesImageDbIdPutValidateBeforeCall(imageDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ImageSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update an existing image metadata record (asynchronously)
-     * Update an existing image metadata record  Implementation Notes  - This endpoint should be implemented with &#x27;PUT /images/{imageDbId}/imagecontent&#x27; for full image update capability  - A server may choose to modify the image metadata object based on the actually image which has been uploaded.   - Image data may be stored in a database or file system. Servers should generate and provide the \&quot;imageURL\&quot; as an  absolute path for retrieving the image, wherever it happens to live.   - &#x27;descriptiveOntologyTerm&#x27; can be thought of as Tags for the image. These could be simple descriptive words, or  ontology references, or full ontology URI&#x27;s.   - The &#x27;/images&#x27; calls support a GeoJSON object structure for describing their location. The BrAPI spec for GeoJSON  only supports two of the possible geometries; Points and Polygons.   - With most images, the Point geometry should be used, and it should indicate the longitude and latitude of the camera.   - For top down images (ie from drones, cranes, etc), the Point geometry may be used to indicate the longitude and  latitude of the centroid of the image content, and the Polygon geometry may be used to indicate the border of the  image content.  An example use case is available on the BrAPI Wiki -&gt; https://wiki.brapi.org/index.php/Image_Upload
-     *
-     * @param imageDbId     The unique identifier for a image (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call imagesImageDbIdPutAsync(String imageDbId, ImageNewRequest body, String authorization, final ApiCallback<ImageSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = imagesImageDbIdPutValidateBeforeCall(imageDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ImageSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for imagesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call imagesPostCall(List<ImageNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/images";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call imagesPostValidateBeforeCall(List<ImageNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return imagesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Create new image metadata records
-     * Create new image metadata records  Implementation Notes  - This endpoint should be implemented with &#x27;PUT /images/{imageDbId}/imagecontent&#x27; for full image upload capability  - &#x27;&#x27;imageURL&#x27;&#x27; should be a complete URL describing the location of the image. There is no BrAPI call for retrieving  the image content, so it could be on a different path, or a different host.  - &#x27;&#x27;descriptiveOntologyTerm&#x27;&#x27; can be thought of as Tags for the image. These could be simple descriptive words, or  ontology references, or full ontology URI&#x27;s.  - The &#x27;/images&#x27; calls support a GeoJSON object structure for describing their location. The BrAPI spec for GeoJSON  only supports two of the possible geometries; Points and Polygons.  - With most images, the Point geometry should be used, and it should indicate the longitude and latitude of the camera.  - For top down images (ie from drones, cranes, etc), the Point geometry may be used to indicate the longitude and  latitude of the centroid of the image content, and the Polygon geometry may be used to indicate the border of the  image content.  An example use case is available on the BrAPI Wiki -&gt; https://wiki.brapi.org/index.php/Image_Upload
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ImageListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ImageListResponse imagesPost(List<ImageNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<ImageListResponse> resp = imagesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Create new image metadata records
-     * Create new image metadata records  Implementation Notes  - This endpoint should be implemented with &#x27;PUT /images/{imageDbId}/imagecontent&#x27; for full image upload capability  - &#x27;&#x27;imageURL&#x27;&#x27; should be a complete URL describing the location of the image. There is no BrAPI call for retrieving  the image content, so it could be on a different path, or a different host.  - &#x27;&#x27;descriptiveOntologyTerm&#x27;&#x27; can be thought of as Tags for the image. These could be simple descriptive words, or  ontology references, or full ontology URI&#x27;s.  - The &#x27;/images&#x27; calls support a GeoJSON object structure for describing their location. The BrAPI spec for GeoJSON  only supports two of the possible geometries; Points and Polygons.  - With most images, the Point geometry should be used, and it should indicate the longitude and latitude of the camera.  - For top down images (ie from drones, cranes, etc), the Point geometry may be used to indicate the longitude and  latitude of the centroid of the image content, and the Polygon geometry may be used to indicate the border of the  image content.  An example use case is available on the BrAPI Wiki -&gt; https://wiki.brapi.org/index.php/Image_Upload
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ImageListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ImageListResponse> imagesPostWithHttpInfo(List<ImageNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = imagesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ImageListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Create new image metadata records (asynchronously)
-     * Create new image metadata records  Implementation Notes  - This endpoint should be implemented with &#x27;PUT /images/{imageDbId}/imagecontent&#x27; for full image upload capability  - &#x27;&#x27;imageURL&#x27;&#x27; should be a complete URL describing the location of the image. There is no BrAPI call for retrieving  the image content, so it could be on a different path, or a different host.  - &#x27;&#x27;descriptiveOntologyTerm&#x27;&#x27; can be thought of as Tags for the image. These could be simple descriptive words, or  ontology references, or full ontology URI&#x27;s.  - The &#x27;/images&#x27; calls support a GeoJSON object structure for describing their location. The BrAPI spec for GeoJSON  only supports two of the possible geometries; Points and Polygons.  - With most images, the Point geometry should be used, and it should indicate the longitude and latitude of the camera.  - For top down images (ie from drones, cranes, etc), the Point geometry may be used to indicate the longitude and  latitude of the centroid of the image content, and the Polygon geometry may be used to indicate the border of the  image content.  An example use case is available on the BrAPI Wiki -&gt; https://wiki.brapi.org/index.php/Image_Upload
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call imagesPostAsync(List<ImageNewRequest> body, String authorization, final ApiCallback<ImageListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = imagesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ImageListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchImagesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchImagesPostCall(SearchImagesBody body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/images";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchImagesPostValidateBeforeCall(SearchImagesBody body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchImagesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;XXEntitiesXX&#x60;
-     * Submit a search request for &#x60;XXEntitiesXX&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/XXEntitiesXX/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details. &lt;br/&gt; &lt;br/&gt; Image Implementation Notes&lt;br/&gt; - &#x60;imageURL&#x60; should be a complete URL describing the location of the image. There is no BrAPI call for retrieving the image content, so it could be on a different path, or a different host.&lt;br/&gt; - &#x60;descriptiveOntologyTerm&#x60; can be thought of as Tags for the image. These could be simple descriptive words, or ontology references, or full ontology URI&#x27;s.&lt;br/&gt;
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ImageListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ImageListResponse searchImagesPost(SearchImagesBody body, String authorization) throws ApiException {
-        ApiResponse<ImageListResponse> resp = searchImagesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;XXEntitiesXX&#x60;
-     * Submit a search request for &#x60;XXEntitiesXX&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/XXEntitiesXX/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details. &lt;br/&gt; &lt;br/&gt; Image Implementation Notes&lt;br/&gt; - &#x60;imageURL&#x60; should be a complete URL describing the location of the image. There is no BrAPI call for retrieving the image content, so it could be on a different path, or a different host.&lt;br/&gt; - &#x60;descriptiveOntologyTerm&#x60; can be thought of as Tags for the image. These could be simple descriptive words, or ontology references, or full ontology URI&#x27;s.&lt;br/&gt;
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ImageListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ImageListResponse> searchImagesPostWithHttpInfo(SearchImagesBody body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchImagesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ImageListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;XXEntitiesXX&#x60; (asynchronously)
-     * Submit a search request for &#x60;XXEntitiesXX&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/XXEntitiesXX/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details. &lt;br/&gt; &lt;br/&gt; Image Implementation Notes&lt;br/&gt; - &#x60;imageURL&#x60; should be a complete URL describing the location of the image. There is no BrAPI call for retrieving the image content, so it could be on a different path, or a different host.&lt;br/&gt; - &#x60;descriptiveOntologyTerm&#x60; can be thought of as Tags for the image. These could be simple descriptive words, or ontology references, or full ontology URI&#x27;s.&lt;br/&gt;
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchImagesPostAsync(SearchImagesBody body, String authorization, final ApiCallback<ImageListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchImagesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ImageListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchImagesSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchImagesSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/images/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchImagesSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchImagesSearchResultsDbIdGet(Async)");
-        }
-
-        return searchImagesSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;Images&#x60; search request
-     * Get the results of a &#x60;Images&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/images&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details. &lt;br/&gt; &lt;br/&gt; Image Implementation Notes&lt;br/&gt; - &#x60;imageURL&#x60; should be a complete URL describing the location of the image. There is no BrAPI call for retrieving the image content, so it could be on a different path, or a different host.&lt;br/&gt; - &#x60;descriptiveOntologyTerm&#x60; can be thought of as Tags for the image. These could be simple descriptive words, or ontology references, or full ontology URI&#x27;s.&lt;br/&gt;
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ImageListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ImageListResponse searchImagesSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<ImageListResponse> resp = searchImagesSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;Images&#x60; search request
-     * Get the results of a &#x60;Images&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/images&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details. &lt;br/&gt; &lt;br/&gt; Image Implementation Notes&lt;br/&gt; - &#x60;imageURL&#x60; should be a complete URL describing the location of the image. There is no BrAPI call for retrieving the image content, so it could be on a different path, or a different host.&lt;br/&gt; - &#x60;descriptiveOntologyTerm&#x60; can be thought of as Tags for the image. These could be simple descriptive words, or ontology references, or full ontology URI&#x27;s.&lt;br/&gt;
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ImageListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ImageListResponse> searchImagesSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchImagesSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ImageListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;Images&#x60; search request (asynchronously)
-     * Get the results of a &#x60;Images&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/images&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details. &lt;br/&gt; &lt;br/&gt; Image Implementation Notes&lt;br/&gt; - &#x60;imageURL&#x60; should be a complete URL describing the location of the image. There is no BrAPI call for retrieving the image content, so it could be on a different path, or a different host.&lt;br/&gt; - &#x60;descriptiveOntologyTerm&#x60; can be thought of as Tags for the image. These could be simple descriptive words, or ontology references, or full ontology URI&#x27;s.&lt;br/&gt;
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchImagesSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<ImageListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchImagesSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ImageListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/MethodsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/MethodsApi.java
deleted file mode 100644
index 0d6389c6..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/MethodsApi.java
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.phenotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.phenotype.MethodQueryParams;
-import org.brapi.model.v21.phenotype.MethodBaseClass;
-import org.brapi.model.v21.phenotype.MethodListResponse;
-import org.brapi.model.v21.phenotype.MethodNewRequest;
-import org.brapi.model.v21.phenotype.MethodSingleResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class MethodsApi {
-    private ApiClient apiClient;
-
-    public MethodsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public MethodsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for methodsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call methodsGetCall(MethodQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/methods";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call methodsGetValidateBeforeCall(MethodQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return methodsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Methods
-     * Returns a list of Methods available on a server.  An Observation Variable has 3 critical parts; A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.&#x27;
-     *
-     * @return MethodListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public MethodListResponse methodsGet(MethodQueryParams queryParams) throws ApiException {
-        ApiResponse<MethodListResponse> resp = methodsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Methods
-     * Returns a list of Methods available on a server.  An Observation Variable has 3 critical parts; A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.&#x27;
-     *
-     * @return ApiResponse&lt;MethodListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<MethodListResponse> methodsGetWithHttpInfo(MethodQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = methodsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<MethodListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Methods (asynchronously)
-     * Returns a list of Methods available on a server.  An Observation Variable has 3 critical parts; A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.&#x27;
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call methodsGetAsync(MethodQueryParams queryParams, final ApiCallback<MethodListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = methodsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<MethodListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for methodsMethodDbIdGet
-     *
-     * @param methodDbId              Id of the method to retrieve details of. (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call methodsMethodDbIdGetCall(String methodDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/methods/{methodDbId}"
-                .replaceAll("\\{" + "methodDbId" + "}", apiClient.escapeString(methodDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call methodsMethodDbIdGetValidateBeforeCall(String methodDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'methodDbId' is set
-        if (methodDbId == null) {
-            throw new ApiException("Missing the required parameter 'methodDbId' when calling methodsMethodDbIdGet(Async)");
-        }
-
-        return methodsMethodDbIdGetCall(methodDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details for a specific Method
-     * Retrieve details about a specific method  An Observation Variable has 3 critical parts; A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.
-     *
-     * @param methodDbId    Id of the method to retrieve details of. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return MethodSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public MethodSingleResponse methodsMethodDbIdGet(String methodDbId, String authorization) throws ApiException {
-        ApiResponse<MethodSingleResponse> resp = methodsMethodDbIdGetWithHttpInfo(methodDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details for a specific Method
-     * Retrieve details about a specific method  An Observation Variable has 3 critical parts; A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.
-     *
-     * @param methodDbId    Id of the method to retrieve details of. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;MethodSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<MethodSingleResponse> methodsMethodDbIdGetWithHttpInfo(String methodDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = methodsMethodDbIdGetValidateBeforeCall(methodDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<MethodSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details for a specific Method (asynchronously)
-     * Retrieve details about a specific method  An Observation Variable has 3 critical parts; A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.
-     *
-     * @param methodDbId    Id of the method to retrieve details of. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call methodsMethodDbIdGetAsync(String methodDbId, String authorization, final ApiCallback<MethodSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = methodsMethodDbIdGetValidateBeforeCall(methodDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<MethodSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for methodsMethodDbIdPut
-     *
-     * @param methodDbId              Id of the method to retrieve details of. (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call methodsMethodDbIdPutCall(String methodDbId, MethodBaseClass body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/methods/{methodDbId}"
-                .replaceAll("\\{" + "methodDbId" + "}", apiClient.escapeString(methodDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call methodsMethodDbIdPutValidateBeforeCall(String methodDbId, MethodBaseClass body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'methodDbId' is set
-        if (methodDbId == null) {
-            throw new ApiException("Missing the required parameter 'methodDbId' when calling methodsMethodDbIdPut(Async)");
-        }
-
-        return methodsMethodDbIdPutCall(methodDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update an existing Method
-     * Update the details of an existing method
-     *
-     * @param methodDbId    Id of the method to retrieve details of. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return MethodSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public MethodSingleResponse methodsMethodDbIdPut(String methodDbId, MethodBaseClass body, String authorization) throws ApiException {
-        ApiResponse<MethodSingleResponse> resp = methodsMethodDbIdPutWithHttpInfo(methodDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update an existing Method
-     * Update the details of an existing method
-     *
-     * @param methodDbId    Id of the method to retrieve details of. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;MethodSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<MethodSingleResponse> methodsMethodDbIdPutWithHttpInfo(String methodDbId, MethodBaseClass body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = methodsMethodDbIdPutValidateBeforeCall(methodDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<MethodSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update an existing Method (asynchronously)
-     * Update the details of an existing method
-     *
-     * @param methodDbId    Id of the method to retrieve details of. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call methodsMethodDbIdPutAsync(String methodDbId, MethodBaseClass body, String authorization, final ApiCallback<MethodSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = methodsMethodDbIdPutValidateBeforeCall(methodDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<MethodSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for methodsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call methodsPostCall(List<MethodNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/methods";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call methodsPostValidateBeforeCall(List<MethodNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return methodsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Add new Methods
-     * Create new method objects in the database
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return MethodListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public MethodListResponse methodsPost(List<MethodNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<MethodListResponse> resp = methodsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Add new Methods
-     * Create new method objects in the database
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;MethodListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<MethodListResponse> methodsPostWithHttpInfo(List<MethodNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = methodsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<MethodListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Add new Methods (asynchronously)
-     * Create new method objects in the database
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call methodsPostAsync(List<MethodNewRequest> body, String authorization, final ApiCallback<MethodListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = methodsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<MethodListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ObservationUnitsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ObservationUnitsApi.java
deleted file mode 100644
index 3f4a82ce..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ObservationUnitsApi.java
+++ /dev/null
@@ -1,1223 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.phenotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.phenotype.ObservationUnitQueryParams;
-import org.brapi.model.v21.phenotype.*;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ObservationUnitsApi {
-    private ApiClient apiClient;
-
-    public ObservationUnitsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public ObservationUnitsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for observationlevelsGet
-     *
-     * @param programDbId             Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param trialDbId               Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
-     * @param studyDbId               Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call observationlevelsGetCall(String programDbId, String trialDbId, String studyDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/observationlevels";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-        if (trialDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("trialDbId", trialDbId));
-        if (studyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("studyDbId", studyDbId));
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call observationlevelsGetValidateBeforeCall(String programDbId, String trialDbId, String studyDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return observationlevelsGetCall(programDbId, trialDbId, studyDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Observation Levels
-     * Call to retrieve the list of supported observation levels.   Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60; defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are at the bottom of the hierarchy (ie plant &gt; 6).   The values are used to supply the &#x60;observationLevel&#x60; parameter in the observation unit details call.        For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @param programDbId   Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param trialDbId     Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
-     * @param studyDbId     Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationLevelListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationLevelListResponse observationlevelsGet(String programDbId, String trialDbId, String studyDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<ObservationLevelListResponse> resp = observationlevelsGetWithHttpInfo(programDbId, trialDbId, studyDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Observation Levels
-     * Call to retrieve the list of supported observation levels.   Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60; defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are at the bottom of the hierarchy (ie plant &gt; 6).   The values are used to supply the &#x60;observationLevel&#x60; parameter in the observation unit details call.        For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @param programDbId   Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param trialDbId     Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
-     * @param studyDbId     Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationLevelListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationLevelListResponse> observationlevelsGetWithHttpInfo(String programDbId, String trialDbId, String studyDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = observationlevelsGetValidateBeforeCall(programDbId, trialDbId, studyDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationLevelListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Observation Levels (asynchronously)
-     * Call to retrieve the list of supported observation levels.   Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60; defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are at the bottom of the hierarchy (ie plant &gt; 6).   The values are used to supply the &#x60;observationLevel&#x60; parameter in the observation unit details call.        For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @param programDbId   Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param trialDbId     Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
-     * @param studyDbId     Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
-     * @param page          Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize      The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call observationlevelsGetAsync(String programDbId, String trialDbId, String studyDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<ObservationLevelListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = observationlevelsGetValidateBeforeCall(programDbId, trialDbId, studyDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationLevelListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for observationunitsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call observationunitsGetCall(ObservationUnitQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/observationunits";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call observationunitsGetValidateBeforeCall(ObservationUnitQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return observationunitsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a filtered set of Observation Units
-     *
-     * @return ObservationUnitListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationUnitListResponse observationunitsGet(ObservationUnitQueryParams queryParams) throws ApiException {
-        ApiResponse<ObservationUnitListResponse> resp = observationunitsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get a filtered set of Observation Units
-     *
-     * @return ApiResponse&lt;ObservationUnitListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationUnitListResponse> observationunitsGetWithHttpInfo(ObservationUnitQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = observationunitsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<ObservationUnitListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a filtered set of Observation Units (asynchronously)
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call observationunitsGetAsync(ObservationUnitQueryParams queryParams, final ApiCallback<ObservationUnitListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = observationunitsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationUnitListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for observationunitsObservationUnitDbIdGet
-     *
-     * @param observationUnitDbId     The unique ID of the specific Observation Unit (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call observationunitsObservationUnitDbIdGetCall(String observationUnitDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/observationunits/{observationUnitDbId}"
-                .replaceAll("\\{" + "observationUnitDbId" + "}", apiClient.escapeString(observationUnitDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call observationunitsObservationUnitDbIdGetValidateBeforeCall(String observationUnitDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'observationUnitDbId' is set
-        if (observationUnitDbId == null) {
-            throw new ApiException("Missing the required parameter 'observationUnitDbId' when calling observationunitsObservationUnitDbIdGet(Async)");
-        }
-
-        return observationunitsObservationUnitDbIdGetCall(observationUnitDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details of a specific Observation Unit
-     * Get the details of a specific Observation Unit
-     *
-     * @param observationUnitDbId The unique ID of the specific Observation Unit (required)
-     * @param authorization       HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationUnitSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationUnitSingleResponse observationunitsObservationUnitDbIdGet(String observationUnitDbId, String authorization) throws ApiException {
-        ApiResponse<ObservationUnitSingleResponse> resp = observationunitsObservationUnitDbIdGetWithHttpInfo(observationUnitDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details of a specific Observation Unit
-     * Get the details of a specific Observation Unit
-     *
-     * @param observationUnitDbId The unique ID of the specific Observation Unit (required)
-     * @param authorization       HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationUnitSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationUnitSingleResponse> observationunitsObservationUnitDbIdGetWithHttpInfo(String observationUnitDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = observationunitsObservationUnitDbIdGetValidateBeforeCall(observationUnitDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationUnitSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details of a specific Observation Unit (asynchronously)
-     * Get the details of a specific Observation Unit
-     *
-     * @param observationUnitDbId The unique ID of the specific Observation Unit (required)
-     * @param authorization       HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback            The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call observationunitsObservationUnitDbIdGetAsync(String observationUnitDbId, String authorization, final ApiCallback<ObservationUnitSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = observationunitsObservationUnitDbIdGetValidateBeforeCall(observationUnitDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationUnitSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for observationunitsObservationUnitDbIdPut
-     *
-     * @param observationUnitDbId     The unique ID of the specific Observation Unit (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call observationunitsObservationUnitDbIdPutCall(String observationUnitDbId, ObservationUnitNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/observationunits/{observationUnitDbId}"
-                .replaceAll("\\{" + "observationUnitDbId" + "}", apiClient.escapeString(observationUnitDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call observationunitsObservationUnitDbIdPutValidateBeforeCall(String observationUnitDbId, ObservationUnitNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'observationUnitDbId' is set
-        if (observationUnitDbId == null) {
-            throw new ApiException("Missing the required parameter 'observationUnitDbId' when calling observationunitsObservationUnitDbIdPut(Async)");
-        }
-
-        return observationunitsObservationUnitDbIdPutCall(observationUnitDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update an existing Observation Units
-     * Update an existing Observation Units
-     *
-     * @param observationUnitDbId The unique ID of the specific Observation Unit (required)
-     * @param body                (optional)
-     * @param authorization       HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationUnitSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationUnitSingleResponse observationunitsObservationUnitDbIdPut(String observationUnitDbId, ObservationUnitNewRequest body, String authorization) throws ApiException {
-        ApiResponse<ObservationUnitSingleResponse> resp = observationunitsObservationUnitDbIdPutWithHttpInfo(observationUnitDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update an existing Observation Units
-     * Update an existing Observation Units
-     *
-     * @param observationUnitDbId The unique ID of the specific Observation Unit (required)
-     * @param body                (optional)
-     * @param authorization       HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationUnitSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationUnitSingleResponse> observationunitsObservationUnitDbIdPutWithHttpInfo(String observationUnitDbId, ObservationUnitNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = observationunitsObservationUnitDbIdPutValidateBeforeCall(observationUnitDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationUnitSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update an existing Observation Units (asynchronously)
-     * Update an existing Observation Units
-     *
-     * @param observationUnitDbId The unique ID of the specific Observation Unit (required)
-     * @param body                (optional)
-     * @param authorization       HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback            The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call observationunitsObservationUnitDbIdPutAsync(String observationUnitDbId, ObservationUnitNewRequest body, String authorization, final ApiCallback<ObservationUnitSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = observationunitsObservationUnitDbIdPutValidateBeforeCall(observationUnitDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationUnitSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for observationunitsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call observationunitsPostCall(List<ObservationUnitNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/observationunits";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call observationunitsPostValidateBeforeCall(List<ObservationUnitNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return observationunitsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Add new Observation Units
-     * Add new Observation Units
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationUnitListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationUnitListResponse observationunitsPost(List<ObservationUnitNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<ObservationUnitListResponse> resp = observationunitsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Add new Observation Units
-     * Add new Observation Units
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationUnitListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationUnitListResponse> observationunitsPostWithHttpInfo(List<ObservationUnitNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = observationunitsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationUnitListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Add new Observation Units (asynchronously)
-     * Add new Observation Units
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call observationunitsPostAsync(List<ObservationUnitNewRequest> body, String authorization, final ApiCallback<ObservationUnitListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = observationunitsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationUnitListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for observationunitsPut
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call observationunitsPutCall(Map<String, ObservationUnitNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/observationunits";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call observationunitsPutValidateBeforeCall(Map<String, ObservationUnitNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return observationunitsPutCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update a set of Observation Units
-     * Update a set of Observation Units   Note - In strictly typed languages, this structure can be represented as a Map or Dictionary of objects and parsed directly to JSON.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationUnitListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationUnitListResponse observationunitsPut(Map<String, ObservationUnitNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<ObservationUnitListResponse> resp = observationunitsPutWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update a set of Observation Units
-     * Update a set of Observation Units   Note - In strictly typed languages, this structure can be represented as a Map or Dictionary of objects and parsed directly to JSON.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationUnitListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationUnitListResponse> observationunitsPutWithHttpInfo(Map<String, ObservationUnitNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = observationunitsPutValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationUnitListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update a set of Observation Units (asynchronously)
-     * Update a set of Observation Units   Note - In strictly typed languages, this structure can be represented as a Map or Dictionary of objects and parsed directly to JSON.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call observationunitsPutAsync(Map<String, ObservationUnitNewRequest> body, String authorization, final ApiCallback<ObservationUnitListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = observationunitsPutValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationUnitListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for observationunitsTableGet
-     *
-     * @param accept                                A standard HTTP request header that is used to request a specific content type (JSON, CSV, etc) which is \&quot;acceptable\&quot; to the client and should be returned by the server (required)
-     * @param observationUnitDbId                   The unique ID of an Observation Unit (optional)
-     * @param observationVariableDbId               The unique ID of an observation variable (optional)
-     * @param locationDbId                          The unique ID of a location where these observations were collected (optional)
-     * @param seasonDbId                            The year or Phenotyping campaign of a multi-annual study (trees, grape, ...) (optional)
-     * @param observationLevel                      **Deprecated in v2.1** Please use &#x60;observationUnitLevelName&#x60;. Github issue number #464  &lt;br&gt;The type of the observationUnit. Returns only the observation unit of the specified type; the parent levels ID can be accessed through observationUnitStructure.  (optional)
-     * @param programDbId                           Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param trialDbId                             Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
-     * @param studyDbId                             Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
-     * @param germplasmDbId                         Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
-     * @param observationUnitLevelName              The Observation Unit Level. Returns only the observation unit of the specified Level.  &lt;br/&gt;References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelName  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelOrder             The Observation Unit Level Order Number. Returns only the observation unit of the specified Level.  References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelCode              The Observation Unit Level Code. This parameter should be used together with &#x60;observationUnitLevelName&#x60;  or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipName  The Observation Unit Level Relationship is a connection that this observation unit has to another level of the hierarchy.  &lt;br/&gt;For example, if you have several observation units at a &#x27;plot&#x27; level, they might all share a relationship to the same &#x27;field&#x27; level.   &lt;br/&gt;Use this parameter to identify groups of observation units that share a relationship level.  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipOrder The Observation Unit Level Order Number.  &lt;br/&gt;Returns only the observation unit of the specified Level. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipCode  The Observation Unit Level Code.  &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipDbId  The observationUnitDbId associated with a particular level and code. &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;observationUnitDbId  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param authorization                         HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener                      Progress listener
-     * @param progressRequestListener               Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call observationunitsTableGetCall(ContentTypes accept, String observationUnitDbId, String observationVariableDbId, String locationDbId, String seasonDbId, String observationLevel, String programDbId, String trialDbId, String studyDbId, String germplasmDbId, String observationUnitLevelName, String observationUnitLevelOrder, String observationUnitLevelCode, String observationUnitLevelRelationshipName, String observationUnitLevelRelationshipOrder, String observationUnitLevelRelationshipCode, String observationUnitLevelRelationshipDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/observationunits/table";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (observationUnitDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitDbId", observationUnitDbId));
-        if (observationVariableDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationVariableDbId", observationVariableDbId));
-        if (locationDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("locationDbId", locationDbId));
-        if (seasonDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("seasonDbId", seasonDbId));
-        if (observationLevel != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationLevel", observationLevel));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-        if (trialDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("trialDbId", trialDbId));
-        if (studyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("studyDbId", studyDbId));
-        if (germplasmDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("germplasmDbId", germplasmDbId));
-        if (observationUnitLevelName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelName", observationUnitLevelName));
-        if (observationUnitLevelOrder != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelOrder", observationUnitLevelOrder));
-        if (observationUnitLevelCode != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelCode", observationUnitLevelCode));
-        if (observationUnitLevelRelationshipName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelRelationshipName", observationUnitLevelRelationshipName));
-        if (observationUnitLevelRelationshipOrder != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelRelationshipOrder", observationUnitLevelRelationshipOrder));
-        if (observationUnitLevelRelationshipCode != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelRelationshipCode", observationUnitLevelRelationshipCode));
-        if (observationUnitLevelRelationshipDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelRelationshipDbId", observationUnitLevelRelationshipDbId));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (accept != null)
-            localVarHeaderParams.put("Accept", apiClient.parameterToString(accept));
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json", "text/csv", "text/tsv"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call observationunitsTableGetValidateBeforeCall(ContentTypes accept, String observationUnitDbId, String observationVariableDbId, String locationDbId, String seasonDbId, String observationLevel, String programDbId, String trialDbId, String studyDbId, String germplasmDbId, String observationUnitLevelName, String observationUnitLevelOrder, String observationUnitLevelCode, String observationUnitLevelRelationshipName, String observationUnitLevelRelationshipOrder, String observationUnitLevelRelationshipCode, String observationUnitLevelRelationshipDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'accept' is set
-        if (accept == null) {
-            throw new ApiException("Missing the required parameter 'accept' when calling observationunitsTableGet(Async)");
-        }
-
-        return observationunitsTableGetCall(accept, observationUnitDbId, observationVariableDbId, locationDbId, seasonDbId, observationLevel, programDbId, trialDbId, studyDbId, germplasmDbId, observationUnitLevelName, observationUnitLevelOrder, observationUnitLevelCode, observationUnitLevelRelationshipName, observationUnitLevelRelationshipOrder, observationUnitLevelRelationshipCode, observationUnitLevelRelationshipDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a list of Observations in a table format
-     * &lt;p&gt;This service is designed to retrieve a table for observation values as a matrix of Observation Units and Observation Variables.&lt;/p&gt; &lt;p&gt;The table may be represented by JSON, CSV, or TSV. The \&quot;Accept\&quot; HTTP header is used for the client to request different return formats.  By default, if the \&quot;Accept\&quot; header is not included in the request, the server should return JSON as described below.&lt;/p&gt; &lt;p&gt;The table is REQUIRED to have the following columns&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitDbId - Each row is related to one Observation Unit&lt;/li&gt;   &lt;li&gt;At least one column with an observationVariableDbId&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table may have any or all of the following OPTIONAL columns. Included columns are decided by the server developer&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitName&lt;/li&gt;   &lt;li&gt;studyDbId&lt;/li&gt;   &lt;li&gt;studyName&lt;/li&gt;   &lt;li&gt;germplasmDbId&lt;/li&gt;   &lt;li&gt;germplasmName&lt;/li&gt;   &lt;li&gt;positionCoordinateX&lt;/li&gt;   &lt;li&gt;positionCoordinateY&lt;/li&gt;   &lt;li&gt;year&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table also may have any number of Observation Unit Hierarchy Level columns. For example:&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;field&lt;/li&gt;   &lt;li&gt;plot&lt;/li&gt;   &lt;li&gt;sub-plot&lt;/li&gt;   &lt;li&gt;plant&lt;/li&gt;   &lt;li&gt;pot&lt;/li&gt;   &lt;li&gt;block&lt;/li&gt;   &lt;li&gt;entry&lt;/li&gt;   &lt;li&gt;rep&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The JSON representation provides a pair of extra arrays for defining the headers of the table.  The first array \&quot;headerRow\&quot; will always contain \&quot;observationUnitDbId\&quot; and any or all of the OPTIONAL column header names.  The second array \&quot;observationVariables\&quot; contains the names and DbIds for the Observation Variables represented in the table.  By appending the two arrays, you can construct the complete header row of the table. &lt;/p&gt; &lt;p&gt;For CSV and TSV representations of the table, an extra header row is needed to describe both the Observation Variable DbId and the Observation Variable Name for each data column.  See the example responses below&lt;/p&gt;
-     *
-     * @param accept                                A standard HTTP request header that is used to request a specific content type (JSON, CSV, etc) which is \&quot;acceptable\&quot; to the client and should be returned by the server (required)
-     * @param observationUnitDbId                   The unique ID of an Observation Unit (optional)
-     * @param observationVariableDbId               The unique ID of an observation variable (optional)
-     * @param locationDbId                          The unique ID of a location where these observations were collected (optional)
-     * @param seasonDbId                            The year or Phenotyping campaign of a multi-annual study (trees, grape, ...) (optional)
-     * @param observationLevel                      **Deprecated in v2.1** Please use &#x60;observationUnitLevelName&#x60;. Github issue number #464  &lt;br&gt;The type of the observationUnit. Returns only the observation unit of the specified type; the parent levels ID can be accessed through observationUnitStructure.  (optional)
-     * @param programDbId                           Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param trialDbId                             Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
-     * @param studyDbId                             Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
-     * @param germplasmDbId                         Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
-     * @param observationUnitLevelName              The Observation Unit Level. Returns only the observation unit of the specified Level.  &lt;br/&gt;References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelName  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelOrder             The Observation Unit Level Order Number. Returns only the observation unit of the specified Level.  References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelCode              The Observation Unit Level Code. This parameter should be used together with &#x60;observationUnitLevelName&#x60;  or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipName  The Observation Unit Level Relationship is a connection that this observation unit has to another level of the hierarchy.  &lt;br/&gt;For example, if you have several observation units at a &#x27;plot&#x27; level, they might all share a relationship to the same &#x27;field&#x27; level.   &lt;br/&gt;Use this parameter to identify groups of observation units that share a relationship level.  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipOrder The Observation Unit Level Order Number.  &lt;br/&gt;Returns only the observation unit of the specified Level. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipCode  The Observation Unit Level Code.  &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipDbId  The observationUnitDbId associated with a particular level and code. &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;observationUnitDbId  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param authorization                         HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationUnitTableResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationUnitTableResponse observationunitsTableGet(ContentTypes accept, String observationUnitDbId, String observationVariableDbId, String locationDbId, String seasonDbId, String observationLevel, String programDbId, String trialDbId, String studyDbId, String germplasmDbId, String observationUnitLevelName, String observationUnitLevelOrder, String observationUnitLevelCode, String observationUnitLevelRelationshipName, String observationUnitLevelRelationshipOrder, String observationUnitLevelRelationshipCode, String observationUnitLevelRelationshipDbId, String authorization) throws ApiException {
-        ApiResponse<ObservationUnitTableResponse> resp = observationunitsTableGetWithHttpInfo(accept, observationUnitDbId, observationVariableDbId, locationDbId, seasonDbId, observationLevel, programDbId, trialDbId, studyDbId, germplasmDbId, observationUnitLevelName, observationUnitLevelOrder, observationUnitLevelCode, observationUnitLevelRelationshipName, observationUnitLevelRelationshipOrder, observationUnitLevelRelationshipCode, observationUnitLevelRelationshipDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get a list of Observations in a table format
-     * &lt;p&gt;This service is designed to retrieve a table for observation values as a matrix of Observation Units and Observation Variables.&lt;/p&gt; &lt;p&gt;The table may be represented by JSON, CSV, or TSV. The \&quot;Accept\&quot; HTTP header is used for the client to request different return formats.  By default, if the \&quot;Accept\&quot; header is not included in the request, the server should return JSON as described below.&lt;/p&gt; &lt;p&gt;The table is REQUIRED to have the following columns&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitDbId - Each row is related to one Observation Unit&lt;/li&gt;   &lt;li&gt;At least one column with an observationVariableDbId&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table may have any or all of the following OPTIONAL columns. Included columns are decided by the server developer&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitName&lt;/li&gt;   &lt;li&gt;studyDbId&lt;/li&gt;   &lt;li&gt;studyName&lt;/li&gt;   &lt;li&gt;germplasmDbId&lt;/li&gt;   &lt;li&gt;germplasmName&lt;/li&gt;   &lt;li&gt;positionCoordinateX&lt;/li&gt;   &lt;li&gt;positionCoordinateY&lt;/li&gt;   &lt;li&gt;year&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table also may have any number of Observation Unit Hierarchy Level columns. For example:&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;field&lt;/li&gt;   &lt;li&gt;plot&lt;/li&gt;   &lt;li&gt;sub-plot&lt;/li&gt;   &lt;li&gt;plant&lt;/li&gt;   &lt;li&gt;pot&lt;/li&gt;   &lt;li&gt;block&lt;/li&gt;   &lt;li&gt;entry&lt;/li&gt;   &lt;li&gt;rep&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The JSON representation provides a pair of extra arrays for defining the headers of the table.  The first array \&quot;headerRow\&quot; will always contain \&quot;observationUnitDbId\&quot; and any or all of the OPTIONAL column header names.  The second array \&quot;observationVariables\&quot; contains the names and DbIds for the Observation Variables represented in the table.  By appending the two arrays, you can construct the complete header row of the table. &lt;/p&gt; &lt;p&gt;For CSV and TSV representations of the table, an extra header row is needed to describe both the Observation Variable DbId and the Observation Variable Name for each data column.  See the example responses below&lt;/p&gt;
-     *
-     * @param accept                                A standard HTTP request header that is used to request a specific content type (JSON, CSV, etc) which is \&quot;acceptable\&quot; to the client and should be returned by the server (required)
-     * @param observationUnitDbId                   The unique ID of an Observation Unit (optional)
-     * @param observationVariableDbId               The unique ID of an observation variable (optional)
-     * @param locationDbId                          The unique ID of a location where these observations were collected (optional)
-     * @param seasonDbId                            The year or Phenotyping campaign of a multi-annual study (trees, grape, ...) (optional)
-     * @param observationLevel                      **Deprecated in v2.1** Please use &#x60;observationUnitLevelName&#x60;. Github issue number #464  &lt;br&gt;The type of the observationUnit. Returns only the observation unit of the specified type; the parent levels ID can be accessed through observationUnitStructure.  (optional)
-     * @param programDbId                           Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param trialDbId                             Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
-     * @param studyDbId                             Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
-     * @param germplasmDbId                         Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
-     * @param observationUnitLevelName              The Observation Unit Level. Returns only the observation unit of the specified Level.  &lt;br/&gt;References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelName  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelOrder             The Observation Unit Level Order Number. Returns only the observation unit of the specified Level.  References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelCode              The Observation Unit Level Code. This parameter should be used together with &#x60;observationUnitLevelName&#x60;  or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipName  The Observation Unit Level Relationship is a connection that this observation unit has to another level of the hierarchy.  &lt;br/&gt;For example, if you have several observation units at a &#x27;plot&#x27; level, they might all share a relationship to the same &#x27;field&#x27; level.   &lt;br/&gt;Use this parameter to identify groups of observation units that share a relationship level.  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipOrder The Observation Unit Level Order Number.  &lt;br/&gt;Returns only the observation unit of the specified Level. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipCode  The Observation Unit Level Code.  &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipDbId  The observationUnitDbId associated with a particular level and code. &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;observationUnitDbId  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param authorization                         HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationUnitTableResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationUnitTableResponse> observationunitsTableGetWithHttpInfo(ContentTypes accept, String observationUnitDbId, String observationVariableDbId, String locationDbId, String seasonDbId, String observationLevel, String programDbId, String trialDbId, String studyDbId, String germplasmDbId, String observationUnitLevelName, String observationUnitLevelOrder, String observationUnitLevelCode, String observationUnitLevelRelationshipName, String observationUnitLevelRelationshipOrder, String observationUnitLevelRelationshipCode, String observationUnitLevelRelationshipDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = observationunitsTableGetValidateBeforeCall(accept, observationUnitDbId, observationVariableDbId, locationDbId, seasonDbId, observationLevel, programDbId, trialDbId, studyDbId, germplasmDbId, observationUnitLevelName, observationUnitLevelOrder, observationUnitLevelCode, observationUnitLevelRelationshipName, observationUnitLevelRelationshipOrder, observationUnitLevelRelationshipCode, observationUnitLevelRelationshipDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationUnitTableResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a list of Observations in a table format (asynchronously)
-     * &lt;p&gt;This service is designed to retrieve a table for observation values as a matrix of Observation Units and Observation Variables.&lt;/p&gt; &lt;p&gt;The table may be represented by JSON, CSV, or TSV. The \&quot;Accept\&quot; HTTP header is used for the client to request different return formats.  By default, if the \&quot;Accept\&quot; header is not included in the request, the server should return JSON as described below.&lt;/p&gt; &lt;p&gt;The table is REQUIRED to have the following columns&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitDbId - Each row is related to one Observation Unit&lt;/li&gt;   &lt;li&gt;At least one column with an observationVariableDbId&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table may have any or all of the following OPTIONAL columns. Included columns are decided by the server developer&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitName&lt;/li&gt;   &lt;li&gt;studyDbId&lt;/li&gt;   &lt;li&gt;studyName&lt;/li&gt;   &lt;li&gt;germplasmDbId&lt;/li&gt;   &lt;li&gt;germplasmName&lt;/li&gt;   &lt;li&gt;positionCoordinateX&lt;/li&gt;   &lt;li&gt;positionCoordinateY&lt;/li&gt;   &lt;li&gt;year&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table also may have any number of Observation Unit Hierarchy Level columns. For example:&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;field&lt;/li&gt;   &lt;li&gt;plot&lt;/li&gt;   &lt;li&gt;sub-plot&lt;/li&gt;   &lt;li&gt;plant&lt;/li&gt;   &lt;li&gt;pot&lt;/li&gt;   &lt;li&gt;block&lt;/li&gt;   &lt;li&gt;entry&lt;/li&gt;   &lt;li&gt;rep&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The JSON representation provides a pair of extra arrays for defining the headers of the table.  The first array \&quot;headerRow\&quot; will always contain \&quot;observationUnitDbId\&quot; and any or all of the OPTIONAL column header names.  The second array \&quot;observationVariables\&quot; contains the names and DbIds for the Observation Variables represented in the table.  By appending the two arrays, you can construct the complete header row of the table. &lt;/p&gt; &lt;p&gt;For CSV and TSV representations of the table, an extra header row is needed to describe both the Observation Variable DbId and the Observation Variable Name for each data column.  See the example responses below&lt;/p&gt;
-     *
-     * @param accept                                A standard HTTP request header that is used to request a specific content type (JSON, CSV, etc) which is \&quot;acceptable\&quot; to the client and should be returned by the server (required)
-     * @param observationUnitDbId                   The unique ID of an Observation Unit (optional)
-     * @param observationVariableDbId               The unique ID of an observation variable (optional)
-     * @param locationDbId                          The unique ID of a location where these observations were collected (optional)
-     * @param seasonDbId                            The year or Phenotyping campaign of a multi-annual study (trees, grape, ...) (optional)
-     * @param observationLevel                      **Deprecated in v2.1** Please use &#x60;observationUnitLevelName&#x60;. Github issue number #464  &lt;br&gt;The type of the observationUnit. Returns only the observation unit of the specified type; the parent levels ID can be accessed through observationUnitStructure.  (optional)
-     * @param programDbId                           Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param trialDbId                             Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
-     * @param studyDbId                             Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
-     * @param germplasmDbId                         Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
-     * @param observationUnitLevelName              The Observation Unit Level. Returns only the observation unit of the specified Level.  &lt;br/&gt;References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelName  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelOrder             The Observation Unit Level Order Number. Returns only the observation unit of the specified Level.  References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelCode              The Observation Unit Level Code. This parameter should be used together with &#x60;observationUnitLevelName&#x60;  or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipName  The Observation Unit Level Relationship is a connection that this observation unit has to another level of the hierarchy.  &lt;br/&gt;For example, if you have several observation units at a &#x27;plot&#x27; level, they might all share a relationship to the same &#x27;field&#x27; level.   &lt;br/&gt;Use this parameter to identify groups of observation units that share a relationship level.  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipOrder The Observation Unit Level Order Number.  &lt;br/&gt;Returns only the observation unit of the specified Level. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipCode  The Observation Unit Level Code.  &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipDbId  The observationUnitDbId associated with a particular level and code. &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;observationUnitDbId  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param authorization                         HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback                              The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call observationunitsTableGetAsync(ContentTypes accept, String observationUnitDbId, String observationVariableDbId, String locationDbId, String seasonDbId, String observationLevel, String programDbId, String trialDbId, String studyDbId, String germplasmDbId, String observationUnitLevelName, String observationUnitLevelOrder, String observationUnitLevelCode, String observationUnitLevelRelationshipName, String observationUnitLevelRelationshipOrder, String observationUnitLevelRelationshipCode, String observationUnitLevelRelationshipDbId, String authorization, final ApiCallback<ObservationUnitTableResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = observationunitsTableGetValidateBeforeCall(accept, observationUnitDbId, observationVariableDbId, locationDbId, seasonDbId, observationLevel, programDbId, trialDbId, studyDbId, germplasmDbId, observationUnitLevelName, observationUnitLevelOrder, observationUnitLevelCode, observationUnitLevelRelationshipName, observationUnitLevelRelationshipOrder, observationUnitLevelRelationshipCode, observationUnitLevelRelationshipDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationUnitTableResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchObservationunitsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchObservationunitsPostCall(ObservationUnitSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/observationunits";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchObservationunitsPostValidateBeforeCall(ObservationUnitSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchObservationunitsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;ObservationUnits&#x60;
-     * Submit a search request for &#x60;ObservationUnits&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/observationunits/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationUnitListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationUnitListResponse searchObservationunitsPost(ObservationUnitSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<ObservationUnitListResponse> resp = searchObservationunitsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;ObservationUnits&#x60;
-     * Submit a search request for &#x60;ObservationUnits&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/observationunits/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationUnitListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationUnitListResponse> searchObservationunitsPostWithHttpInfo(ObservationUnitSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchObservationunitsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationUnitListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;ObservationUnits&#x60; (asynchronously)
-     * Submit a search request for &#x60;ObservationUnits&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/observationunits/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchObservationunitsPostAsync(ObservationUnitSearchRequest body, String authorization, final ApiCallback<ObservationUnitListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchObservationunitsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationUnitListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchObservationunitsSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchObservationunitsSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/observationunits/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchObservationunitsSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchObservationunitsSearchResultsDbIdGet(Async)");
-        }
-
-        return searchObservationunitsSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;ObservationUnits&#x60; search request
-     * Get the results of a &#x60;ObservationUnits&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/observationunits&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationUnitListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationUnitListResponse searchObservationunitsSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<ObservationUnitListResponse> resp = searchObservationunitsSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;ObservationUnits&#x60; search request
-     * Get the results of a &#x60;ObservationUnits&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/observationunits&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationUnitListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationUnitListResponse> searchObservationunitsSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchObservationunitsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationUnitListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;ObservationUnits&#x60; search request (asynchronously)
-     * Get the results of a &#x60;ObservationUnits&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/observationunits&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchObservationunitsSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<ObservationUnitListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchObservationunitsSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationUnitListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ObservationVariablesApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ObservationVariablesApi.java
deleted file mode 100644
index f3167290..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ObservationVariablesApi.java
+++ /dev/null
@@ -1,757 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.phenotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.phenotype.VariableQueryParams;
-import org.brapi.model.v21.phenotype.ObservationVariableListResponse;
-import org.brapi.model.v21.phenotype.ObservationVariableNewRequest;
-import org.brapi.model.v21.phenotype.ObservationVariableSearchRequest;
-import org.brapi.model.v21.phenotype.ObservationVariableSingleResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ObservationVariablesApi {
-    private ApiClient apiClient;
-
-    public ObservationVariablesApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public ObservationVariablesApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for searchVariablesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchVariablesPostCall(ObservationVariableSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/variables";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchVariablesPostValidateBeforeCall(ObservationVariableSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchVariablesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for Observation &#x60;Variables&#x60;
-     * Submit a search request for Observation &#x60;Variables&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/variables/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationVariableListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationVariableListResponse searchVariablesPost(ObservationVariableSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<ObservationVariableListResponse> resp = searchVariablesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for Observation &#x60;Variables&#x60;
-     * Submit a search request for Observation &#x60;Variables&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/variables/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationVariableListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationVariableListResponse> searchVariablesPostWithHttpInfo(ObservationVariableSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchVariablesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationVariableListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for Observation &#x60;Variables&#x60; (asynchronously)
-     * Submit a search request for Observation &#x60;Variables&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/variables/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchVariablesPostAsync(ObservationVariableSearchRequest body, String authorization, final ApiCallback<ObservationVariableListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchVariablesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationVariableListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchVariablesSearchResultsDbIdGet
-     *
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchVariablesSearchResultsDbIdGetCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/variables/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchVariablesSearchResultsDbIdGetValidateBeforeCall(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchVariablesSearchResultsDbIdGet(Async)");
-        }
-
-        return searchVariablesSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a Observation &#x60;variables&#x60; search request
-     * Get the results of a Observation &#x60;variables&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/variables&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationVariableListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationVariableListResponse searchVariablesSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        ApiResponse<ObservationVariableListResponse> resp = searchVariablesSearchResultsDbIdGetWithHttpInfo(searchResultsDbId, page, pageSize, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a Observation &#x60;variables&#x60; search request
-     * Get the results of a Observation &#x60;variables&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/variables&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationVariableListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationVariableListResponse> searchVariablesSearchResultsDbIdGetWithHttpInfo(String searchResultsDbId, Integer page, Integer pageSize, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchVariablesSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationVariableListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a Observation &#x60;variables&#x60; search request (asynchronously)
-     * Get the results of a Observation &#x60;variables&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/variables&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchVariablesSearchResultsDbIdGetAsync(String searchResultsDbId, Integer page, Integer pageSize, String authorization, final ApiCallback<ObservationVariableListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchVariablesSearchResultsDbIdGetValidateBeforeCall(searchResultsDbId, page, pageSize, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationVariableListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for variablesGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call variablesGetCall(VariableQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/variables";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call variablesGetValidateBeforeCall(VariableQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return variablesGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Observation Variables
-     * Call to retrieve a list of observationVariables available in the system.
-     *
-     * @return ObservationVariableListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationVariableListResponse variablesGet(VariableQueryParams queryParams) throws ApiException {
-        ApiResponse<ObservationVariableListResponse> resp = variablesGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Observation Variables
-     * Call to retrieve a list of observationVariables available in the system.
-     *
-     * @return ApiResponse&lt;ObservationVariableListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationVariableListResponse> variablesGetWithHttpInfo(VariableQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = variablesGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<ObservationVariableListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Observation Variables (asynchronously)
-     * Call to retrieve a list of observationVariables available in the system.
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call variablesGetAsync(VariableQueryParams queryParams, final ApiCallback<ObservationVariableListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = variablesGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationVariableListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for variablesObservationVariableDbIdGet
-     *
-     * @param observationVariableDbId string id of the variable (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call variablesObservationVariableDbIdGetCall(String observationVariableDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/variables/{observationVariableDbId}"
-                .replaceAll("\\{" + "observationVariableDbId" + "}", apiClient.escapeString(observationVariableDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call variablesObservationVariableDbIdGetValidateBeforeCall(String observationVariableDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'observationVariableDbId' is set
-        if (observationVariableDbId == null) {
-            throw new ApiException("Missing the required parameter 'observationVariableDbId' when calling variablesObservationVariableDbIdGet(Async)");
-        }
-
-        return variablesObservationVariableDbIdGetCall(observationVariableDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details for a specific Observation Variable
-     * Retrieve variable details
-     *
-     * @param observationVariableDbId string id of the variable (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationVariableSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationVariableSingleResponse variablesObservationVariableDbIdGet(String observationVariableDbId, String authorization) throws ApiException {
-        ApiResponse<ObservationVariableSingleResponse> resp = variablesObservationVariableDbIdGetWithHttpInfo(observationVariableDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details for a specific Observation Variable
-     * Retrieve variable details
-     *
-     * @param observationVariableDbId string id of the variable (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationVariableSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationVariableSingleResponse> variablesObservationVariableDbIdGetWithHttpInfo(String observationVariableDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = variablesObservationVariableDbIdGetValidateBeforeCall(observationVariableDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationVariableSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details for a specific Observation Variable (asynchronously)
-     * Retrieve variable details
-     *
-     * @param observationVariableDbId string id of the variable (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback                The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call variablesObservationVariableDbIdGetAsync(String observationVariableDbId, String authorization, final ApiCallback<ObservationVariableSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = variablesObservationVariableDbIdGetValidateBeforeCall(observationVariableDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationVariableSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for variablesObservationVariableDbIdPut
-     *
-     * @param observationVariableDbId string id of the variable (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call variablesObservationVariableDbIdPutCall(String observationVariableDbId, ObservationVariableNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/variables/{observationVariableDbId}"
-                .replaceAll("\\{" + "observationVariableDbId" + "}", apiClient.escapeString(observationVariableDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call variablesObservationVariableDbIdPutValidateBeforeCall(String observationVariableDbId, ObservationVariableNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'observationVariableDbId' is set
-        if (observationVariableDbId == null) {
-            throw new ApiException("Missing the required parameter 'observationVariableDbId' when calling variablesObservationVariableDbIdPut(Async)");
-        }
-
-        return variablesObservationVariableDbIdPutCall(observationVariableDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update an existing Observation Variable
-     * Update an existing Observation Variable
-     *
-     * @param observationVariableDbId string id of the variable (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationVariableSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationVariableSingleResponse variablesObservationVariableDbIdPut(String observationVariableDbId, ObservationVariableNewRequest body, String authorization) throws ApiException {
-        ApiResponse<ObservationVariableSingleResponse> resp = variablesObservationVariableDbIdPutWithHttpInfo(observationVariableDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update an existing Observation Variable
-     * Update an existing Observation Variable
-     *
-     * @param observationVariableDbId string id of the variable (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationVariableSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationVariableSingleResponse> variablesObservationVariableDbIdPutWithHttpInfo(String observationVariableDbId, ObservationVariableNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = variablesObservationVariableDbIdPutValidateBeforeCall(observationVariableDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationVariableSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update an existing Observation Variable (asynchronously)
-     * Update an existing Observation Variable
-     *
-     * @param observationVariableDbId string id of the variable (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback                The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call variablesObservationVariableDbIdPutAsync(String observationVariableDbId, ObservationVariableNewRequest body, String authorization, final ApiCallback<ObservationVariableSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = variablesObservationVariableDbIdPutValidateBeforeCall(observationVariableDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationVariableSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for variablesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call variablesPostCall(List<ObservationVariableNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/variables";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call variablesPostValidateBeforeCall(List<ObservationVariableNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return variablesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Add new Observation Variables
-     * Add new Observation Variables to the system.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationVariableListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationVariableListResponse variablesPost(List<ObservationVariableNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<ObservationVariableListResponse> resp = variablesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Add new Observation Variables
-     * Add new Observation Variables to the system.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationVariableListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationVariableListResponse> variablesPostWithHttpInfo(List<ObservationVariableNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = variablesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationVariableListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Add new Observation Variables (asynchronously)
-     * Add new Observation Variables to the system.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call variablesPostAsync(List<ObservationVariableNewRequest> body, String authorization, final ApiCallback<ObservationVariableListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = variablesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationVariableListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ObservationsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ObservationsApi.java
deleted file mode 100644
index fb33d5ab..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ObservationsApi.java
+++ /dev/null
@@ -1,1228 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.phenotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.phenotype.ObservationQueryParams;
-import org.brapi.model.v21.phenotype.*;
-import org.threeten.bp.OffsetDateTime;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ObservationsApi {
-    private ApiClient apiClient;
-
-    public ObservationsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public ObservationsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for deleteObservationsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call deleteObservationsPostCall(ObservationSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/delete/observations";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call deleteObservationsPostValidateBeforeCall(ObservationSearchRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return deleteObservationsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a delete request for &#x60;Observations&#x60;
-     * Submit a delete request for &#x60;Observations&#x60;
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationDeleteResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationDeleteResponse deleteObservationsPost(ObservationSearchRequest body, String authorization) throws ApiException {
-        ApiResponse<ObservationDeleteResponse> resp = deleteObservationsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a delete request for &#x60;Observations&#x60;
-     * Submit a delete request for &#x60;Observations&#x60;
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationDeleteResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationDeleteResponse> deleteObservationsPostWithHttpInfo(ObservationSearchRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = deleteObservationsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationDeleteResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a delete request for &#x60;Observations&#x60; (asynchronously)
-     * Submit a delete request for &#x60;Observations&#x60;
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call deleteObservationsPostAsync(ObservationSearchRequest body, String authorization, final ApiCallback<ObservationDeleteResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = deleteObservationsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationDeleteResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for observationsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call observationsGetCall(ObservationQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/observations";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call observationsGetValidateBeforeCall(ObservationQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return observationsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a filtered set of Observations
-     * Retrieve all observations where there are measurements for the given observation variables.   observationTimestamp should be ISO8601 format with timezone -&gt; YYYY-MM-DDThh:mm:ss+hhmm
-     *
-     * @return ObservationListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationListResponse observationsGet(ObservationQueryParams queryParams) throws ApiException {
-        ApiResponse<ObservationListResponse> resp = observationsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get a filtered set of Observations
-     * Retrieve all observations where there are measurements for the given observation variables.   observationTimestamp should be ISO8601 format with timezone -&gt; YYYY-MM-DDThh:mm:ss+hhmm
-     *
-     * @return ApiResponse&lt;ObservationListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationListResponse> observationsGetWithHttpInfo(ObservationQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = observationsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<ObservationListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a filtered set of Observations (asynchronously)
-     * Retrieve all observations where there are measurements for the given observation variables.   observationTimestamp should be ISO8601 format with timezone -&gt; YYYY-MM-DDThh:mm:ss+hhmm
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call observationsGetAsync(ObservationQueryParams queryParams, final ApiCallback<ObservationListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = observationsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for observationsObservationDbIdGet
-     *
-     * @param observationDbId         The unique ID of an observation (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call observationsObservationDbIdGetCall(String observationDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/observations/{observationDbId}"
-                .replaceAll("\\{" + "observationDbId" + "}", apiClient.escapeString(observationDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call observationsObservationDbIdGetValidateBeforeCall(String observationDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'observationDbId' is set
-        if (observationDbId == null) {
-            throw new ApiException("Missing the required parameter 'observationDbId' when calling observationsObservationDbIdGet(Async)");
-        }
-
-        return observationsObservationDbIdGetCall(observationDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details of a specific Observations
-     * Get the details of a specific Observations  observationTimestamp should be ISO8601 format with timezone -&gt; YYYY-MM-DDThh:mm:ss+hhmm
-     *
-     * @param observationDbId The unique ID of an observation (required)
-     * @param authorization   HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationSingleResponse observationsObservationDbIdGet(String observationDbId, String authorization) throws ApiException {
-        ApiResponse<ObservationSingleResponse> resp = observationsObservationDbIdGetWithHttpInfo(observationDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details of a specific Observations
-     * Get the details of a specific Observations  observationTimestamp should be ISO8601 format with timezone -&gt; YYYY-MM-DDThh:mm:ss+hhmm
-     *
-     * @param observationDbId The unique ID of an observation (required)
-     * @param authorization   HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationSingleResponse> observationsObservationDbIdGetWithHttpInfo(String observationDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = observationsObservationDbIdGetValidateBeforeCall(observationDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details of a specific Observations (asynchronously)
-     * Get the details of a specific Observations  observationTimestamp should be ISO8601 format with timezone -&gt; YYYY-MM-DDThh:mm:ss+hhmm
-     *
-     * @param observationDbId The unique ID of an observation (required)
-     * @param authorization   HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback        The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call observationsObservationDbIdGetAsync(String observationDbId, String authorization, final ApiCallback<ObservationSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = observationsObservationDbIdGetValidateBeforeCall(observationDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for observationsObservationDbIdPut
-     *
-     * @param observationDbId         The unique ID of an observation (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call observationsObservationDbIdPutCall(String observationDbId, ObservationNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/observations/{observationDbId}"
-                .replaceAll("\\{" + "observationDbId" + "}", apiClient.escapeString(observationDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call observationsObservationDbIdPutValidateBeforeCall(String observationDbId, ObservationNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'observationDbId' is set
-        if (observationDbId == null) {
-            throw new ApiException("Missing the required parameter 'observationDbId' when calling observationsObservationDbIdPut(Async)");
-        }
-
-        return observationsObservationDbIdPutCall(observationDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update an existing Observation
-     * Update an existing Observation
-     *
-     * @param observationDbId The unique ID of an observation (required)
-     * @param body            (optional)
-     * @param authorization   HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationSingleResponse observationsObservationDbIdPut(String observationDbId, ObservationNewRequest body, String authorization) throws ApiException {
-        ApiResponse<ObservationSingleResponse> resp = observationsObservationDbIdPutWithHttpInfo(observationDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update an existing Observation
-     * Update an existing Observation
-     *
-     * @param observationDbId The unique ID of an observation (required)
-     * @param body            (optional)
-     * @param authorization   HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationSingleResponse> observationsObservationDbIdPutWithHttpInfo(String observationDbId, ObservationNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = observationsObservationDbIdPutValidateBeforeCall(observationDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update an existing Observation (asynchronously)
-     * Update an existing Observation
-     *
-     * @param observationDbId The unique ID of an observation (required)
-     * @param body            (optional)
-     * @param authorization   HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback        The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call observationsObservationDbIdPutAsync(String observationDbId, ObservationNewRequest body, String authorization, final ApiCallback<ObservationSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = observationsObservationDbIdPutValidateBeforeCall(observationDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for observationsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call observationsPostCall(List<ObservationNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/observations";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call observationsPostValidateBeforeCall(List<ObservationNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return observationsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Add new Observation entities
-     * Add new Observation entities
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationListResponse observationsPost(List<ObservationNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<ObservationListResponse> resp = observationsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Add new Observation entities
-     * Add new Observation entities
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationListResponse> observationsPostWithHttpInfo(List<ObservationNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = observationsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Add new Observation entities (asynchronously)
-     * Add new Observation entities
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call observationsPostAsync(List<ObservationNewRequest> body, String authorization, final ApiCallback<ObservationListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = observationsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for observationsPut
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call observationsPutCall(Map<String, ObservationNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/observations";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call observationsPutValidateBeforeCall(Map<String, ObservationNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return observationsPutCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update multiple Observation entities
-     * Update multiple Observation entities simultaneously with a single call   Include as many &#x60;observationDbIds&#x60; in the request as needed.   Note - In strictly typed languages, this structure can be represented as a Map or Dictionary of objects and parsed directly from JSON.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationListResponse observationsPut(Map<String, ObservationNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<ObservationListResponse> resp = observationsPutWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update multiple Observation entities
-     * Update multiple Observation entities simultaneously with a single call   Include as many &#x60;observationDbIds&#x60; in the request as needed.   Note - In strictly typed languages, this structure can be represented as a Map or Dictionary of objects and parsed directly from JSON.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationListResponse> observationsPutWithHttpInfo(Map<String, ObservationNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = observationsPutValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update multiple Observation entities (asynchronously)
-     * Update multiple Observation entities simultaneously with a single call   Include as many &#x60;observationDbIds&#x60; in the request as needed.   Note - In strictly typed languages, this structure can be represented as a Map or Dictionary of objects and parsed directly from JSON.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call observationsPutAsync(Map<String, ObservationNewRequest> body, String authorization, final ApiCallback<ObservationListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = observationsPutValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for observationsTableGet
-     *
-     * @param accept                                A standard HTTP request header that is used to request a specific content type (JSON, CSV, etc) which is \&quot;acceptable\&quot; to the client and should be returned by the server (required)
-     * @param observationUnitDbId                   The unique ID of an Observation Unit (optional)
-     * @param observationVariableDbId               The unique ID of an observation variable (optional)
-     * @param locationDbId                          The unique ID of a location where these observations were collected (optional)
-     * @param seasonDbId                            The year or Phenotyping campaign of a multi-annual study (trees, grape, ...) (optional)
-     * @param observationLevel                      **Deprecated in v2.1** Please use &#x60;observationUnitLevelName&#x60;. Github issue number #464  &lt;br&gt;The type of the observationUnit. Returns only the observation unit of the specified type; the parent levels ID can be accessed through observationUnitStructure.  (optional)
-     * @param searchResultsDbId                     Permanent unique identifier which references the search results (optional)
-     * @param observationTimeStampRangeStart        Timestamp range start (optional)
-     * @param observationTimeStampRangeEnd          Timestamp range end (optional)
-     * @param programDbId                           Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param trialDbId                             Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
-     * @param studyDbId                             Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
-     * @param germplasmDbId                         Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
-     * @param observationUnitLevelName              The Observation Unit Level. Returns only the observation unit of the specified Level.  &lt;br/&gt;References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelName  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelOrder             The Observation Unit Level Order Number. Returns only the observation unit of the specified Level.  References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelCode              The Observation Unit Level Code. This parameter should be used together with &#x60;observationUnitLevelName&#x60;  or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipName  The Observation Unit Level Relationship is a connection that this observation unit has to another level of the hierarchy.  &lt;br/&gt;For example, if you have several observation units at a &#x27;plot&#x27; level, they might all share a relationship to the same &#x27;field&#x27; level.   &lt;br/&gt;Use this parameter to identify groups of observation units that share a relationship level.  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipOrder The Observation Unit Level Order Number.  &lt;br/&gt;Returns only the observation unit of the specified Level. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipCode  The Observation Unit Level Code.  &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipDbId  The observationUnitDbId associated with a particular level and code. &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;observationUnitDbId  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param authorization                         HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener                      Progress listener
-     * @param progressRequestListener               Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call observationsTableGetCall(ContentTypes accept, String observationUnitDbId, String observationVariableDbId, String locationDbId, String seasonDbId, String observationLevel, String searchResultsDbId, OffsetDateTime observationTimeStampRangeStart, OffsetDateTime observationTimeStampRangeEnd, String programDbId, String trialDbId, String studyDbId, String germplasmDbId, String observationUnitLevelName, String observationUnitLevelOrder, String observationUnitLevelCode, String observationUnitLevelRelationshipName, String observationUnitLevelRelationshipOrder, String observationUnitLevelRelationshipCode, String observationUnitLevelRelationshipDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/observations/table";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (observationUnitDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitDbId", observationUnitDbId));
-        if (observationVariableDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationVariableDbId", observationVariableDbId));
-        if (locationDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("locationDbId", locationDbId));
-        if (seasonDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("seasonDbId", seasonDbId));
-        if (observationLevel != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationLevel", observationLevel));
-        if (searchResultsDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("searchResultsDbId", searchResultsDbId));
-        if (observationTimeStampRangeStart != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationTimeStampRangeStart", observationTimeStampRangeStart));
-        if (observationTimeStampRangeEnd != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationTimeStampRangeEnd", observationTimeStampRangeEnd));
-        if (programDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("programDbId", programDbId));
-        if (trialDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("trialDbId", trialDbId));
-        if (studyDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("studyDbId", studyDbId));
-        if (germplasmDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("germplasmDbId", germplasmDbId));
-        if (observationUnitLevelName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelName", observationUnitLevelName));
-        if (observationUnitLevelOrder != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelOrder", observationUnitLevelOrder));
-        if (observationUnitLevelCode != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelCode", observationUnitLevelCode));
-        if (observationUnitLevelRelationshipName != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelRelationshipName", observationUnitLevelRelationshipName));
-        if (observationUnitLevelRelationshipOrder != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelRelationshipOrder", observationUnitLevelRelationshipOrder));
-        if (observationUnitLevelRelationshipCode != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelRelationshipCode", observationUnitLevelRelationshipCode));
-        if (observationUnitLevelRelationshipDbId != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("observationUnitLevelRelationshipDbId", observationUnitLevelRelationshipDbId));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (accept != null)
-            localVarHeaderParams.put("Accept", apiClient.parameterToString(accept));
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json", "text/csv", "text/tsv"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call observationsTableGetValidateBeforeCall(ContentTypes accept, String observationUnitDbId, String observationVariableDbId, String locationDbId, String seasonDbId, String observationLevel, String searchResultsDbId, OffsetDateTime observationTimeStampRangeStart, OffsetDateTime observationTimeStampRangeEnd, String programDbId, String trialDbId, String studyDbId, String germplasmDbId, String observationUnitLevelName, String observationUnitLevelOrder, String observationUnitLevelCode, String observationUnitLevelRelationshipName, String observationUnitLevelRelationshipOrder, String observationUnitLevelRelationshipCode, String observationUnitLevelRelationshipDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'accept' is set
-        if (accept == null) {
-            throw new ApiException("Missing the required parameter 'accept' when calling observationsTableGet(Async)");
-        }
-
-        return observationsTableGetCall(accept, observationUnitDbId, observationVariableDbId, locationDbId, seasonDbId, observationLevel, searchResultsDbId, observationTimeStampRangeStart, observationTimeStampRangeEnd, programDbId, trialDbId, studyDbId, germplasmDbId, observationUnitLevelName, observationUnitLevelOrder, observationUnitLevelCode, observationUnitLevelRelationshipName, observationUnitLevelRelationshipOrder, observationUnitLevelRelationshipCode, observationUnitLevelRelationshipDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a list of Observations in a table format
-     * &lt;p&gt;This service is designed to retrieve a table of time dependant observation values as a matrix of Observation Units and Observation Variables. This is also sometimes called a Time Series. This service takes the \&quot;Sparse Table\&quot; approach for representing this time dependant data.&lt;/p&gt; &lt;p&gt;The table may be represented by JSON, CSV, or TSV. The \&quot;Accept\&quot; HTTP header is used for the client to request different return formats.  By default, if the \&quot;Accept\&quot; header is not included in the request, the server should return JSON as described below.&lt;/p&gt; &lt;p&gt;The table is REQUIRED to have the following columns&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitDbId - Each row is related to one Observation Unit&lt;/li&gt;   &lt;li&gt;observationTimeStamp - Each row is has a time stamp for when the observation was taken&lt;/li&gt;   &lt;li&gt;At least one column with an observationVariableDbId&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table may have any or all of the following OPTIONAL columns. Included columns are decided by the server developer&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitName&lt;/li&gt;   &lt;li&gt;studyDbId&lt;/li&gt;   &lt;li&gt;studyName&lt;/li&gt;   &lt;li&gt;germplasmDbId&lt;/li&gt;   &lt;li&gt;germplasmName&lt;/li&gt;   &lt;li&gt;positionCoordinateX&lt;/li&gt;   &lt;li&gt;positionCoordinateY&lt;/li&gt;   &lt;li&gt;year&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table also may have any number of Observation Unit Hierarchy Level columns. For example:&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;field&lt;/li&gt;   &lt;li&gt;plot&lt;/li&gt;   &lt;li&gt;sub-plot&lt;/li&gt;   &lt;li&gt;plant&lt;/li&gt;   &lt;li&gt;pot&lt;/li&gt;   &lt;li&gt;block&lt;/li&gt;   &lt;li&gt;entry&lt;/li&gt;   &lt;li&gt;rep&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The JSON representation provides a pair of extra arrays for defining the headers of the table.  The first array \&quot;headerRow\&quot; will always contain \&quot;observationUnitDbId\&quot; and any or all of the OPTIONAL column header names.  The second array \&quot;observationVariables\&quot; contains the names and DbIds for the Observation Variables represented in the table.  By appending the two arrays, you can construct the complete header row of the table. &lt;/p&gt; &lt;p&gt;For CSV and TSV representations of the table, an extra header row is needed to describe both the Observation Variable DbId and the Observation Variable Name for each data column.  See the example responses below&lt;/p&gt;
-     *
-     * @param accept                                A standard HTTP request header that is used to request a specific content type (JSON, CSV, etc) which is \&quot;acceptable\&quot; to the client and should be returned by the server (required)
-     * @param observationUnitDbId                   The unique ID of an Observation Unit (optional)
-     * @param observationVariableDbId               The unique ID of an observation variable (optional)
-     * @param locationDbId                          The unique ID of a location where these observations were collected (optional)
-     * @param seasonDbId                            The year or Phenotyping campaign of a multi-annual study (trees, grape, ...) (optional)
-     * @param observationLevel                      **Deprecated in v2.1** Please use &#x60;observationUnitLevelName&#x60;. Github issue number #464  &lt;br&gt;The type of the observationUnit. Returns only the observation unit of the specified type; the parent levels ID can be accessed through observationUnitStructure.  (optional)
-     * @param searchResultsDbId                     Permanent unique identifier which references the search results (optional)
-     * @param observationTimeStampRangeStart        Timestamp range start (optional)
-     * @param observationTimeStampRangeEnd          Timestamp range end (optional)
-     * @param programDbId                           Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param trialDbId                             Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
-     * @param studyDbId                             Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
-     * @param germplasmDbId                         Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
-     * @param observationUnitLevelName              The Observation Unit Level. Returns only the observation unit of the specified Level.  &lt;br/&gt;References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelName  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelOrder             The Observation Unit Level Order Number. Returns only the observation unit of the specified Level.  References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelCode              The Observation Unit Level Code. This parameter should be used together with &#x60;observationUnitLevelName&#x60;  or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipName  The Observation Unit Level Relationship is a connection that this observation unit has to another level of the hierarchy.  &lt;br/&gt;For example, if you have several observation units at a &#x27;plot&#x27; level, they might all share a relationship to the same &#x27;field&#x27; level.   &lt;br/&gt;Use this parameter to identify groups of observation units that share a relationship level.  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipOrder The Observation Unit Level Order Number.  &lt;br/&gt;Returns only the observation unit of the specified Level. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipCode  The Observation Unit Level Code.  &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipDbId  The observationUnitDbId associated with a particular level and code. &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;observationUnitDbId  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param authorization                         HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationTableResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationTableResponse observationsTableGet(ContentTypes accept, String observationUnitDbId, String observationVariableDbId, String locationDbId, String seasonDbId, String observationLevel, String searchResultsDbId, OffsetDateTime observationTimeStampRangeStart, OffsetDateTime observationTimeStampRangeEnd, String programDbId, String trialDbId, String studyDbId, String germplasmDbId, String observationUnitLevelName, String observationUnitLevelOrder, String observationUnitLevelCode, String observationUnitLevelRelationshipName, String observationUnitLevelRelationshipOrder, String observationUnitLevelRelationshipCode, String observationUnitLevelRelationshipDbId, String authorization) throws ApiException {
-        ApiResponse<ObservationTableResponse> resp = observationsTableGetWithHttpInfo(accept, observationUnitDbId, observationVariableDbId, locationDbId, seasonDbId, observationLevel, searchResultsDbId, observationTimeStampRangeStart, observationTimeStampRangeEnd, programDbId, trialDbId, studyDbId, germplasmDbId, observationUnitLevelName, observationUnitLevelOrder, observationUnitLevelCode, observationUnitLevelRelationshipName, observationUnitLevelRelationshipOrder, observationUnitLevelRelationshipCode, observationUnitLevelRelationshipDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get a list of Observations in a table format
-     * &lt;p&gt;This service is designed to retrieve a table of time dependant observation values as a matrix of Observation Units and Observation Variables. This is also sometimes called a Time Series. This service takes the \&quot;Sparse Table\&quot; approach for representing this time dependant data.&lt;/p&gt; &lt;p&gt;The table may be represented by JSON, CSV, or TSV. The \&quot;Accept\&quot; HTTP header is used for the client to request different return formats.  By default, if the \&quot;Accept\&quot; header is not included in the request, the server should return JSON as described below.&lt;/p&gt; &lt;p&gt;The table is REQUIRED to have the following columns&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitDbId - Each row is related to one Observation Unit&lt;/li&gt;   &lt;li&gt;observationTimeStamp - Each row is has a time stamp for when the observation was taken&lt;/li&gt;   &lt;li&gt;At least one column with an observationVariableDbId&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table may have any or all of the following OPTIONAL columns. Included columns are decided by the server developer&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitName&lt;/li&gt;   &lt;li&gt;studyDbId&lt;/li&gt;   &lt;li&gt;studyName&lt;/li&gt;   &lt;li&gt;germplasmDbId&lt;/li&gt;   &lt;li&gt;germplasmName&lt;/li&gt;   &lt;li&gt;positionCoordinateX&lt;/li&gt;   &lt;li&gt;positionCoordinateY&lt;/li&gt;   &lt;li&gt;year&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table also may have any number of Observation Unit Hierarchy Level columns. For example:&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;field&lt;/li&gt;   &lt;li&gt;plot&lt;/li&gt;   &lt;li&gt;sub-plot&lt;/li&gt;   &lt;li&gt;plant&lt;/li&gt;   &lt;li&gt;pot&lt;/li&gt;   &lt;li&gt;block&lt;/li&gt;   &lt;li&gt;entry&lt;/li&gt;   &lt;li&gt;rep&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The JSON representation provides a pair of extra arrays for defining the headers of the table.  The first array \&quot;headerRow\&quot; will always contain \&quot;observationUnitDbId\&quot; and any or all of the OPTIONAL column header names.  The second array \&quot;observationVariables\&quot; contains the names and DbIds for the Observation Variables represented in the table.  By appending the two arrays, you can construct the complete header row of the table. &lt;/p&gt; &lt;p&gt;For CSV and TSV representations of the table, an extra header row is needed to describe both the Observation Variable DbId and the Observation Variable Name for each data column.  See the example responses below&lt;/p&gt;
-     *
-     * @param accept                                A standard HTTP request header that is used to request a specific content type (JSON, CSV, etc) which is \&quot;acceptable\&quot; to the client and should be returned by the server (required)
-     * @param observationUnitDbId                   The unique ID of an Observation Unit (optional)
-     * @param observationVariableDbId               The unique ID of an observation variable (optional)
-     * @param locationDbId                          The unique ID of a location where these observations were collected (optional)
-     * @param seasonDbId                            The year or Phenotyping campaign of a multi-annual study (trees, grape, ...) (optional)
-     * @param observationLevel                      **Deprecated in v2.1** Please use &#x60;observationUnitLevelName&#x60;. Github issue number #464  &lt;br&gt;The type of the observationUnit. Returns only the observation unit of the specified type; the parent levels ID can be accessed through observationUnitStructure.  (optional)
-     * @param searchResultsDbId                     Permanent unique identifier which references the search results (optional)
-     * @param observationTimeStampRangeStart        Timestamp range start (optional)
-     * @param observationTimeStampRangeEnd          Timestamp range end (optional)
-     * @param programDbId                           Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param trialDbId                             Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
-     * @param studyDbId                             Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
-     * @param germplasmDbId                         Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
-     * @param observationUnitLevelName              The Observation Unit Level. Returns only the observation unit of the specified Level.  &lt;br/&gt;References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelName  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelOrder             The Observation Unit Level Order Number. Returns only the observation unit of the specified Level.  References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelCode              The Observation Unit Level Code. This parameter should be used together with &#x60;observationUnitLevelName&#x60;  or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipName  The Observation Unit Level Relationship is a connection that this observation unit has to another level of the hierarchy.  &lt;br/&gt;For example, if you have several observation units at a &#x27;plot&#x27; level, they might all share a relationship to the same &#x27;field&#x27; level.   &lt;br/&gt;Use this parameter to identify groups of observation units that share a relationship level.  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipOrder The Observation Unit Level Order Number.  &lt;br/&gt;Returns only the observation unit of the specified Level. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipCode  The Observation Unit Level Code.  &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipDbId  The observationUnitDbId associated with a particular level and code. &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;observationUnitDbId  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param authorization                         HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationTableResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationTableResponse> observationsTableGetWithHttpInfo(ContentTypes accept, String observationUnitDbId, String observationVariableDbId, String locationDbId, String seasonDbId, String observationLevel, String searchResultsDbId, OffsetDateTime observationTimeStampRangeStart, OffsetDateTime observationTimeStampRangeEnd, String programDbId, String trialDbId, String studyDbId, String germplasmDbId, String observationUnitLevelName, String observationUnitLevelOrder, String observationUnitLevelCode, String observationUnitLevelRelationshipName, String observationUnitLevelRelationshipOrder, String observationUnitLevelRelationshipCode, String observationUnitLevelRelationshipDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = observationsTableGetValidateBeforeCall(accept, observationUnitDbId, observationVariableDbId, locationDbId, seasonDbId, observationLevel, searchResultsDbId, observationTimeStampRangeStart, observationTimeStampRangeEnd, programDbId, trialDbId, studyDbId, germplasmDbId, observationUnitLevelName, observationUnitLevelOrder, observationUnitLevelCode, observationUnitLevelRelationshipName, observationUnitLevelRelationshipOrder, observationUnitLevelRelationshipCode, observationUnitLevelRelationshipDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationTableResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a list of Observations in a table format (asynchronously)
-     * &lt;p&gt;This service is designed to retrieve a table of time dependant observation values as a matrix of Observation Units and Observation Variables. This is also sometimes called a Time Series. This service takes the \&quot;Sparse Table\&quot; approach for representing this time dependant data.&lt;/p&gt; &lt;p&gt;The table may be represented by JSON, CSV, or TSV. The \&quot;Accept\&quot; HTTP header is used for the client to request different return formats.  By default, if the \&quot;Accept\&quot; header is not included in the request, the server should return JSON as described below.&lt;/p&gt; &lt;p&gt;The table is REQUIRED to have the following columns&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitDbId - Each row is related to one Observation Unit&lt;/li&gt;   &lt;li&gt;observationTimeStamp - Each row is has a time stamp for when the observation was taken&lt;/li&gt;   &lt;li&gt;At least one column with an observationVariableDbId&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table may have any or all of the following OPTIONAL columns. Included columns are decided by the server developer&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitName&lt;/li&gt;   &lt;li&gt;studyDbId&lt;/li&gt;   &lt;li&gt;studyName&lt;/li&gt;   &lt;li&gt;germplasmDbId&lt;/li&gt;   &lt;li&gt;germplasmName&lt;/li&gt;   &lt;li&gt;positionCoordinateX&lt;/li&gt;   &lt;li&gt;positionCoordinateY&lt;/li&gt;   &lt;li&gt;year&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table also may have any number of Observation Unit Hierarchy Level columns. For example:&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;field&lt;/li&gt;   &lt;li&gt;plot&lt;/li&gt;   &lt;li&gt;sub-plot&lt;/li&gt;   &lt;li&gt;plant&lt;/li&gt;   &lt;li&gt;pot&lt;/li&gt;   &lt;li&gt;block&lt;/li&gt;   &lt;li&gt;entry&lt;/li&gt;   &lt;li&gt;rep&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The JSON representation provides a pair of extra arrays for defining the headers of the table.  The first array \&quot;headerRow\&quot; will always contain \&quot;observationUnitDbId\&quot; and any or all of the OPTIONAL column header names.  The second array \&quot;observationVariables\&quot; contains the names and DbIds for the Observation Variables represented in the table.  By appending the two arrays, you can construct the complete header row of the table. &lt;/p&gt; &lt;p&gt;For CSV and TSV representations of the table, an extra header row is needed to describe both the Observation Variable DbId and the Observation Variable Name for each data column.  See the example responses below&lt;/p&gt;
-     *
-     * @param accept                                A standard HTTP request header that is used to request a specific content type (JSON, CSV, etc) which is \&quot;acceptable\&quot; to the client and should be returned by the server (required)
-     * @param observationUnitDbId                   The unique ID of an Observation Unit (optional)
-     * @param observationVariableDbId               The unique ID of an observation variable (optional)
-     * @param locationDbId                          The unique ID of a location where these observations were collected (optional)
-     * @param seasonDbId                            The year or Phenotyping campaign of a multi-annual study (trees, grape, ...) (optional)
-     * @param observationLevel                      **Deprecated in v2.1** Please use &#x60;observationUnitLevelName&#x60;. Github issue number #464  &lt;br&gt;The type of the observationUnit. Returns only the observation unit of the specified type; the parent levels ID can be accessed through observationUnitStructure.  (optional)
-     * @param searchResultsDbId                     Permanent unique identifier which references the search results (optional)
-     * @param observationTimeStampRangeStart        Timestamp range start (optional)
-     * @param observationTimeStampRangeEnd          Timestamp range end (optional)
-     * @param programDbId                           Use this parameter to only return results associated with the given &#x60;Program&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /programs&#x60; to find the list of available &#x60;Programs&#x60; on a server. (optional)
-     * @param trialDbId                             Use this parameter to only return results associated with the given &#x60;Trial&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /trials&#x60; to find the list of available &#x60;Trials&#x60; on a server. (optional)
-     * @param studyDbId                             Use this parameter to only return results associated with the given &#x60;Study&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /studies&#x60; to find the list of available &#x60;Studies&#x60; on a server. (optional)
-     * @param germplasmDbId                         Use this parameter to only return results associated with the given &#x60;Germplasm&#x60; unique identifier.  &lt;br/&gt;Use &#x60;GET /germplasm&#x60; to find the list of available &#x60;Germplasm&#x60; on a server. (optional)
-     * @param observationUnitLevelName              The Observation Unit Level. Returns only the observation unit of the specified Level.  &lt;br/&gt;References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelName  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelOrder             The Observation Unit Level Order Number. Returns only the observation unit of the specified Level.  References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelCode              The Observation Unit Level Code. This parameter should be used together with &#x60;observationUnitLevelName&#x60;  or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipName  The Observation Unit Level Relationship is a connection that this observation unit has to another level of the hierarchy.  &lt;br/&gt;For example, if you have several observation units at a &#x27;plot&#x27; level, they might all share a relationship to the same &#x27;field&#x27; level.   &lt;br/&gt;Use this parameter to identify groups of observation units that share a relationship level.  &lt;br/&gt;**Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipOrder The Observation Unit Level Order Number.  &lt;br/&gt;Returns only the observation unit of the specified Level. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelOrder  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipCode  The Observation Unit Level Code.  &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;levelCode  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param observationUnitLevelRelationshipDbId  The observationUnitDbId associated with a particular level and code. &lt;br/&gt;This parameter should be used together with &#x60;observationUnitLevelName&#x60; or &#x60;observationUnitLevelOrder&#x60;. References ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel-&gt;observationUnitDbId  &lt;br/&gt;For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.  (optional)
-     * @param authorization                         HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback                              The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call observationsTableGetAsync(ContentTypes accept, String observationUnitDbId, String observationVariableDbId, String locationDbId, String seasonDbId, String observationLevel, String searchResultsDbId, OffsetDateTime observationTimeStampRangeStart, OffsetDateTime observationTimeStampRangeEnd, String programDbId, String trialDbId, String studyDbId, String germplasmDbId, String observationUnitLevelName, String observationUnitLevelOrder, String observationUnitLevelCode, String observationUnitLevelRelationshipName, String observationUnitLevelRelationshipOrder, String observationUnitLevelRelationshipCode, String observationUnitLevelRelationshipDbId, String authorization, final ApiCallback<ObservationTableResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = observationsTableGetValidateBeforeCall(accept, observationUnitDbId, observationVariableDbId, locationDbId, seasonDbId, observationLevel, searchResultsDbId, observationTimeStampRangeStart, observationTimeStampRangeEnd, programDbId, trialDbId, studyDbId, germplasmDbId, observationUnitLevelName, observationUnitLevelOrder, observationUnitLevelCode, observationUnitLevelRelationshipName, observationUnitLevelRelationshipOrder, observationUnitLevelRelationshipCode, observationUnitLevelRelationshipDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationTableResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchObservationsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchObservationsPostCall(SearchObservationsBody body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/search/observations";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchObservationsPostValidateBeforeCall(SearchObservationsBody body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return searchObservationsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Submit a search request for &#x60;Observations&#x60;
-     * Submit a search request for &#x60;Observations&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/observations/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ObservationListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationListResponse searchObservationsPost(SearchObservationsBody body, String authorization) throws ApiException {
-        ApiResponse<ObservationListResponse> resp = searchObservationsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Submit a search request for &#x60;Observations&#x60;
-     * Submit a search request for &#x60;Observations&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/observations/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ObservationListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationListResponse> searchObservationsPostWithHttpInfo(SearchObservationsBody body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = searchObservationsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ObservationListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Submit a search request for &#x60;Observations&#x60; (asynchronously)
-     * Submit a search request for &#x60;Observations&#x60;&lt;br/&gt; Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use the corresponding &#x60;GET /search/observations/{searchResultsDbId}&#x60; to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchObservationsPostAsync(SearchObservationsBody body, String authorization, final ApiCallback<ObservationListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchObservationsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for searchObservationsSearchResultsDbIdGet
-     *
-     * @param accept                  A standard HTTP request header that is used to request a specific content type (JSON, CSV, etc) which is \&quot;acceptable\&quot; to the client and should be returned by the server (required)
-     * @param searchResultsDbId       Unique identifier which references the search results (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param page                    Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize                The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call searchObservationsSearchResultsDbIdGetCall(ContentTypes accept, String searchResultsDbId, String authorization, Integer page, Integer pageSize, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/search/observations/{searchResultsDbId}"
-                .replaceAll("\\{" + "searchResultsDbId" + "}", apiClient.escapeString(searchResultsDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        if (page != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("page", page));
-        if (pageSize != null)
-            localVarQueryParams.addAll(apiClient.parameterToPair("pageSize", pageSize));
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (accept != null)
-            localVarHeaderParams.put("Accept", apiClient.parameterToString(accept));
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call searchObservationsSearchResultsDbIdGetValidateBeforeCall(ContentTypes accept, String searchResultsDbId, String authorization, Integer page, Integer pageSize, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'accept' is set
-        if (accept == null) {
-            throw new ApiException("Missing the required parameter 'accept' when calling searchObservationsSearchResultsDbIdGet(Async)");
-        }
-        // verify the required parameter 'searchResultsDbId' is set
-        if (searchResultsDbId == null) {
-            throw new ApiException("Missing the required parameter 'searchResultsDbId' when calling searchObservationsSearchResultsDbIdGet(Async)");
-        }
-
-        return searchObservationsSearchResultsDbIdGetCall(accept, searchResultsDbId, authorization, page, pageSize, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the results of a &#x60;Observations&#x60; search request
-     * Get the results of a &#x60;Observations&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/observations&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param accept            A standard HTTP request header that is used to request a specific content type (JSON, CSV, etc) which is \&quot;acceptable\&quot; to the client and should be returned by the server (required)
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @return ObservationListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ObservationListResponse searchObservationsSearchResultsDbIdGet(ContentTypes accept, String searchResultsDbId, String authorization, Integer page, Integer pageSize) throws ApiException {
-        ApiResponse<ObservationListResponse> resp = searchObservationsSearchResultsDbIdGetWithHttpInfo(accept, searchResultsDbId, authorization, page, pageSize);
-        return resp.getData();
-    }
-
-    /**
-     * Get the results of a &#x60;Observations&#x60; search request
-     * Get the results of a &#x60;Observations&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/observations&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param accept            A standard HTTP request header that is used to request a specific content type (JSON, CSV, etc) which is \&quot;acceptable\&quot; to the client and should be returned by the server (required)
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @return ApiResponse&lt;ObservationListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ObservationListResponse> searchObservationsSearchResultsDbIdGetWithHttpInfo(ContentTypes accept, String searchResultsDbId, String authorization, Integer page, Integer pageSize) throws ApiException {
-        com.squareup.okhttp.Call call = searchObservationsSearchResultsDbIdGetValidateBeforeCall(accept, searchResultsDbId, authorization, page, pageSize, null, null);
-        Type localVarReturnType = new TypeToken<ObservationListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the results of a &#x60;Observations&#x60; search request (asynchronously)
-     * Get the results of a &#x60;Observations&#x60; search request &lt;br/&gt; Clients should submit a search request using the corresponding &#x60;POST /search/observations&#x60; endpoint. Search requests allow a client to send a complex query for data. However, the server may not respond with the search results immediately.  If a server needs more time to process the request, it might respond with a &#x60;searchResultsDbId&#x60;.  Use this endpoint to retrieve the results of the search. &lt;br/&gt;  Review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Search_Services#POST_Search_Entity\&quot;&gt;Search Services documentation&lt;/a&gt; for additional implementation details.
-     *
-     * @param accept            A standard HTTP request header that is used to request a specific content type (JSON, CSV, etc) which is \&quot;acceptable\&quot; to the client and should be returned by the server (required)
-     * @param searchResultsDbId Unique identifier which references the search results (required)
-     * @param authorization     HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param page              Used to request a specific page of data to be returned.  The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;. (optional)
-     * @param pageSize          The size of the pages to be returned. Default is &#x60;1000&#x60;. (optional)
-     * @param callback          The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call searchObservationsSearchResultsDbIdGetAsync(ContentTypes accept, String searchResultsDbId, String authorization, Integer page, Integer pageSize, final ApiCallback<ObservationListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = searchObservationsSearchResultsDbIdGetValidateBeforeCall(accept, searchResultsDbId, authorization, page, pageSize, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ObservationListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/OntologiesApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/OntologiesApi.java
deleted file mode 100644
index e3da5672..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/OntologiesApi.java
+++ /dev/null
@@ -1,510 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.phenotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.phenotype.OntologyQueryParams;
-import org.brapi.model.v21.phenotype.OntologyListResponse;
-import org.brapi.model.v21.phenotype.OntologyNewRequest;
-import org.brapi.model.v21.phenotype.OntologySingleResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class OntologiesApi {
-    private ApiClient apiClient;
-
-    public OntologiesApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public OntologiesApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for ontologiesGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call ontologiesGetCall(OntologyQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/ontologies";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call ontologiesGetValidateBeforeCall(OntologyQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return ontologiesGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a filtered list of Ontologies
-     * Retrieve a list of ontologies available in the system.  Each Ontology record describes the metadata of an existing ontology, it does not include all the terms that are part of that ontology.
-     *
-     * @return OntologyListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public OntologyListResponse ontologiesGet(OntologyQueryParams queryParams) throws ApiException {
-        ApiResponse<OntologyListResponse> resp = ontologiesGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get a filtered list of Ontologies
-     * Retrieve a list of ontologies available in the system.  Each Ontology record describes the metadata of an existing ontology, it does not include all the terms that are part of that ontology.
-     *
-     * @return ApiResponse&lt;OntologyListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<OntologyListResponse> ontologiesGetWithHttpInfo(OntologyQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = ontologiesGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<OntologyListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a filtered list of Ontologies (asynchronously)
-     * Retrieve a list of ontologies available in the system.  Each Ontology record describes the metadata of an existing ontology, it does not include all the terms that are part of that ontology.
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call ontologiesGetAsync(OntologyQueryParams queryParams, final ApiCallback<OntologyListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = ontologiesGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<OntologyListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for ontologiesOntologyDbIdGet
-     *
-     * @param ontologyDbId            The unique identifier for an ontology definition. Use this parameter to filter results based on a specific ontology   Use &#x60;GET /ontologies&#x60; to find the list of available ontologies on a server. (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call ontologiesOntologyDbIdGetCall(String ontologyDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/ontologies/{ontologyDbId}"
-                .replaceAll("\\{" + "ontologyDbId" + "}", apiClient.escapeString(ontologyDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call ontologiesOntologyDbIdGetValidateBeforeCall(String ontologyDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'ontologyDbId' is set
-        if (ontologyDbId == null) {
-            throw new ApiException("Missing the required parameter 'ontologyDbId' when calling ontologiesOntologyDbIdGet(Async)");
-        }
-
-        return ontologiesOntologyDbIdGetCall(ontologyDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get a specific Ontology record by its ontologyDbId
-     * Use this endpoint to retrieve a specific Ontology record by its ontologyDbId.  Each Ontology record describes the metadata of an existing ontology, it does not include all the terms that are part of that ontology.
-     *
-     * @param ontologyDbId  The unique identifier for an ontology definition. Use this parameter to filter results based on a specific ontology   Use &#x60;GET /ontologies&#x60; to find the list of available ontologies on a server. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return OntologySingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public OntologySingleResponse ontologiesOntologyDbIdGet(String ontologyDbId, String authorization) throws ApiException {
-        ApiResponse<OntologySingleResponse> resp = ontologiesOntologyDbIdGetWithHttpInfo(ontologyDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get a specific Ontology record by its ontologyDbId
-     * Use this endpoint to retrieve a specific Ontology record by its ontologyDbId.  Each Ontology record describes the metadata of an existing ontology, it does not include all the terms that are part of that ontology.
-     *
-     * @param ontologyDbId  The unique identifier for an ontology definition. Use this parameter to filter results based on a specific ontology   Use &#x60;GET /ontologies&#x60; to find the list of available ontologies on a server. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;OntologySingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<OntologySingleResponse> ontologiesOntologyDbIdGetWithHttpInfo(String ontologyDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = ontologiesOntologyDbIdGetValidateBeforeCall(ontologyDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<OntologySingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get a specific Ontology record by its ontologyDbId (asynchronously)
-     * Use this endpoint to retrieve a specific Ontology record by its ontologyDbId.  Each Ontology record describes the metadata of an existing ontology, it does not include all the terms that are part of that ontology.
-     *
-     * @param ontologyDbId  The unique identifier for an ontology definition. Use this parameter to filter results based on a specific ontology   Use &#x60;GET /ontologies&#x60; to find the list of available ontologies on a server. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call ontologiesOntologyDbIdGetAsync(String ontologyDbId, String authorization, final ApiCallback<OntologySingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = ontologiesOntologyDbIdGetValidateBeforeCall(ontologyDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<OntologySingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for ontologiesOntologyDbIdPut
-     *
-     * @param ontologyDbId            The unique identifier for an ontology definition. Use this parameter to filter results based on a specific ontology   Use &#x60;GET /ontologies&#x60; to find the list of available ontologies on a server. (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call ontologiesOntologyDbIdPutCall(String ontologyDbId, OntologyNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/ontologies/{ontologyDbId}"
-                .replaceAll("\\{" + "ontologyDbId" + "}", apiClient.escapeString(ontologyDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call ontologiesOntologyDbIdPutValidateBeforeCall(String ontologyDbId, OntologyNewRequest body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'ontologyDbId' is set
-        if (ontologyDbId == null) {
-            throw new ApiException("Missing the required parameter 'ontologyDbId' when calling ontologiesOntologyDbIdPut(Async)");
-        }
-
-        return ontologiesOntologyDbIdPutCall(ontologyDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update a specific Ontology record
-     * Use this endpoint to update a specific Ontology record.  Each Ontology record describes the metadata of an existing ontology, it does not include all the terms that are part of that ontology.
-     *
-     * @param ontologyDbId  The unique identifier for an ontology definition. Use this parameter to filter results based on a specific ontology   Use &#x60;GET /ontologies&#x60; to find the list of available ontologies on a server. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return OntologySingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public OntologySingleResponse ontologiesOntologyDbIdPut(String ontologyDbId, OntologyNewRequest body, String authorization) throws ApiException {
-        ApiResponse<OntologySingleResponse> resp = ontologiesOntologyDbIdPutWithHttpInfo(ontologyDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update a specific Ontology record
-     * Use this endpoint to update a specific Ontology record.  Each Ontology record describes the metadata of an existing ontology, it does not include all the terms that are part of that ontology.
-     *
-     * @param ontologyDbId  The unique identifier for an ontology definition. Use this parameter to filter results based on a specific ontology   Use &#x60;GET /ontologies&#x60; to find the list of available ontologies on a server. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;OntologySingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<OntologySingleResponse> ontologiesOntologyDbIdPutWithHttpInfo(String ontologyDbId, OntologyNewRequest body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = ontologiesOntologyDbIdPutValidateBeforeCall(ontologyDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<OntologySingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update a specific Ontology record (asynchronously)
-     * Use this endpoint to update a specific Ontology record.  Each Ontology record describes the metadata of an existing ontology, it does not include all the terms that are part of that ontology.
-     *
-     * @param ontologyDbId  The unique identifier for an ontology definition. Use this parameter to filter results based on a specific ontology   Use &#x60;GET /ontologies&#x60; to find the list of available ontologies on a server. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call ontologiesOntologyDbIdPutAsync(String ontologyDbId, OntologyNewRequest body, String authorization, final ApiCallback<OntologySingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = ontologiesOntologyDbIdPutValidateBeforeCall(ontologyDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<OntologySingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for ontologiesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call ontologiesPostCall(List<OntologyNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/ontologies";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call ontologiesPostValidateBeforeCall(List<OntologyNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return ontologiesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Create a new Ontology record in the database
-     * Use this endpoint to create a new Ontology record in the database Each Ontology record describes the metadata of an existing ontology, it does not include all the terms that are part of that ontology.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return OntologyListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public OntologyListResponse ontologiesPost(List<OntologyNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<OntologyListResponse> resp = ontologiesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Create a new Ontology record in the database
-     * Use this endpoint to create a new Ontology record in the database Each Ontology record describes the metadata of an existing ontology, it does not include all the terms that are part of that ontology.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;OntologyListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<OntologyListResponse> ontologiesPostWithHttpInfo(List<OntologyNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = ontologiesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<OntologyListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Create a new Ontology record in the database (asynchronously)
-     * Use this endpoint to create a new Ontology record in the database Each Ontology record describes the metadata of an existing ontology, it does not include all the terms that are part of that ontology.
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call ontologiesPostAsync(List<OntologyNewRequest> body, String authorization, final ApiCallback<OntologyListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = ontologiesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<OntologyListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ScalesApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ScalesApi.java
deleted file mode 100644
index 1d474dfd..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/ScalesApi.java
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.phenotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.phenotype.ScaleQueryParams;
-import org.brapi.model.v21.phenotype.ScaleBaseClass;
-import org.brapi.model.v21.phenotype.ScaleListResponse;
-import org.brapi.model.v21.phenotype.ScaleNewRequest;
-import org.brapi.model.v21.phenotype.ScaleSingleResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ScalesApi {
-    private ApiClient apiClient;
-
-    public ScalesApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public ScalesApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for scalesGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call scalesGetCall(ScaleQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/scales";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call scalesGetValidateBeforeCall(ScaleQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return scalesGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Scales
-     * Returns a list of Scales available on a server.  An Observation Variable has 3 critical parts; A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.
-     *
-     * @return ScaleListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ScaleListResponse scalesGet(ScaleQueryParams queryParams) throws ApiException {
-        ApiResponse<ScaleListResponse> resp = scalesGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Scales
-     * Returns a list of Scales available on a server.  An Observation Variable has 3 critical parts; A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.
-     *
-     * @return ApiResponse&lt;ScaleListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ScaleListResponse> scalesGetWithHttpInfo(ScaleQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = scalesGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<ScaleListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Scales (asynchronously)
-     * Returns a list of Scales available on a server.  An Observation Variable has 3 critical parts; A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call scalesGetAsync(ScaleQueryParams queryParams, final ApiCallback<ScaleListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = scalesGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ScaleListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for scalesPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call scalesPostCall(List<ScaleNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/scales";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call scalesPostValidateBeforeCall(List<ScaleNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return scalesPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Add new Scales
-     * Create new scale objects in the database
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ScaleListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ScaleListResponse scalesPost(List<ScaleNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<ScaleListResponse> resp = scalesPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Add new Scales
-     * Create new scale objects in the database
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ScaleListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ScaleListResponse> scalesPostWithHttpInfo(List<ScaleNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = scalesPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ScaleListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Add new Scales (asynchronously)
-     * Create new scale objects in the database
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call scalesPostAsync(List<ScaleNewRequest> body, String authorization, final ApiCallback<ScaleListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = scalesPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ScaleListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for scalesScaleDbIdGet
-     *
-     * @param scaleDbId               Id of the scale to retrieve details of. (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call scalesScaleDbIdGetCall(String scaleDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/scales/{scaleDbId}"
-                .replaceAll("\\{" + "scaleDbId" + "}", apiClient.escapeString(scaleDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call scalesScaleDbIdGetValidateBeforeCall(String scaleDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'scaleDbId' is set
-        if (scaleDbId == null) {
-            throw new ApiException("Missing the required parameter 'scaleDbId' when calling scalesScaleDbIdGet(Async)");
-        }
-
-        return scalesScaleDbIdGetCall(scaleDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details of a specific Scale
-     * Retrieve details about a specific scale  An Observation Variable has 3 critical parts: A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.
-     *
-     * @param scaleDbId     Id of the scale to retrieve details of. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ScaleSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ScaleSingleResponse scalesScaleDbIdGet(String scaleDbId, String authorization) throws ApiException {
-        ApiResponse<ScaleSingleResponse> resp = scalesScaleDbIdGetWithHttpInfo(scaleDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details of a specific Scale
-     * Retrieve details about a specific scale  An Observation Variable has 3 critical parts: A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.
-     *
-     * @param scaleDbId     Id of the scale to retrieve details of. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ScaleSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ScaleSingleResponse> scalesScaleDbIdGetWithHttpInfo(String scaleDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = scalesScaleDbIdGetValidateBeforeCall(scaleDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ScaleSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details of a specific Scale (asynchronously)
-     * Retrieve details about a specific scale  An Observation Variable has 3 critical parts: A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.
-     *
-     * @param scaleDbId     Id of the scale to retrieve details of. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call scalesScaleDbIdGetAsync(String scaleDbId, String authorization, final ApiCallback<ScaleSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = scalesScaleDbIdGetValidateBeforeCall(scaleDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ScaleSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for scalesScaleDbIdPut
-     *
-     * @param scaleDbId               Id of the scale to retrieve details of. (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call scalesScaleDbIdPutCall(String scaleDbId, ScaleBaseClass body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/scales/{scaleDbId}"
-                .replaceAll("\\{" + "scaleDbId" + "}", apiClient.escapeString(scaleDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-                "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder()
-                        .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                        .build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call scalesScaleDbIdPutValidateBeforeCall(String scaleDbId, ScaleBaseClass body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'scaleDbId' is set
-        if (scaleDbId == null) {
-            throw new ApiException("Missing the required parameter 'scaleDbId' when calling scalesScaleDbIdPut(Async)");
-        }
-
-        return scalesScaleDbIdPutCall(scaleDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update an existing Scale
-     * Update the details of an existing scale
-     *
-     * @param scaleDbId     Id of the scale to retrieve details of. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ScaleSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ScaleSingleResponse scalesScaleDbIdPut(String scaleDbId, ScaleBaseClass body, String authorization) throws ApiException {
-        ApiResponse<ScaleSingleResponse> resp = scalesScaleDbIdPutWithHttpInfo(scaleDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update an existing Scale
-     * Update the details of an existing scale
-     *
-     * @param scaleDbId     Id of the scale to retrieve details of. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;ScaleSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<ScaleSingleResponse> scalesScaleDbIdPutWithHttpInfo(String scaleDbId, ScaleBaseClass body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = scalesScaleDbIdPutValidateBeforeCall(scaleDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<ScaleSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update an existing Scale (asynchronously)
-     * Update the details of an existing scale
-     *
-     * @param scaleDbId     Id of the scale to retrieve details of. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call scalesScaleDbIdPutAsync(String scaleDbId, ScaleBaseClass body, String authorization, final ApiCallback<ScaleSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = scalesScaleDbIdPutValidateBeforeCall(scaleDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ScaleSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/TraitsApi.java b/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/TraitsApi.java
deleted file mode 100644
index e6d0f639..00000000
--- a/brapi-java-client-v21/src/main/java/org/brapi/client/v21/modules/phenotype/TraitsApi.java
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.client.v21.modules.phenotype;
-
-import com.google.gson.reflect.TypeToken;
-import org.brapi.client.v21.*;
-import org.brapi.client.v21.model.queryParams.phenotype.TraitQueryParams;
-import org.brapi.model.v21.phenotype.TraitBaseClass;
-import org.brapi.model.v21.phenotype.TraitListResponse;
-import org.brapi.model.v21.phenotype.TraitNewRequest;
-import org.brapi.model.v21.phenotype.TraitSingleResponse;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class TraitsApi {
-    private ApiClient apiClient;
-
-    public TraitsApi() {
-        this(Configuration.getDefaultApiClient());
-    }
-
-    public TraitsApi(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public ApiClient getApiClient() {
-        return apiClient;
-    }
-
-    public void setApiClient(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    /**
-     * Build call for traitsGet
-     *
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call traitsGetCall(TraitQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/traits";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-
-        queryParams.buildQueryParams(apiClient, localVarQueryParams, localVarHeaderParams);
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {"application/json"};
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder().body(new ProgressResponseBody(originalResponse.body(), progressListener)).build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call traitsGetValidateBeforeCall(TraitQueryParams queryParams, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return traitsGetCall(queryParams, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the Traits
-     * Call to retrieve a list of traits available in the system and their associated variables.  An Observation Variable has 3 critical parts; A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.&#x27;
-     *
-     * @return TraitListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public TraitListResponse traitsGet(TraitQueryParams queryParams) throws ApiException {
-        ApiResponse<TraitListResponse> resp = traitsGetWithHttpInfo(queryParams);
-        return resp.getData();
-    }
-
-    /**
-     * Get the Traits
-     * Call to retrieve a list of traits available in the system and their associated variables.  An Observation Variable has 3 critical parts; A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.&#x27;
-     *
-     * @return ApiResponse&lt;TraitListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<TraitListResponse> traitsGetWithHttpInfo(TraitQueryParams queryParams) throws ApiException {
-        com.squareup.okhttp.Call call = traitsGetValidateBeforeCall(queryParams, null, null);
-        Type localVarReturnType = new TypeToken<TraitListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the Traits (asynchronously)
-     * Call to retrieve a list of traits available in the system and their associated variables.  An Observation Variable has 3 critical parts; A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.&#x27;
-     *
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call traitsGetAsync(TraitQueryParams queryParams, final ApiCallback<TraitListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = traitsGetValidateBeforeCall(queryParams, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<TraitListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for traitsPost
-     *
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call traitsPostCall(List<TraitNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/traits";
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {"application/json"};
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {"application/json"};
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder().body(new ProgressResponseBody(originalResponse.body(), progressListener)).build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call traitsPostValidateBeforeCall(List<TraitNewRequest> body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        return traitsPostCall(body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Add new Traits
-     * Create new trait objects in the database
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return TraitListResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public TraitListResponse traitsPost(List<TraitNewRequest> body, String authorization) throws ApiException {
-        ApiResponse<TraitListResponse> resp = traitsPostWithHttpInfo(body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Add new Traits
-     * Create new trait objects in the database
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;TraitListResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<TraitListResponse> traitsPostWithHttpInfo(List<TraitNewRequest> body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = traitsPostValidateBeforeCall(body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<TraitListResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Add new Traits (asynchronously)
-     * Create new trait objects in the database
-     *
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call traitsPostAsync(List<TraitNewRequest> body, String authorization, final ApiCallback<TraitListResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = traitsPostValidateBeforeCall(body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<TraitListResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for traitsTraitDbIdGet
-     *
-     * @param traitDbId               Id of the trait to retrieve details of. (required)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call traitsTraitDbIdGetCall(String traitDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        Object localVarPostBody = null;
-
-        // create path and map variables
-        String localVarPath = "/traits/{traitDbId}".replaceAll("\\{" + "traitDbId" + "}", apiClient.escapeString(traitDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {"application/json"};
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder().body(new ProgressResponseBody(originalResponse.body(), progressListener)).build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call traitsTraitDbIdGetValidateBeforeCall(String traitDbId, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'traitDbId' is set
-        if (traitDbId == null) {
-            throw new ApiException("Missing the required parameter 'traitDbId' when calling traitsTraitDbIdGet(Async)");
-        }
-
-        return traitsTraitDbIdGetCall(traitDbId, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Get the details of a specific Trait
-     * Retrieve the details of a single trait  An Observation Variable has 3 critical parts: A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.
-     *
-     * @param traitDbId     Id of the trait to retrieve details of. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return TraitSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public TraitSingleResponse traitsTraitDbIdGet(String traitDbId, String authorization) throws ApiException {
-        ApiResponse<TraitSingleResponse> resp = traitsTraitDbIdGetWithHttpInfo(traitDbId, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Get the details of a specific Trait
-     * Retrieve the details of a single trait  An Observation Variable has 3 critical parts: A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.
-     *
-     * @param traitDbId     Id of the trait to retrieve details of. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;TraitSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<TraitSingleResponse> traitsTraitDbIdGetWithHttpInfo(String traitDbId, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = traitsTraitDbIdGetValidateBeforeCall(traitDbId, authorization, null, null);
-        Type localVarReturnType = new TypeToken<TraitSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Get the details of a specific Trait (asynchronously)
-     * Retrieve the details of a single trait  An Observation Variable has 3 critical parts: A Trait being observed, a Method for making the observation, and a Scale on which the observation can be measured and compared with other observations.
-     *
-     * @param traitDbId     Id of the trait to retrieve details of. (required)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call traitsTraitDbIdGetAsync(String traitDbId, String authorization, final ApiCallback<TraitSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = traitsTraitDbIdGetValidateBeforeCall(traitDbId, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<TraitSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
-    /**
-     * Build call for traitsTraitDbIdPut
-     *
-     * @param traitDbId               Id of the trait to retrieve details of. (required)
-     * @param body                    (optional)
-     * @param authorization           HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param progressListener        Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call traitsTraitDbIdPutCall(String traitDbId, TraitBaseClass body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-
-        // create path and map variables
-        String localVarPath = "/traits/{traitDbId}".replaceAll("\\{" + "traitDbId" + "}", apiClient.escapeString(traitDbId));
-
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        if (authorization != null)
-            localVarHeaderParams.put("Authorization", apiClient.parameterToString(authorization));
-
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {"application/json"};
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {"application/json"};
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(chain -> {
-                com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                return originalResponse.newBuilder().body(new ProgressResponseBody(originalResponse.body(), progressListener)).build();
-            });
-        }
-
-        String[] localVarAuthNames = new String[]{"AuthorizationToken"};
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, body, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    private com.squareup.okhttp.Call traitsTraitDbIdPutValidateBeforeCall(String traitDbId, TraitBaseClass body, String authorization, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-        // verify the required parameter 'traitDbId' is set
-        if (traitDbId == null) {
-            throw new ApiException("Missing the required parameter 'traitDbId' when calling traitsTraitDbIdPut(Async)");
-        }
-
-        return traitsTraitDbIdPutCall(traitDbId, body, authorization, progressListener, progressRequestListener);
-
-
-    }
-
-    /**
-     * Update an existing Trait
-     * Update an existing trait
-     *
-     * @param traitDbId     Id of the trait to retrieve details of. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return TraitSingleResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public TraitSingleResponse traitsTraitDbIdPut(String traitDbId, TraitBaseClass body, String authorization) throws ApiException {
-        ApiResponse<TraitSingleResponse> resp = traitsTraitDbIdPutWithHttpInfo(traitDbId, body, authorization);
-        return resp.getData();
-    }
-
-    /**
-     * Update an existing Trait
-     * Update an existing trait
-     *
-     * @param traitDbId     Id of the trait to retrieve details of. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @return ApiResponse&lt;TraitSingleResponse&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    public ApiResponse<TraitSingleResponse> traitsTraitDbIdPutWithHttpInfo(String traitDbId, TraitBaseClass body, String authorization) throws ApiException {
-        com.squareup.okhttp.Call call = traitsTraitDbIdPutValidateBeforeCall(traitDbId, body, authorization, null, null);
-        Type localVarReturnType = new TypeToken<TraitSingleResponse>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Update an existing Trait (asynchronously)
-     * Update an existing trait
-     *
-     * @param traitDbId     Id of the trait to retrieve details of. (required)
-     * @param body          (optional)
-     * @param authorization HTTP HEADER - Token used for Authorization   &lt;strong&gt; Bearer {token_string} &lt;/strong&gt; (optional)
-     * @param callback      The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     */
-    public com.squareup.okhttp.Call traitsTraitDbIdPutAsync(String traitDbId, TraitBaseClass body, String authorization, final ApiCallback<TraitSingleResponse> callback) throws ApiException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = callback::onDownloadProgress;
-
-            progressRequestListener = callback::onUploadProgress;
-        }
-
-        com.squareup.okhttp.Call call = traitsTraitDbIdPutValidateBeforeCall(traitDbId, body, authorization, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<TraitSingleResponse>() {
-        }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-}
diff --git a/brapi-java-model-v21/pom.xml b/brapi-java-model-v21/pom.xml
deleted file mode 100644
index 6bcbc28b..00000000
--- a/brapi-java-model-v21/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <parent>
-        <artifactId>brapi</artifactId>
-        <groupId>org.brapi</groupId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>brapi-java-model-v21</artifactId>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <gson.version>2.8.5</gson.version>
-        <swagger.core.version>2.2.4</swagger.core.version>
-        <threeten.version>1.5.0</threeten.version>
-        <jackson.version>2.10.1</jackson.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/io.swagger.core.v3/swagger-annotations -->
-        <dependency>
-            <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger.core.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.threeten</groupId>
-            <artifactId>threetenbp</artifactId>
-            <version>${threeten.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/Metadata.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/Metadata.java
deleted file mode 100644
index 6f08065b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/Metadata.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-//TODO this is generated for each module, probably only need one
-/**
- * An object in the BrAPI standard response model that describes some information about the service call being performed. This includes supplementary data, status log messages, and pagination information.
- */
-@Schema(description = "An object in the BrAPI standard response model that describes some information about the service call being performed. This includes supplementary data, status log messages, and pagination information.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class Metadata {
-    @SerializedName("datafiles")
-    private List<MetadataDatafiles> datafiles = null;
-
-    @SerializedName("pagination")
-    private MetadataPagination pagination = null;
-
-    @SerializedName("status")
-    private List<MetadataStatus> status = null;
-
-    public Metadata datafiles(List<MetadataDatafiles> datafiles) {
-        this.datafiles = datafiles;
-        return this;
-    }
-
-    public Metadata addDatafilesItem(MetadataDatafiles datafilesItem) {
-        if (this.datafiles == null) {
-            this.datafiles = new ArrayList<MetadataDatafiles>();
-        }
-        this.datafiles.add(datafilesItem);
-        return this;
-    }
-
-    /**
-     * The datafiles contains a list of file URLs and metadata.  These files contain additional information related to the returned object and can be retrieved by a subsequent call.  This could be a supplementary data file, an informational file, the uploaded file where the data originated from, a generated file representing the whole dataset in a particular format, or any other related file.
-     *
-     * @return datafiles
-     **/
-    @Schema(example = "[]", description = "The datafiles contains a list of file URLs and metadata.  These files contain additional information related to the returned object and can be retrieved by a subsequent call.  This could be a supplementary data file, an informational file, the uploaded file where the data originated from, a generated file representing the whole dataset in a particular format, or any other related file. ")
-    public List<MetadataDatafiles> getDatafiles() {
-        return datafiles;
-    }
-
-    public void setDatafiles(List<MetadataDatafiles> datafiles) {
-        this.datafiles = datafiles;
-    }
-
-    public Metadata pagination(MetadataPagination pagination) {
-        this.pagination = pagination;
-        return this;
-    }
-
-    /**
-     * Get pagination
-     *
-     * @return pagination
-     **/
-    @Schema(description = "")
-    public MetadataPagination getPagination() {
-        return pagination;
-    }
-
-    public void setPagination(MetadataPagination pagination) {
-        this.pagination = pagination;
-    }
-
-    public Metadata status(List<MetadataStatus> status) {
-        this.status = status;
-        return this;
-    }
-
-    public Metadata addStatusItem(MetadataStatus statusItem) {
-        if (this.status == null) {
-            this.status = new ArrayList<MetadataStatus>();
-        }
-        this.status.add(statusItem);
-        return this;
-    }
-
-    /**
-     * The status field contains a list of informational status messages from the server.  If no status is reported, an empty list should be returned. See Error Reporting for more information.
-     *
-     * @return status
-     **/
-    @Schema(description = "The status field contains a list of informational status messages from the server.  If no status is reported, an empty list should be returned. See Error Reporting for more information.")
-    public List<MetadataStatus> getStatus() {
-        return status;
-    }
-
-    public void setStatus(List<MetadataStatus> status) {
-        this.status = status;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Metadata metadata = (Metadata) o;
-        return Objects.equals(this.datafiles, metadata.datafiles) &&
-                Objects.equals(this.pagination, metadata.pagination) &&
-                Objects.equals(this.status, metadata.status);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(datafiles, pagination, status);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Metadata {\n");
-
-        sb.append("    datafiles: ").append(toIndentedString(datafiles)).append("\n");
-        sb.append("    pagination: ").append(toIndentedString(pagination)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataBase.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataBase.java
deleted file mode 100644
index cea6677f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataBase.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An object in the BrAPI standard response model that describes some information about the service call being performed. This includes supplementary data, status log messages, and pagination information.
- */
-@Schema(description = "An object in the BrAPI standard response model that describes some information about the service call being performed. This includes supplementary data, status log messages, and pagination information.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class MetadataBase {
-    @SerializedName("datafiles")
-    private List<MetadataDatafiles> datafiles = null;
-
-    @SerializedName("status")
-    private List<MetadataStatus> status = null;
-
-    public MetadataBase datafiles(List<MetadataDatafiles> datafiles) {
-        this.datafiles = datafiles;
-        return this;
-    }
-
-    public MetadataBase addDatafilesItem(MetadataDatafiles datafilesItem) {
-        if (this.datafiles == null) {
-            this.datafiles = new ArrayList<MetadataDatafiles>();
-        }
-        this.datafiles.add(datafilesItem);
-        return this;
-    }
-
-    /**
-     * The datafiles contains a list of file URLs and metadata.  These files contain additional information related to the returned object and can be retrieved by a subsequent call.  This could be a supplementary data file, an informational file, the uploaded file where the data originated from, a generated file representing the whole dataset in a particular format, or any other related file.
-     *
-     * @return datafiles
-     **/
-    @Schema(example = "[]", description = "The datafiles contains a list of file URLs and metadata.  These files contain additional information related to the returned object and can be retrieved by a subsequent call.  This could be a supplementary data file, an informational file, the uploaded file where the data originated from, a generated file representing the whole dataset in a particular format, or any other related file. ")
-    public List<MetadataDatafiles> getDatafiles() {
-        return datafiles;
-    }
-
-    public void setDatafiles(List<MetadataDatafiles> datafiles) {
-        this.datafiles = datafiles;
-    }
-
-    public MetadataBase status(List<MetadataStatus> status) {
-        this.status = status;
-        return this;
-    }
-
-    public MetadataBase addStatusItem(MetadataStatus statusItem) {
-        if (this.status == null) {
-            this.status = new ArrayList<MetadataStatus>();
-        }
-        this.status.add(statusItem);
-        return this;
-    }
-
-    /**
-     * The status field contains a list of informational status messages from the server.  If no status is reported, an empty list should be returned. See Error Reporting for more information.
-     *
-     * @return status
-     **/
-    @Schema(description = "The status field contains a list of informational status messages from the server.  If no status is reported, an empty list should be returned. See Error Reporting for more information.")
-    public List<MetadataStatus> getStatus() {
-        return status;
-    }
-
-    public void setStatus(List<MetadataStatus> status) {
-        this.status = status;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MetadataBase metadataBase = (MetadataBase) o;
-        return Objects.equals(this.datafiles, metadataBase.datafiles) &&
-                Objects.equals(this.status, metadataBase.status);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(datafiles, status);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MetadataBase {\n");
-
-        sb.append("    datafiles: ").append(toIndentedString(datafiles)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataDatafiles.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataDatafiles.java
deleted file mode 100644
index df7299f7..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataDatafiles.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * A dataFile contains a URL and the relevant file metadata to represent a file
- */
-@Schema(description = "A dataFile contains a URL and the relevant file metadata to represent a file")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class MetadataDatafiles {
-    @SerializedName("fileDescription")
-    private String fileDescription = null;
-
-    @SerializedName("fileMD5Hash")
-    private String fileMD5Hash = null;
-
-    @SerializedName("fileName")
-    private String fileName = null;
-
-    @SerializedName("fileSize")
-    private Integer fileSize = null;
-
-    @SerializedName("fileType")
-    private String fileType = null;
-
-    @SerializedName("fileURL")
-    private String fileURL = null;
-
-    public MetadataDatafiles fileDescription(String fileDescription) {
-        this.fileDescription = fileDescription;
-        return this;
-    }
-
-    /**
-     * A human readable description of the file contents
-     *
-     * @return fileDescription
-     **/
-    @Schema(example = "This is an Excel data file", description = "A human readable description of the file contents")
-    public String getFileDescription() {
-        return fileDescription;
-    }
-
-    public void setFileDescription(String fileDescription) {
-        this.fileDescription = fileDescription;
-    }
-
-    public MetadataDatafiles fileMD5Hash(String fileMD5Hash) {
-        this.fileMD5Hash = fileMD5Hash;
-        return this;
-    }
-
-    /**
-     * The MD5 Hash of the file contents to be used as a check sum
-     *
-     * @return fileMD5Hash
-     **/
-    @Schema(example = "c2365e900c81a89cf74d83dab60df146", description = "The MD5 Hash of the file contents to be used as a check sum")
-    public String getFileMD5Hash() {
-        return fileMD5Hash;
-    }
-
-    public void setFileMD5Hash(String fileMD5Hash) {
-        this.fileMD5Hash = fileMD5Hash;
-    }
-
-    public MetadataDatafiles fileName(String fileName) {
-        this.fileName = fileName;
-        return this;
-    }
-
-    /**
-     * The name of the file
-     *
-     * @return fileName
-     **/
-    @Schema(example = "datafile.xlsx", description = "The name of the file")
-    public String getFileName() {
-        return fileName;
-    }
-
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
-    public MetadataDatafiles fileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-        return this;
-    }
-
-    /**
-     * The size of the file in bytes
-     *
-     * @return fileSize
-     **/
-    @Schema(example = "4398", description = "The size of the file in bytes")
-    public Integer getFileSize() {
-        return fileSize;
-    }
-
-    public void setFileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-    }
-
-    public MetadataDatafiles fileType(String fileType) {
-        this.fileType = fileType;
-        return this;
-    }
-
-    /**
-     * The type or format of the file. Preferably MIME Type.
-     *
-     * @return fileType
-     **/
-    @Schema(example = "application/vnd.ms-excel", description = "The type or format of the file. Preferably MIME Type.")
-    public String getFileType() {
-        return fileType;
-    }
-
-    public void setFileType(String fileType) {
-        this.fileType = fileType;
-    }
-
-    public MetadataDatafiles fileURL(String fileURL) {
-        this.fileURL = fileURL;
-        return this;
-    }
-
-    /**
-     * The absolute URL where the file is located
-     *
-     * @return fileURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/examples/datafile.xlsx", required = true, description = "The absolute URL where the file is located")
-    public String getFileURL() {
-        return fileURL;
-    }
-
-    public void setFileURL(String fileURL) {
-        this.fileURL = fileURL;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MetadataDatafiles metadataDatafiles = (MetadataDatafiles) o;
-        return Objects.equals(this.fileDescription, metadataDatafiles.fileDescription) &&
-                Objects.equals(this.fileMD5Hash, metadataDatafiles.fileMD5Hash) &&
-                Objects.equals(this.fileName, metadataDatafiles.fileName) &&
-                Objects.equals(this.fileSize, metadataDatafiles.fileSize) &&
-                Objects.equals(this.fileType, metadataDatafiles.fileType) &&
-                Objects.equals(this.fileURL, metadataDatafiles.fileURL);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(fileDescription, fileMD5Hash, fileName, fileSize, fileType, fileURL);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MetadataDatafiles {\n");
-
-        sb.append("    fileDescription: ").append(toIndentedString(fileDescription)).append("\n");
-        sb.append("    fileMD5Hash: ").append(toIndentedString(fileMD5Hash)).append("\n");
-        sb.append("    fileName: ").append(toIndentedString(fileName)).append("\n");
-        sb.append("    fileSize: ").append(toIndentedString(fileSize)).append("\n");
-        sb.append("    fileType: ").append(toIndentedString(fileType)).append("\n");
-        sb.append("    fileURL: ").append(toIndentedString(fileURL)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataPagination.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataPagination.java
deleted file mode 100644
index ee813c14..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataPagination.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * The pagination object is applicable only when the payload contains a \&quot;data\&quot; key. It describes the pagination of the data contained in the \&quot;data\&quot; array, as a way to identify which subset of data is being returned.  &lt;br&gt; Pages are zero indexed, so the first page will be page 0 (zero).
- */
-@Schema(description = "The pagination object is applicable only when the payload contains a \"data\" key. It describes the pagination of the data contained in the \"data\" array, as a way to identify which subset of data is being returned.  <br> Pages are zero indexed, so the first page will be page 0 (zero).")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class MetadataPagination {
-    @SerializedName("currentPage")
-    private Integer currentPage = 0;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = 1000;
-
-    @SerializedName("totalCount")
-    private Integer totalCount = null;
-
-    @SerializedName("totalPages")
-    private Integer totalPages = null;
-
-    public MetadataPagination currentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-        return this;
-    }
-
-    /**
-     * The index number for the returned page of data. This should always match the requested page number or the default page (0).
-     *
-     * @return currentPage
-     **/
-    @Schema(example = "0", required = true, description = "The index number for the returned page of data. This should always match the requested page number or the default page (0).")
-    public Integer getCurrentPage() {
-        return currentPage;
-    }
-
-    public void setCurrentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-    }
-
-    public MetadataPagination pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", required = true, description = "The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public MetadataPagination totalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-        return this;
-    }
-
-    /**
-     * The total number of elements that are available on the server and match the requested query parameters.
-     *
-     * @return totalCount
-     **/
-    @Schema(example = "10", description = "The total number of elements that are available on the server and match the requested query parameters.")
-    public Integer getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public MetadataPagination totalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-        return this;
-    }
-
-    /**
-     * The total number of pages of elements available on the server. This should be calculated with the following formula.  &lt;br&gt; totalPages &#x3D; CEILING( totalCount / requested_page_size)
-     *
-     * @return totalPages
-     **/
-    @Schema(example = "1", description = "The total number of pages of elements available on the server. This should be calculated with the following formula.  <br> totalPages = CEILING( totalCount / requested_page_size)")
-    public Integer getTotalPages() {
-        return totalPages;
-    }
-
-    public void setTotalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MetadataPagination metadataPagination = (MetadataPagination) o;
-        return Objects.equals(this.currentPage, metadataPagination.currentPage) &&
-                Objects.equals(this.pageSize, metadataPagination.pageSize) &&
-                Objects.equals(this.totalCount, metadataPagination.totalCount) &&
-                Objects.equals(this.totalPages, metadataPagination.totalPages);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(currentPage, pageSize, totalCount, totalPages);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MetadataPagination {\n");
-
-        sb.append("    currentPage: ").append(toIndentedString(currentPage)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    totalCount: ").append(toIndentedString(totalCount)).append("\n");
-        sb.append("    totalPages: ").append(toIndentedString(totalPages)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataStatus.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataStatus.java
deleted file mode 100644
index 98bd0bee..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataStatus.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * An array of status messages to convey technical logging information from the server to the client.
- */
-@Schema(description = "An array of status messages to convey technical logging information from the server to the client.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class MetadataStatus {
-    @SerializedName("message")
-    private String message = null;
-
-    /**
-     * The logging level for the attached message
-     */
-    @JsonAdapter(MessageTypeEnum.Adapter.class)
-    public enum MessageTypeEnum {
-        DEBUG("DEBUG"),
-        ERROR("ERROR"),
-        WARNING("WARNING"),
-        INFO("INFO");
-
-        private String value;
-
-        MessageTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static MessageTypeEnum fromValue(String input) {
-            for (MessageTypeEnum b : MessageTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<MessageTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final MessageTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public MessageTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return MessageTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("messageType")
-    private MessageTypeEnum messageType = null;
-
-    public MetadataStatus message(String message) {
-        this.message = message;
-        return this;
-    }
-
-    /**
-     * A short message concerning the status of this request/response
-     *
-     * @return message
-     **/
-    @Schema(example = "Request accepted, response successful", required = true, description = "A short message concerning the status of this request/response")
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public MetadataStatus messageType(MessageTypeEnum messageType) {
-        this.messageType = messageType;
-        return this;
-    }
-
-    /**
-     * The logging level for the attached message
-     *
-     * @return messageType
-     **/
-    @Schema(example = "INFO", required = true, description = "The logging level for the attached message")
-    public MessageTypeEnum getMessageType() {
-        return messageType;
-    }
-
-    public void setMessageType(MessageTypeEnum messageType) {
-        this.messageType = messageType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MetadataStatus metadataStatus = (MetadataStatus) o;
-        return Objects.equals(this.message, metadataStatus.message) &&
-                Objects.equals(this.messageType, metadataStatus.messageType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(message, messageType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MetadataStatus {\n");
-
-        sb.append("    message: ").append(toIndentedString(message)).append("\n");
-        sb.append("    messageType: ").append(toIndentedString(messageType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataTokenPagination.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataTokenPagination.java
deleted file mode 100644
index 8258ea04..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataTokenPagination.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An object in the BrAPI standard response model that describes some information about the service call being performed. This includes supplementary data, status log messages, and pagination information.
- */
-@Schema(description = "An object in the BrAPI standard response model that describes some information about the service call being performed. This includes supplementary data, status log messages, and pagination information.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class MetadataTokenPagination {
-    @SerializedName("datafiles")
-    private List<MetadataDatafiles> datafiles = null;
-
-    @SerializedName("pagination")
-    private MetadataTokenPaginationPagination pagination = null;
-
-    @SerializedName("status")
-    private List<MetadataStatus> status = null;
-
-    public MetadataTokenPagination datafiles(List<MetadataDatafiles> datafiles) {
-        this.datafiles = datafiles;
-        return this;
-    }
-
-    public MetadataTokenPagination addDatafilesItem(MetadataDatafiles datafilesItem) {
-        if (this.datafiles == null) {
-            this.datafiles = new ArrayList<MetadataDatafiles>();
-        }
-        this.datafiles.add(datafilesItem);
-        return this;
-    }
-
-    /**
-     * The datafiles contains a list of file URLs and metadata.  These files contain additional information related to the returned object and can be retrieved by a subsequent call.  This could be a supplementary data file, an informational file, the uploaded file where the data originated from, a generated file representing the whole dataset in a particular format, or any other related file.
-     *
-     * @return datafiles
-     **/
-    @Schema(example = "[]", description = "The datafiles contains a list of file URLs and metadata.  These files contain additional information related to the returned object and can be retrieved by a subsequent call.  This could be a supplementary data file, an informational file, the uploaded file where the data originated from, a generated file representing the whole dataset in a particular format, or any other related file. ")
-    public List<MetadataDatafiles> getDatafiles() {
-        return datafiles;
-    }
-
-    public void setDatafiles(List<MetadataDatafiles> datafiles) {
-        this.datafiles = datafiles;
-    }
-
-    public MetadataTokenPagination pagination(MetadataTokenPaginationPagination pagination) {
-        this.pagination = pagination;
-        return this;
-    }
-
-    /**
-     * Get pagination
-     *
-     * @return pagination
-     **/
-    @Schema(description = "")
-    public MetadataTokenPaginationPagination getPagination() {
-        return pagination;
-    }
-
-    public void setPagination(MetadataTokenPaginationPagination pagination) {
-        this.pagination = pagination;
-    }
-
-    public MetadataTokenPagination status(List<MetadataStatus> status) {
-        this.status = status;
-        return this;
-    }
-
-    public MetadataTokenPagination addStatusItem(MetadataStatus statusItem) {
-        if (this.status == null) {
-            this.status = new ArrayList<MetadataStatus>();
-        }
-        this.status.add(statusItem);
-        return this;
-    }
-
-    /**
-     * The status field contains a list of informational status messages from the server.  If no status is reported, an empty list should be returned. See Error Reporting for more information.
-     *
-     * @return status
-     **/
-    @Schema(description = "The status field contains a list of informational status messages from the server.  If no status is reported, an empty list should be returned. See Error Reporting for more information.")
-    public List<MetadataStatus> getStatus() {
-        return status;
-    }
-
-    public void setStatus(List<MetadataStatus> status) {
-        this.status = status;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MetadataTokenPagination metadataTokenPagination = (MetadataTokenPagination) o;
-        return Objects.equals(this.datafiles, metadataTokenPagination.datafiles) &&
-                Objects.equals(this.pagination, metadataTokenPagination.pagination) &&
-                Objects.equals(this.status, metadataTokenPagination.status);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(datafiles, pagination, status);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MetadataTokenPagination {\n");
-
-        sb.append("    datafiles: ").append(toIndentedString(datafiles)).append("\n");
-        sb.append("    pagination: ").append(toIndentedString(pagination)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataTokenPaginationPagination.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataTokenPaginationPagination.java
deleted file mode 100644
index 678c1b8f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/MetadataTokenPaginationPagination.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The pagination object is applicable only when the payload contains a \&quot;data\&quot; key. It describes the pagination of the data contained in the \&quot;data\&quot; array, as a way to identify which subset of data is being returned.  &lt;br&gt;Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken to construct an additional query and move to the next or previous page respectively.
- */
-@Schema(description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The pagination object is applicable only when the payload contains a \"data\" key. It describes the pagination of the data contained in the \"data\" array, as a way to identify which subset of data is being returned.  <br>Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken to construct an additional query and move to the next or previous page respectively.  ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class MetadataTokenPaginationPagination {
-    @SerializedName("currentPage")
-    private Integer currentPage = 0;
-
-    @SerializedName("currentPageToken")
-    private String currentPageToken = null;
-
-    @SerializedName("nextPageToken")
-    private String nextPageToken = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = 1000;
-
-    @SerializedName("prevPageToken")
-    private String prevPageToken = null;
-
-    @SerializedName("totalCount")
-    private Integer totalCount = null;
-
-    @SerializedName("totalPages")
-    private Integer totalPages = null;
-
-    public MetadataTokenPaginationPagination currentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-        return this;
-    }
-
-    /**
-     * The index number for the returned page of data. This should always match the requested page number or the default page (0).
-     *
-     * @return currentPage
-     **/
-    @Schema(example = "0", description = "The index number for the returned page of data. This should always match the requested page number or the default page (0).")
-    public Integer getCurrentPage() {
-        return currentPage;
-    }
-
-    public void setCurrentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-    }
-
-    public MetadataTokenPaginationPagination currentPageToken(String currentPageToken) {
-        this.currentPageToken = currentPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the current page of data.
-     *
-     * @return currentPageToken
-     **/
-    @Schema(example = "48bc6ac1", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the current page of data.")
-    public String getCurrentPageToken() {
-        return currentPageToken;
-    }
-
-    public void setCurrentPageToken(String currentPageToken) {
-        this.currentPageToken = currentPageToken;
-    }
-
-    public MetadataTokenPaginationPagination nextPageToken(String nextPageToken) {
-        this.nextPageToken = nextPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the next page of data.
-     *
-     * @return nextPageToken
-     **/
-    @Schema(example = "cb668f63", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the next page of data.")
-    public String getNextPageToken() {
-        return nextPageToken;
-    }
-
-    public void setNextPageToken(String nextPageToken) {
-        this.nextPageToken = nextPageToken;
-    }
-
-    public MetadataTokenPaginationPagination pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public MetadataTokenPaginationPagination prevPageToken(String prevPageToken) {
-        this.prevPageToken = prevPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the previous page of data.
-     *
-     * @return prevPageToken
-     **/
-    @Schema(example = "9659857e", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the previous page of data.")
-    public String getPrevPageToken() {
-        return prevPageToken;
-    }
-
-    public void setPrevPageToken(String prevPageToken) {
-        this.prevPageToken = prevPageToken;
-    }
-
-    public MetadataTokenPaginationPagination totalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-        return this;
-    }
-
-    /**
-     * The total number of elements that are available on the server and match the requested query parameters.
-     *
-     * @return totalCount
-     **/
-    @Schema(example = "10", description = "The total number of elements that are available on the server and match the requested query parameters.")
-    public Integer getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public MetadataTokenPaginationPagination totalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-        return this;
-    }
-
-    /**
-     * The total number of pages of elements available on the server. This should be calculated with the following formula.  &lt;br&gt; totalPages &#x3D; CEILING( totalCount / requested_page_size)
-     *
-     * @return totalPages
-     **/
-    @Schema(example = "1", description = "The total number of pages of elements available on the server. This should be calculated with the following formula.  <br> totalPages = CEILING( totalCount / requested_page_size)")
-    public Integer getTotalPages() {
-        return totalPages;
-    }
-
-    public void setTotalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MetadataTokenPaginationPagination metadataTokenPaginationPagination = (MetadataTokenPaginationPagination) o;
-        return Objects.equals(this.currentPage, metadataTokenPaginationPagination.currentPage) &&
-                Objects.equals(this.currentPageToken, metadataTokenPaginationPagination.currentPageToken) &&
-                Objects.equals(this.nextPageToken, metadataTokenPaginationPagination.nextPageToken) &&
-                Objects.equals(this.pageSize, metadataTokenPaginationPagination.pageSize) &&
-                Objects.equals(this.prevPageToken, metadataTokenPaginationPagination.prevPageToken) &&
-                Objects.equals(this.totalCount, metadataTokenPaginationPagination.totalCount) &&
-                Objects.equals(this.totalPages, metadataTokenPaginationPagination.totalPages);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(currentPage, currentPageToken, nextPageToken, pageSize, prevPageToken, totalCount, totalPages);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MetadataTokenPaginationPagination {\n");
-
-        sb.append("    currentPage: ").append(toIndentedString(currentPage)).append("\n");
-        sb.append("    currentPageToken: ").append(toIndentedString(currentPageToken)).append("\n");
-        sb.append("    nextPageToken: ").append(toIndentedString(nextPageToken)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    prevPageToken: ").append(toIndentedString(prevPageToken)).append("\n");
-        sb.append("    totalCount: ").append(toIndentedString(totalCount)).append("\n");
-        sb.append("    totalPages: ").append(toIndentedString(totalPages)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/BasePagination.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/BasePagination.java
deleted file mode 100644
index 9b76d10a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/BasePagination.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * The pagination object is applicable only when the payload contains a \&quot;data\&quot; key. It describes the pagination of the data contained in the \&quot;data\&quot; array, as a way to identify which subset of data is being returned.  &lt;br&gt; Pages are zero indexed, so the first page will be page 0 (zero).
- */
-@Schema(description = "The pagination object is applicable only when the payload contains a \"data\" key. It describes the pagination of the data contained in the \"data\" array, as a way to identify which subset of data is being returned.  <br> Pages are zero indexed, so the first page will be page 0 (zero).")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class BasePagination {
-    @SerializedName("currentPage")
-    private Integer currentPage = 0;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = 1000;
-
-    @SerializedName("totalCount")
-    private Integer totalCount = null;
-
-    @SerializedName("totalPages")
-    private Integer totalPages = null;
-
-    public BasePagination currentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-        return this;
-    }
-
-    /**
-     * The index number for the returned page of data. This should always match the requested page number or the default page (0).
-     *
-     * @return currentPage
-     **/
-    @Schema(example = "0", required = true, description = "The index number for the returned page of data. This should always match the requested page number or the default page (0).")
-    public Integer getCurrentPage() {
-        return currentPage;
-    }
-
-    public void setCurrentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-    }
-
-    public BasePagination pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", required = true, description = "The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public BasePagination totalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-        return this;
-    }
-
-    /**
-     * The total number of elements that are available on the server and match the requested query parameters.
-     *
-     * @return totalCount
-     **/
-    @Schema(example = "10", description = "The total number of elements that are available on the server and match the requested query parameters.")
-    public Integer getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public BasePagination totalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-        return this;
-    }
-
-    /**
-     * The total number of pages of elements available on the server. This should be calculated with the following formula.  &lt;br&gt; totalPages &#x3D; CEILING( totalCount / requested_page_size)
-     *
-     * @return totalPages
-     **/
-    @Schema(example = "1", description = "The total number of pages of elements available on the server. This should be calculated with the following formula.  <br> totalPages = CEILING( totalCount / requested_page_size)")
-    public Integer getTotalPages() {
-        return totalPages;
-    }
-
-    public void setTotalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        BasePagination basePagination = (BasePagination) o;
-        return Objects.equals(this.currentPage, basePagination.currentPage) &&
-                Objects.equals(this.pageSize, basePagination.pageSize) &&
-                Objects.equals(this.totalCount, basePagination.totalCount) &&
-                Objects.equals(this.totalPages, basePagination.totalPages);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(currentPage, pageSize, totalCount, totalPages);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class BasePagination {\n");
-
-        sb.append("    currentPage: ").append(toIndentedString(currentPage)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    totalCount: ").append(toIndentedString(totalCount)).append("\n");
-        sb.append("    totalPages: ").append(toIndentedString(totalPages)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/BrAPIEnum.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/BrAPIEnum.java
deleted file mode 100644
index 3771f6db..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/BrAPIEnum.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.brapi.model.v21.core;
-
-public interface BrAPIEnum {
-    String getBrapiValue();
-}
\ No newline at end of file
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/BrAPIListTypes.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/BrAPIListTypes.java
deleted file mode 100644
index 1b25c101..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/BrAPIListTypes.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.brapi.model.v21.core;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Gets or Sets ListTypes
- */
-public enum BrAPIListTypes implements BrAPIEnum {
-    GERMPLASM("germplasm"),
-    MARKERS("markers"),
-    PROGRAMS("programs"),
-    TRIALS("trials"),
-    STUDIES("studies"),
-    OBSERVATIONUNITS("observationUnits"),
-    OBSERVATIONS("observations"),
-    OBSERVATIONVARIABLES("observationVariables"),
-    SAMPLES("samples");
-
-    private final String value;
-
-    BrAPIListTypes(String value) {
-        this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static BrAPIListTypes fromValue(String text) {
-        for (BrAPIListTypes b : BrAPIListTypes.values()) {
-            if (String.valueOf(b.value).equals(text)) {
-                return b;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public String getBrapiValue() {
-        return value;
-    }
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/CommonCropNamesResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/CommonCropNamesResponse.java
deleted file mode 100644
index 95761f52..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/CommonCropNamesResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * CommonCropNamesResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class CommonCropNamesResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private CommonCropNamesResponseResult result = null;
-
-    public CommonCropNamesResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public CommonCropNamesResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public CommonCropNamesResponse result(CommonCropNamesResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public CommonCropNamesResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(CommonCropNamesResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CommonCropNamesResponse commonCropNamesResponse = (CommonCropNamesResponse) o;
-        return Objects.equals(this._atContext, commonCropNamesResponse._atContext) &&
-                Objects.equals(this.metadata, commonCropNamesResponse.metadata) &&
-                Objects.equals(this.result, commonCropNamesResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CommonCropNamesResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/CommonCropNamesResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/CommonCropNamesResponseResult.java
deleted file mode 100644
index fa59b12a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/CommonCropNamesResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * CommonCropNamesResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class CommonCropNamesResponseResult {
-    @SerializedName("data")
-    private List<String> data = new ArrayList<String>();
-
-    public CommonCropNamesResponseResult data(List<String> data) {
-        this.data = data;
-        return this;
-    }
-
-    public CommonCropNamesResponseResult addDataItem(String dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The array of crop names available on the server
-     *
-     * @return data
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", required = true, description = "The array of crop names available on the server")
-    public List<String> getData() {
-        return data;
-    }
-
-    public void setData(List<String> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CommonCropNamesResponseResult commonCropNamesResponseResult = (CommonCropNamesResponseResult) o;
-        return Objects.equals(this.data, commonCropNamesResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CommonCropNamesResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Contact.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Contact.java
deleted file mode 100644
index 0a1da6b0..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Contact.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Contact
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class Contact {
-    @SerializedName("contactDbId")
-    private String contactDbId = null;
-
-    @SerializedName("email")
-    private String email = null;
-
-    @SerializedName("instituteName")
-    private String instituteName = null;
-
-    @SerializedName("name")
-    private String name = null;
-
-    @SerializedName("orcid")
-    private String orcid = null;
-
-    @SerializedName("type")
-    private String type = null;
-
-    public Contact contactDbId(String contactDbId) {
-        this.contactDbId = contactDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies this contact  MIAPPE V1.1 (DM-33) Person ID - An identifier for the data submitter. If that submitter is an individual, ORCID identifiers are recommended.
-     *
-     * @return contactDbId
-     **/
-    @Schema(example = "5f4e5509", required = true, description = "The ID which uniquely identifies this contact  MIAPPE V1.1 (DM-33) Person ID - An identifier for the data submitter. If that submitter is an individual, ORCID identifiers are recommended.")
-    public String getContactDbId() {
-        return contactDbId;
-    }
-
-    public void setContactDbId(String contactDbId) {
-        this.contactDbId = contactDbId;
-    }
-
-    public Contact email(String email) {
-        this.email = email;
-        return this;
-    }
-
-    /**
-     * The contacts email address  MIAPPE V1.1 (DM-32) Person email - The electronic mail address of the person.
-     *
-     * @return email
-     **/
-    @Schema(example = "bob@bob.com", description = "The contacts email address  MIAPPE V1.1 (DM-32) Person email - The electronic mail address of the person.")
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public Contact instituteName(String instituteName) {
-        this.instituteName = instituteName;
-        return this;
-    }
-
-    /**
-     * The name of the institution which this contact is part of  MIAPPE V1.1 (DM-35) Person affiliation - The institution the person belongs to
-     *
-     * @return instituteName
-     **/
-    @Schema(example = "The BrAPI Institute", description = "The name of the institution which this contact is part of  MIAPPE V1.1 (DM-35) Person affiliation - The institution the person belongs to")
-    public String getInstituteName() {
-        return instituteName;
-    }
-
-    public void setInstituteName(String instituteName) {
-        this.instituteName = instituteName;
-    }
-
-    public Contact name(String name) {
-        this.name = name;
-        return this;
-    }
-
-    /**
-     * The full name of this contact person  MIAPPE V1.1 (DM-31) Person name - The name of the person (either full name or as used in scientific publications)
-     *
-     * @return name
-     **/
-    @Schema(example = "Bob Robertson", description = "The full name of this contact person  MIAPPE V1.1 (DM-31) Person name - The name of the person (either full name or as used in scientific publications)")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Contact orcid(String orcid) {
-        this.orcid = orcid;
-        return this;
-    }
-
-    /**
-     * The Open Researcher and Contributor ID for this contact person (orcid.org)  MIAPPE V1.1 (DM-33) Person ID - An identifier for the data submitter. If that submitter is an individual, ORCID identifiers are recommended.
-     *
-     * @return orcid
-     **/
-    @Schema(example = "http://orcid.org/0000-0001-8640-1750", description = "The Open Researcher and Contributor ID for this contact person (orcid.org)  MIAPPE V1.1 (DM-33) Person ID - An identifier for the data submitter. If that submitter is an individual, ORCID identifiers are recommended.")
-    public String getOrcid() {
-        return orcid;
-    }
-
-    public void setOrcid(String orcid) {
-        this.orcid = orcid;
-    }
-
-    public Contact type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The type of person this contact represents (ex: Coordinator, Scientist, PI, etc.)  MIAPPE V1.1 (DM-34) Person role - Type of contribution of the person to the investigation
-     *
-     * @return type
-     **/
-    @Schema(example = "PI", description = "The type of person this contact represents (ex: Coordinator, Scientist, PI, etc.)  MIAPPE V1.1 (DM-34) Person role - Type of contribution of the person to the investigation")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Contact contact = (Contact) o;
-        return Objects.equals(this.contactDbId, contact.contactDbId) &&
-                Objects.equals(this.email, contact.email) &&
-                Objects.equals(this.instituteName, contact.instituteName) &&
-                Objects.equals(this.name, contact.name) &&
-                Objects.equals(this.orcid, contact.orcid) &&
-                Objects.equals(this.type, contact.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(contactDbId, email, instituteName, name, orcid, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Contact {\n");
-
-        sb.append("    contactDbId: ").append(toIndentedString(contactDbId)).append("\n");
-        sb.append("    email: ").append(toIndentedString(email)).append("\n");
-        sb.append("    instituteName: ").append(toIndentedString(instituteName)).append("\n");
-        sb.append("    name: ").append(toIndentedString(name)).append("\n");
-        sb.append("    orcid: ").append(toIndentedString(orcid)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ContentTypes.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ContentTypes.java
deleted file mode 100644
index 6f6ef61a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ContentTypes.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-/**
- * Gets or Sets ContentTypes
- */
-@JsonAdapter(ContentTypes.Adapter.class)
-public enum ContentTypes {
-    APPLICATION_JSON("application/json"),
-    TEXT_CSV("text/csv"),
-    TEXT_TSV("text/tsv"),
-    APPLICATION_FLAPJACK("application/flapjack");
-
-    private final String value;
-
-    ContentTypes(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    public static ContentTypes fromValue(String input) {
-        for (ContentTypes b : ContentTypes.values()) {
-            if (b.value.equals(input)) {
-                return b;
-            }
-        }
-        return null;
-    }
-
-    public static class Adapter extends TypeAdapter<ContentTypes> {
-        @Override
-        public void write(final JsonWriter jsonWriter, final ContentTypes enumeration) throws IOException {
-            jsonWriter.value(String.valueOf(enumeration.getValue()));
-        }
-
-        @Override
-        public ContentTypes read(final JsonReader jsonReader) throws IOException {
-            Object value = jsonReader.nextString();
-            return ContentTypes.fromValue((String) (value));
-        }
-    }
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Context.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Context.java
deleted file mode 100644
index 3f015f71..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Context.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.Objects;
-
-/**
- * The JSON-LD Context is used to provide JSON-LD definitions to each field in a JSON object. By providing an array of context file urls, a BrAPI response object becomes JSON-LD compatible.    For more information, see https://w3c.github.io/json-ld-syntax/#the-context
- */
-@Schema(description = "The JSON-LD Context is used to provide JSON-LD definitions to each field in a JSON object. By providing an array of context file urls, a BrAPI response object becomes JSON-LD compatible.    For more information, see https://w3c.github.io/json-ld-syntax/#the-context")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class Context extends ArrayList<String> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Context {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/DataFile.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/DataFile.java
deleted file mode 100644
index cde53a8f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/DataFile.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * A dataFile contains a URL and the relevant file metadata to represent a file
- */
-@Schema(description = "A dataFile contains a URL and the relevant file metadata to represent a file")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class DataFile {
-    @SerializedName("fileDescription")
-    private String fileDescription = null;
-
-    @SerializedName("fileMD5Hash")
-    private String fileMD5Hash = null;
-
-    @SerializedName("fileName")
-    private String fileName = null;
-
-    @SerializedName("fileSize")
-    private Integer fileSize = null;
-
-    @SerializedName("fileType")
-    private String fileType = null;
-
-    @SerializedName("fileURL")
-    private String fileURL = null;
-
-    public DataFile fileDescription(String fileDescription) {
-        this.fileDescription = fileDescription;
-        return this;
-    }
-
-    /**
-     * A human readable description of the file contents
-     *
-     * @return fileDescription
-     **/
-    @Schema(example = "This is an Excel data file", description = "A human readable description of the file contents")
-    public String getFileDescription() {
-        return fileDescription;
-    }
-
-    public void setFileDescription(String fileDescription) {
-        this.fileDescription = fileDescription;
-    }
-
-    public DataFile fileMD5Hash(String fileMD5Hash) {
-        this.fileMD5Hash = fileMD5Hash;
-        return this;
-    }
-
-    /**
-     * The MD5 Hash of the file contents to be used as a check sum
-     *
-     * @return fileMD5Hash
-     **/
-    @Schema(example = "c2365e900c81a89cf74d83dab60df146", description = "The MD5 Hash of the file contents to be used as a check sum")
-    public String getFileMD5Hash() {
-        return fileMD5Hash;
-    }
-
-    public void setFileMD5Hash(String fileMD5Hash) {
-        this.fileMD5Hash = fileMD5Hash;
-    }
-
-    public DataFile fileName(String fileName) {
-        this.fileName = fileName;
-        return this;
-    }
-
-    /**
-     * The name of the file
-     *
-     * @return fileName
-     **/
-    @Schema(example = "datafile.xlsx", description = "The name of the file")
-    public String getFileName() {
-        return fileName;
-    }
-
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
-    public DataFile fileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-        return this;
-    }
-
-    /**
-     * The size of the file in bytes
-     *
-     * @return fileSize
-     **/
-    @Schema(example = "4398", description = "The size of the file in bytes")
-    public Integer getFileSize() {
-        return fileSize;
-    }
-
-    public void setFileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-    }
-
-    public DataFile fileType(String fileType) {
-        this.fileType = fileType;
-        return this;
-    }
-
-    /**
-     * The type or format of the file. Preferably MIME Type.
-     *
-     * @return fileType
-     **/
-    @Schema(example = "application/vnd.ms-excel", description = "The type or format of the file. Preferably MIME Type.")
-    public String getFileType() {
-        return fileType;
-    }
-
-    public void setFileType(String fileType) {
-        this.fileType = fileType;
-    }
-
-    public DataFile fileURL(String fileURL) {
-        this.fileURL = fileURL;
-        return this;
-    }
-
-    /**
-     * The absolute URL where the file is located
-     *
-     * @return fileURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/examples/datafile.xlsx", required = true, description = "The absolute URL where the file is located")
-    public String getFileURL() {
-        return fileURL;
-    }
-
-    public void setFileURL(String fileURL) {
-        this.fileURL = fileURL;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        DataFile dataFile = (DataFile) o;
-        return Objects.equals(this.fileDescription, dataFile.fileDescription) &&
-                Objects.equals(this.fileMD5Hash, dataFile.fileMD5Hash) &&
-                Objects.equals(this.fileName, dataFile.fileName) &&
-                Objects.equals(this.fileSize, dataFile.fileSize) &&
-                Objects.equals(this.fileType, dataFile.fileType) &&
-                Objects.equals(this.fileURL, dataFile.fileURL);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(fileDescription, fileMD5Hash, fileName, fileSize, fileType, fileURL);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class DataFile {\n");
-
-        sb.append("    fileDescription: ").append(toIndentedString(fileDescription)).append("\n");
-        sb.append("    fileMD5Hash: ").append(toIndentedString(fileMD5Hash)).append("\n");
-        sb.append("    fileName: ").append(toIndentedString(fileName)).append("\n");
-        sb.append("    fileSize: ").append(toIndentedString(fileSize)).append("\n");
-        sb.append("    fileType: ").append(toIndentedString(fileType)).append("\n");
-        sb.append("    fileURL: ").append(toIndentedString(fileURL)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/DataLink.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/DataLink.java
deleted file mode 100644
index 29b4cc86..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/DataLink.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * DataLink
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class DataLink {
-    @SerializedName("dataFormat")
-    private String dataFormat = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("fileFormat")
-    private String fileFormat = null;
-
-    @SerializedName("name")
-    private String name = null;
-
-    @SerializedName("provenance")
-    private String provenance = null;
-
-    @SerializedName("scientificType")
-    private String scientificType = null;
-
-    @SerializedName("url")
-    private String url = null;
-
-    @SerializedName("version")
-    private String version = null;
-
-    public DataLink dataFormat(String dataFormat) {
-        this.dataFormat = dataFormat;
-        return this;
-    }
-
-    /**
-     * The structure of the data within a file. For example - VCF, table, image archive, multispectral image archives in EDAM ontology (used in Galaxy)  MIAPPE V1.1 (DM-38) Data file description - Description of the format of the data file. May be a standard file format name, or a description of organization of the data in a tabular file.
-     *
-     * @return dataFormat
-     **/
-    @Schema(example = "Image Archive", description = "The structure of the data within a file. For example - VCF, table, image archive, multispectral image archives in EDAM ontology (used in Galaxy)  MIAPPE V1.1 (DM-38) Data file description - Description of the format of the data file. May be a standard file format name, or a description of organization of the data in a tabular file.")
-    public String getDataFormat() {
-        return dataFormat;
-    }
-
-    public void setDataFormat(String dataFormat) {
-        this.dataFormat = dataFormat;
-    }
-
-    public DataLink description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * The general description of this data link  MIAPPE V1.1 (DM-38) Data file description - Description of the format of the data file. May be a standard file format name, or a description of organization of the data in a tabular file.
-     *
-     * @return description
-     **/
-    @Schema(example = "Raw drone images collected for this study", description = "The general description of this data link  MIAPPE V1.1 (DM-38) Data file description - Description of the format of the data file. May be a standard file format name, or a description of organization of the data in a tabular file.")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public DataLink fileFormat(String fileFormat) {
-        this.fileFormat = fileFormat;
-        return this;
-    }
-
-    /**
-     * The MIME type of the file (ie text/csv, application/excel, application/zip).  MIAPPE V1.1 (DM-38) Data file description - Description of the format of the data file. May be a standard file format name, or a description of organization of the data in a tabular file.
-     *
-     * @return fileFormat
-     **/
-    @Schema(example = "application/zip", description = "The MIME type of the file (ie text/csv, application/excel, application/zip).  MIAPPE V1.1 (DM-38) Data file description - Description of the format of the data file. May be a standard file format name, or a description of organization of the data in a tabular file.")
-    public String getFileFormat() {
-        return fileFormat;
-    }
-
-    public void setFileFormat(String fileFormat) {
-        this.fileFormat = fileFormat;
-    }
-
-    public DataLink name(String name) {
-        this.name = name;
-        return this;
-    }
-
-    /**
-     * The name of the external data link  MIAPPE V1.1 (DM-38) Data file description - Description of the format of the data file. May be a standard file format name, or a description of organization of the data in a tabular file.
-     *
-     * @return name
-     **/
-    @Schema(example = "image-archive.zip", description = "The name of the external data link  MIAPPE V1.1 (DM-38) Data file description - Description of the format of the data file. May be a standard file format name, or a description of organization of the data in a tabular file.")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public DataLink provenance(String provenance) {
-        this.provenance = provenance;
-        return this;
-    }
-
-    /**
-     * The description of the origin or ownership of this linked data. Could be a formal reference to software, method, or workflow.
-     *
-     * @return provenance
-     **/
-    @Schema(example = "Image Processing Pipeline, built at the University of Antarctica: https://github.com/antarctica/pipeline", description = "The description of the origin or ownership of this linked data. Could be a formal reference to software, method, or workflow.")
-    public String getProvenance() {
-        return provenance;
-    }
-
-    public void setProvenance(String provenance) {
-        this.provenance = provenance;
-    }
-
-    public DataLink scientificType(String scientificType) {
-        this.scientificType = scientificType;
-        return this;
-    }
-
-    /**
-     * The general type of data. For example- Genotyping, Phenotyping raw data, Phenotyping reduced data, Environmental, etc
-     *
-     * @return scientificType
-     **/
-    @Schema(example = "Environmental", description = "The general type of data. For example- Genotyping, Phenotyping raw data, Phenotyping reduced data, Environmental, etc")
-    public String getScientificType() {
-        return scientificType;
-    }
-
-    public void setScientificType(String scientificType) {
-        this.scientificType = scientificType;
-    }
-
-    public DataLink url(String url) {
-        this.url = url;
-        return this;
-    }
-
-    /**
-     * URL describing the location of this data file to view or download  MIAPPE V1.1 (DM-37) Data file link - Link to the data file (or digital object) in a public database or in a persistent institutional repository; or identifier of the data file when submitted together with the MIAPPE submission.
-     *
-     * @return url
-     **/
-    @Schema(example = "https://brapi.org/image-archive.zip", description = "URL describing the location of this data file to view or download  MIAPPE V1.1 (DM-37) Data file link - Link to the data file (or digital object) in a public database or in a persistent institutional repository; or identifier of the data file when submitted together with the MIAPPE submission.")
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public DataLink version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    /**
-     * The version number for this data   MIAPPE V1.1 (DM-39) Data file version - The version of the dataset (the actual data).
-     *
-     * @return version
-     **/
-    @Schema(example = "1.0.3", description = "The version number for this data   MIAPPE V1.1 (DM-39) Data file version - The version of the dataset (the actual data).")
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        DataLink dataLink = (DataLink) o;
-        return Objects.equals(this.dataFormat, dataLink.dataFormat) &&
-                Objects.equals(this.description, dataLink.description) &&
-                Objects.equals(this.fileFormat, dataLink.fileFormat) &&
-                Objects.equals(this.name, dataLink.name) &&
-                Objects.equals(this.provenance, dataLink.provenance) &&
-                Objects.equals(this.scientificType, dataLink.scientificType) &&
-                Objects.equals(this.url, dataLink.url) &&
-                Objects.equals(this.version, dataLink.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(dataFormat, description, fileFormat, name, provenance, scientificType, url, version);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class DataLink {\n");
-
-        sb.append("    dataFormat: ").append(toIndentedString(dataFormat)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    fileFormat: ").append(toIndentedString(fileFormat)).append("\n");
-        sb.append("    name: ").append(toIndentedString(name)).append("\n");
-        sb.append("    provenance: ").append(toIndentedString(provenance)).append("\n");
-        sb.append("    scientificType: ").append(toIndentedString(scientificType)).append("\n");
-        sb.append("    url: ").append(toIndentedString(url)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EnvironmentParameter.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EnvironmentParameter.java
deleted file mode 100644
index 9884a3d6..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EnvironmentParameter.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * EnvironmentParameter
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class EnvironmentParameter {
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("parameterName")
-    private String parameterName = null;
-
-    @SerializedName("parameterPUI")
-    private String parameterPUI = null;
-
-    @SerializedName("unit")
-    private String unit = null;
-
-    @SerializedName("unitPUI")
-    private String unitPUI = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    @SerializedName("valuePUI")
-    private String valuePUI = null;
-
-    public EnvironmentParameter description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Human-readable value of the environment parameter (defined above) constant within the experiment
-     *
-     * @return description
-     **/
-    @Schema(example = "the soil type was clay", required = true, description = "Human-readable value of the environment parameter (defined above) constant within the experiment")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public EnvironmentParameter parameterName(String parameterName) {
-        this.parameterName = parameterName;
-        return this;
-    }
-
-    /**
-     * Name of the environment parameter constant within the experiment  MIAPPE V1.1 (DM-58) Environment parameter - Name of the environment parameter constant within the experiment.
-     *
-     * @return parameterName
-     **/
-    @Schema(example = "soil type", required = true, description = "Name of the environment parameter constant within the experiment  MIAPPE V1.1 (DM-58) Environment parameter - Name of the environment parameter constant within the experiment. ")
-    public String getParameterName() {
-        return parameterName;
-    }
-
-    public void setParameterName(String parameterName) {
-        this.parameterName = parameterName;
-    }
-
-    public EnvironmentParameter parameterPUI(String parameterPUI) {
-        this.parameterPUI = parameterPUI;
-        return this;
-    }
-
-    /**
-     * URI pointing to an ontology class for the parameter
-     *
-     * @return parameterPUI
-     **/
-    @Schema(example = "PECO:0007155", description = "URI pointing to an ontology class for the parameter")
-    public String getParameterPUI() {
-        return parameterPUI;
-    }
-
-    public void setParameterPUI(String parameterPUI) {
-        this.parameterPUI = parameterPUI;
-    }
-
-    public EnvironmentParameter unit(String unit) {
-        this.unit = unit;
-        return this;
-    }
-
-    /**
-     * Unit of the value for this parameter
-     *
-     * @return unit
-     **/
-    @Schema(example = "pH", description = "Unit of the value for this parameter")
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public EnvironmentParameter unitPUI(String unitPUI) {
-        this.unitPUI = unitPUI;
-        return this;
-    }
-
-    /**
-     * URI pointing to an ontology class for the unit
-     *
-     * @return unitPUI
-     **/
-    @Schema(example = "PECO:0007059", description = "URI pointing to an ontology class for the unit")
-    public String getUnitPUI() {
-        return unitPUI;
-    }
-
-    public void setUnitPUI(String unitPUI) {
-        this.unitPUI = unitPUI;
-    }
-
-    public EnvironmentParameter value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * Numerical or categorical value  MIAPPE V1.1 (DM-59) Environment parameter value - Value of the environment parameter (defined above) constant within the experiment.
-     *
-     * @return value
-     **/
-    @Schema(example = "clay soil", description = "Numerical or categorical value  MIAPPE V1.1 (DM-59) Environment parameter value - Value of the environment parameter (defined above) constant within the experiment.")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public EnvironmentParameter valuePUI(String valuePUI) {
-        this.valuePUI = valuePUI;
-        return this;
-    }
-
-    /**
-     * URI pointing to an ontology class for the parameter value
-     *
-     * @return valuePUI
-     **/
-    @Schema(example = "ENVO:00002262", description = "URI pointing to an ontology class for the parameter value")
-    public String getValuePUI() {
-        return valuePUI;
-    }
-
-    public void setValuePUI(String valuePUI) {
-        this.valuePUI = valuePUI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        EnvironmentParameter environmentParameter = (EnvironmentParameter) o;
-        return Objects.equals(this.description, environmentParameter.description) &&
-                Objects.equals(this.parameterName, environmentParameter.parameterName) &&
-                Objects.equals(this.parameterPUI, environmentParameter.parameterPUI) &&
-                Objects.equals(this.unit, environmentParameter.unit) &&
-                Objects.equals(this.unitPUI, environmentParameter.unitPUI) &&
-                Objects.equals(this.value, environmentParameter.value) &&
-                Objects.equals(this.valuePUI, environmentParameter.valuePUI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(description, parameterName, parameterPUI, unit, unitPUI, value, valuePUI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class EnvironmentParameter {\n");
-
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    parameterName: ").append(toIndentedString(parameterName)).append("\n");
-        sb.append("    parameterPUI: ").append(toIndentedString(parameterPUI)).append("\n");
-        sb.append("    unit: ").append(toIndentedString(unit)).append("\n");
-        sb.append("    unitPUI: ").append(toIndentedString(unitPUI)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("    valuePUI: ").append(toIndentedString(valuePUI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Event.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Event.java
deleted file mode 100644
index a39ead83..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Event.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * Event
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Event {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("date")
-    private List<OffsetDateTime> date = null;
-
-    @SerializedName("eventDateRange")
-    private EventEventDateRange eventDateRange = null;
-
-    @SerializedName("eventDbId")
-    private String eventDbId = null;
-
-    @SerializedName("eventDescription")
-    private String eventDescription = null;
-
-    @SerializedName("eventParameters")
-    private List<EventEventParameters> eventParameters = null;
-
-    @SerializedName("eventType")
-    private String eventType = null;
-
-    @SerializedName("eventTypeDbId")
-    private String eventTypeDbId = null;
-
-    @SerializedName("observationUnitDbIds")
-    private List<String> observationUnitDbIds = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("studyName")
-    private String studyName = null;
-
-    public Event additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Event putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Event date(List<OffsetDateTime> date) {
-        this.date = date;
-        return this;
-    }
-
-    public Event addDateItem(OffsetDateTime dateItem) {
-        if (this.date == null) {
-            this.date = new ArrayList<OffsetDateTime>();
-        }
-        this.date.add(dateItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;eventDateRange.discreteDates&#x60;. Github issue number #440              &lt;br&gt;A list of dates when the event occurred &lt;br&gt;MIAPPE V1.1 (DM-68) Event date - Date and time of the event.
-     *
-     * @return date
-     **/
-    @Schema(example = "[\"2018-10-08T18:15:11Z\",\"2018-11-09T18:16:12Z\"]", description = "**Deprecated in v2.1** Please use `eventDateRange.discreteDates`. Github issue number #440              <br>A list of dates when the event occurred <br>MIAPPE V1.1 (DM-68) Event date - Date and time of the event.")
-    public List<OffsetDateTime> getDate() {
-        return date;
-    }
-
-    public void setDate(List<OffsetDateTime> date) {
-        this.date = date;
-    }
-
-    public Event eventDateRange(EventEventDateRange eventDateRange) {
-        this.eventDateRange = eventDateRange;
-        return this;
-    }
-
-    /**
-     * Get eventDateRange
-     *
-     * @return eventDateRange
-     **/
-    @Schema(description = "")
-    public EventEventDateRange getEventDateRange() {
-        return eventDateRange;
-    }
-
-    public void setEventDateRange(EventEventDateRange eventDateRange) {
-        this.eventDateRange = eventDateRange;
-    }
-
-    public Event eventDbId(String eventDbId) {
-        this.eventDbId = eventDbId;
-        return this;
-    }
-
-    /**
-     * Internal database identifier
-     *
-     * @return eventDbId
-     **/
-    @Schema(example = "8566d4cb", required = true, description = "Internal database identifier")
-    public String getEventDbId() {
-        return eventDbId;
-    }
-
-    public void setEventDbId(String eventDbId) {
-        this.eventDbId = eventDbId;
-    }
-
-    public Event eventDescription(String eventDescription) {
-        this.eventDescription = eventDescription;
-        return this;
-    }
-
-    /**
-     * A detailed, human-readable description of this event &lt;br/&gt;MIAPPE V1.1 (DM-67) Event description - Description of the event, including details such as amount applied and possibly duration of the event.
-     *
-     * @return eventDescription
-     **/
-    @Schema(example = "A set of plots was watered", description = "A detailed, human-readable description of this event <br/>MIAPPE V1.1 (DM-67) Event description - Description of the event, including details such as amount applied and possibly duration of the event. ")
-    public String getEventDescription() {
-        return eventDescription;
-    }
-
-    public void setEventDescription(String eventDescription) {
-        this.eventDescription = eventDescription;
-    }
-
-    public Event eventParameters(List<EventEventParameters> eventParameters) {
-        this.eventParameters = eventParameters;
-        return this;
-    }
-
-    public Event addEventParametersItem(EventEventParameters eventParametersItem) {
-        if (this.eventParameters == null) {
-            this.eventParameters = new ArrayList<EventEventParameters>();
-        }
-        this.eventParameters.add(eventParametersItem);
-        return this;
-    }
-
-    /**
-     * A list of objects describing additional event parameters. Each of the following accepts a human-readable value or URI
-     *
-     * @return eventParameters
-     **/
-    @Schema(example = "[{\"code\":\"tiimp\",\"description\":\"Implement or tool used for tillage\",\"name\":\"tillage_implement\",\"unit\":\"code\",\"value\":\"TI001\",\"valueDescription\":\"Standard V-Ripper (TI001)\"},{\"code\":\"tidep\",\"description\":\"Tillage operations depth in centimeters\",\"name\":\"tillage_operations_depth\",\"unit\":\"cm\",\"valuesByDate\":[\"20\",\"50\",\"40\"]},{\"code\":\"timix\",\"description\":\"Tillage operations mixing effectiveness\",\"name\":\"till_mix_effectiveness\",\"unit\":\"percent\",\"value\":\"50\"}]", description = "A list of objects describing additional event parameters. Each of the following accepts a human-readable value or URI")
-    public List<EventEventParameters> getEventParameters() {
-        return eventParameters;
-    }
-
-    public void setEventParameters(List<EventEventParameters> eventParameters) {
-        this.eventParameters = eventParameters;
-    }
-
-    public Event eventType(String eventType) {
-        this.eventType = eventType;
-        return this;
-    }
-
-    /**
-     * General category for this event (e.g. fertilizer, irrigation, tillage). Each eventType should correspond to exactly one eventTypeDbId, if provided. &lt;br/&gt;ICASA Management events allow for the following types: planting, fertilizer, irrigation, tillage, organic_material, harvest, bed_prep, inorg_mulch, inorg_mul_rem, chemicals, mowing, observation, weeding, puddling, flood_level, other &lt;br/&gt;MIAPPE V1.1 (DM-65) Event type - Short name of the event.
-     *
-     * @return eventType
-     **/
-    @Schema(example = "tillage", required = true, description = "General category for this event (e.g. fertilizer, irrigation, tillage). Each eventType should correspond to exactly one eventTypeDbId, if provided. <br/>ICASA Management events allow for the following types: planting, fertilizer, irrigation, tillage, organic_material, harvest, bed_prep, inorg_mulch, inorg_mul_rem, chemicals, mowing, observation, weeding, puddling, flood_level, other <br/>MIAPPE V1.1 (DM-65) Event type - Short name of the event.")
-    public String getEventType() {
-        return eventType;
-    }
-
-    public void setEventType(String eventType) {
-        this.eventType = eventType;
-    }
-
-    public Event eventTypeDbId(String eventTypeDbId) {
-        this.eventTypeDbId = eventTypeDbId;
-        return this;
-    }
-
-    /**
-     * An identifier for this event type, in the form of an ontology class reference &lt;br/&gt;ICASA Management events allow for the following types: planting, fertilizer, irrigation, tillage, organic_material, harvest, bed_prep, inorg_mulch, inorg_mul_rem, chemicals, mowing, observation, weeding, puddling, flood_level, other &lt;br/&gt;MIAPPE V1.1 (DM-66) Event accession number - Accession number of the event type in a suitable controlled vocabulary (Crop Ontology).
-     *
-     * @return eventTypeDbId
-     **/
-    @Schema(example = "4e7d691e", description = "An identifier for this event type, in the form of an ontology class reference <br/>ICASA Management events allow for the following types: planting, fertilizer, irrigation, tillage, organic_material, harvest, bed_prep, inorg_mulch, inorg_mul_rem, chemicals, mowing, observation, weeding, puddling, flood_level, other <br/>MIAPPE V1.1 (DM-66) Event accession number - Accession number of the event type in a suitable controlled vocabulary (Crop Ontology).")
-    public String getEventTypeDbId() {
-        return eventTypeDbId;
-    }
-
-    public void setEventTypeDbId(String eventTypeDbId) {
-        this.eventTypeDbId = eventTypeDbId;
-    }
-
-    public Event observationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-        return this;
-    }
-
-    public Event addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-        if (this.observationUnitDbIds == null) {
-            this.observationUnitDbIds = new ArrayList<String>();
-        }
-        this.observationUnitDbIds.add(observationUnitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of the affected observation units. If this parameter is not given, it is understood that the event affected all units in the study
-     *
-     * @return observationUnitDbIds
-     **/
-    @Schema(example = "[\"8439eaff\",\"d7682e7a\",\"305ae51c\"]", description = "A list of the affected observation units. If this parameter is not given, it is understood that the event affected all units in the study")
-    public List<String> getObservationUnitDbIds() {
-        return observationUnitDbIds;
-    }
-
-    public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-    }
-
-    public Event studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The study in which the event occurred
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "2cc2001f", description = "The study in which the event occurred")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public Event studyName(String studyName) {
-        this.studyName = studyName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a study
-     *
-     * @return studyName
-     **/
-    @Schema(example = "2cc2001f", description = "The human readable name of a study")
-    public String getStudyName() {
-        return studyName;
-    }
-
-    public void setStudyName(String studyName) {
-        this.studyName = studyName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Event event = (Event) o;
-        return Objects.equals(this.additionalInfo, event.additionalInfo) &&
-                Objects.equals(this.date, event.date) &&
-                Objects.equals(this.eventDateRange, event.eventDateRange) &&
-                Objects.equals(this.eventDbId, event.eventDbId) &&
-                Objects.equals(this.eventDescription, event.eventDescription) &&
-                Objects.equals(this.eventParameters, event.eventParameters) &&
-                Objects.equals(this.eventType, event.eventType) &&
-                Objects.equals(this.eventTypeDbId, event.eventTypeDbId) &&
-                Objects.equals(this.observationUnitDbIds, event.observationUnitDbIds) &&
-                Objects.equals(this.studyDbId, event.studyDbId) &&
-                Objects.equals(this.studyName, event.studyName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, date, eventDateRange, eventDbId, eventDescription, eventParameters, eventType, eventTypeDbId, observationUnitDbIds, studyDbId, studyName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Event {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    date: ").append(toIndentedString(date)).append("\n");
-        sb.append("    eventDateRange: ").append(toIndentedString(eventDateRange)).append("\n");
-        sb.append("    eventDbId: ").append(toIndentedString(eventDbId)).append("\n");
-        sb.append("    eventDescription: ").append(toIndentedString(eventDescription)).append("\n");
-        sb.append("    eventParameters: ").append(toIndentedString(eventParameters)).append("\n");
-        sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-        sb.append("    eventTypeDbId: ").append(toIndentedString(eventTypeDbId)).append("\n");
-        sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    studyName: ").append(toIndentedString(studyName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EventEventDateRange.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EventEventDateRange.java
deleted file mode 100644
index d8758ea0..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EventEventDateRange.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An object describing when a particular Event has taken place. An Event can occur at one or more discrete time points (&#x60;discreteDates&#x60;) or an event can happen continuosly over a longer peroid of time (&#x60;startDate&#x60;, &#x60;endDate&#x60;)
- */
-@Schema(description = "An object describing when a particular Event has taken place. An Event can occur at one or more discrete time points (`discreteDates`) or an event can happen continuosly over a longer peroid of time (`startDate`, `endDate`)")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class EventEventDateRange {
-    @SerializedName("discreteDates")
-    private List<OffsetDateTime> discreteDates = null;
-
-    @SerializedName("endDate")
-    private OffsetDateTime endDate = null;
-
-    @SerializedName("startDate")
-    private OffsetDateTime startDate = null;
-
-    public EventEventDateRange discreteDates(List<OffsetDateTime> discreteDates) {
-        this.discreteDates = discreteDates;
-        return this;
-    }
-
-    public EventEventDateRange addDiscreteDatesItem(OffsetDateTime discreteDatesItem) {
-        if (this.discreteDates == null) {
-            this.discreteDates = new ArrayList<OffsetDateTime>();
-        }
-        this.discreteDates.add(discreteDatesItem);
-        return this;
-    }
-
-    /**
-     * A list of dates when the event occurred &lt;br/&gt;MIAPPE V1.1 (DM-68) Event date - Date and time of the event.
-     *
-     * @return discreteDates
-     **/
-    @Schema(example = "[\"2018-10-08T18:15:11Z\",\"2018-11-09T18:16:12Z\",\"2018-11-19T18:16:12Z\"]", description = "A list of dates when the event occurred <br/>MIAPPE V1.1 (DM-68) Event date - Date and time of the event.")
-    public List<OffsetDateTime> getDiscreteDates() {
-        return discreteDates;
-    }
-
-    public void setDiscreteDates(List<OffsetDateTime> discreteDates) {
-        this.discreteDates = discreteDates;
-    }
-
-    public EventEventDateRange endDate(OffsetDateTime endDate) {
-        this.endDate = endDate;
-        return this;
-    }
-
-    /**
-     * The end of a continous or regularly repetitive event &lt;br/&gt;MIAPPE V1.1 (DM-68) Event date - Date and time of the event.
-     *
-     * @return endDate
-     **/
-    @Schema(example = "2018-10-08T18:15:11Z", description = "The end of a continous or regularly repetitive event <br/>MIAPPE V1.1 (DM-68) Event date - Date and time of the event.")
-    public OffsetDateTime getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(OffsetDateTime endDate) {
-        this.endDate = endDate;
-    }
-
-    public EventEventDateRange startDate(OffsetDateTime startDate) {
-        this.startDate = startDate;
-        return this;
-    }
-
-    /**
-     * The begining of a continous or regularly repetitive event &lt;br/&gt;MIAPPE V1.1 (DM-68) Event date - Date and time of the event.
-     *
-     * @return startDate
-     **/
-    @Schema(example = "2018-10-08T18:15:11Z", description = "The begining of a continous or regularly repetitive event <br/>MIAPPE V1.1 (DM-68) Event date - Date and time of the event.")
-    public OffsetDateTime getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(OffsetDateTime startDate) {
-        this.startDate = startDate;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        EventEventDateRange eventEventDateRange = (EventEventDateRange) o;
-        return Objects.equals(this.discreteDates, eventEventDateRange.discreteDates) &&
-                Objects.equals(this.endDate, eventEventDateRange.endDate) &&
-                Objects.equals(this.startDate, eventEventDateRange.startDate);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(discreteDates, endDate, startDate);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class EventEventDateRange {\n");
-
-        sb.append("    discreteDates: ").append(toIndentedString(discreteDates)).append("\n");
-        sb.append("    endDate: ").append(toIndentedString(endDate)).append("\n");
-        sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EventEventParameters.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EventEventParameters.java
deleted file mode 100644
index f8383117..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EventEventParameters.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * EventEventParameters
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class EventEventParameters {
-    @SerializedName("code")
-    private String code = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("key")
-    private String key = null;
-
-    @SerializedName("name")
-    private String name = null;
-
-    @SerializedName("rdfValue")
-    private String rdfValue = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    @SerializedName("valueDescription")
-    private String valueDescription = null;
-
-    @SerializedName("valuesByDate")
-    private List<String> valuesByDate = null;
-
-    public EventEventParameters code(String code) {
-        this.code = code;
-        return this;
-    }
-
-    /**
-     * The shortened code name of an event parameter &lt;br&gt;ICASA \&quot;Code_Display\&quot;
-     *
-     * @return code
-     **/
-    @Schema(example = "tiimp", description = "The shortened code name of an event parameter <br>ICASA \"Code_Display\"")
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public EventEventParameters description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * A human readable description of this event parameter. This description is usually associated with the &#x27;name&#x27; and &#x27;code&#x27; of an event parameter.
-     *
-     * @return description
-     **/
-    @Schema(example = "Implement or tool used for tillage", description = "A human readable description of this event parameter. This description is usually associated with the 'name' and 'code' of an event parameter.")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public EventEventParameters key(String key) {
-        this.key = key;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;name&#x60;. Github issue number #440              &lt;br&gt;Specifies the relationship between the event and the given property. E.g. fertilizer, operator
-     *
-     * @return key
-     **/
-    @Schema(example = "operator", description = "**Deprecated in v2.1** Please use `name`. Github issue number #440              <br>Specifies the relationship between the event and the given property. E.g. fertilizer, operator")
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public EventEventParameters name(String name) {
-        this.name = name;
-        return this;
-    }
-
-    /**
-     * The full name of an event parameter &lt;br&gt;ICASA \&quot;Variable_Name\&quot;
-     *
-     * @return name
-     **/
-    @Schema(example = "tillage_implement", description = "The full name of an event parameter <br>ICASA \"Variable_Name\"")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public EventEventParameters rdfValue(String rdfValue) {
-        this.rdfValue = rdfValue;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;code&#x60;. Github issue number #440              &lt;brThe type of the value given above, e.g. http://xmlns.com/foaf/0.1/Agent
-     *
-     * @return rdfValue
-     **/
-    @Schema(example = "http://xmlns.com/foaf/0.1/Agent", description = "**Deprecated in v2.1** Please use `code`. Github issue number #440              <brThe type of the value given above, e.g. http://xmlns.com/foaf/0.1/Agent")
-    public String getRdfValue() {
-        return rdfValue;
-    }
-
-    public void setRdfValue(String rdfValue) {
-        this.rdfValue = rdfValue;
-    }
-
-    public EventEventParameters units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * The units or data type of the &#x27;value&#x27;.  &lt;br&gt;If the &#x27;value&#x27; comes from a standardized vocabulary or an encoded list of values, then &#x27;unit&#x27; should be &#x27;code&#x27;.  &lt;br&gt;If the &#x27;value&#x27; IS NOT a number, then &#x27;unit&#x27; should specify a data type eg. &#x27;text&#x27;, &#x27;boolean&#x27;, &#x27;date&#x27;, etc.  &lt;br&gt;If the value IS a number, then &#x27;unit&#x27; should specify the units used eg. &#x27;ml&#x27;, &#x27;cm&#x27;, etc &lt;br&gt;ICASA \&quot;Unit_or_type\&quot;
-     *
-     * @return units
-     **/
-    @Schema(example = "code", description = "The units or data type of the 'value'.  <br>If the 'value' comes from a standardized vocabulary or an encoded list of values, then 'unit' should be 'code'.  <br>If the 'value' IS NOT a number, then 'unit' should specify a data type eg. 'text', 'boolean', 'date', etc.  <br>If the value IS a number, then 'unit' should specify the units used eg. 'ml', 'cm', etc <br>ICASA \"Unit_or_type\"")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    public EventEventParameters value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * The single value of this event parameter. This single value is accurate for all the dates in the date range. If &#x27;value&#x27; is populated then &#x27;valuesByDate&#x27; should NOT be populated.
-     *
-     * @return value
-     **/
-    @Schema(example = "TI001", description = "The single value of this event parameter. This single value is accurate for all the dates in the date range. If 'value' is populated then 'valuesByDate' should NOT be populated.")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public EventEventParameters valueDescription(String valueDescription) {
-        this.valueDescription = valueDescription;
-        return this;
-    }
-
-    /**
-     * If the event parameter &#x27;unit&#x27; field is &#x27;code&#x27;, then use &#x27;valueDescription&#x27; to add a human readable description to the value.
-     *
-     * @return valueDescription
-     **/
-    @Schema(example = "Standard V-Ripper (TI001)", description = "If the event parameter 'unit' field is 'code', then use 'valueDescription' to add a human readable description to the value.")
-    public String getValueDescription() {
-        return valueDescription;
-    }
-
-    public void setValueDescription(String valueDescription) {
-        this.valueDescription = valueDescription;
-    }
-
-    public EventEventParameters valuesByDate(List<String> valuesByDate) {
-        this.valuesByDate = valuesByDate;
-        return this;
-    }
-
-    public EventEventParameters addValuesByDateItem(String valuesByDateItem) {
-        if (this.valuesByDate == null) {
-            this.valuesByDate = new ArrayList<String>();
-        }
-        this.valuesByDate.add(valuesByDateItem);
-        return this;
-    }
-
-    /**
-     * An array of values corresponding to each timestamp in the &#x27;discreteDates&#x27; array of this event. The &#x27;valuesByDate&#x27; array should exactly match the size of the &#x27;discreteDates&#x27; array. If &#x27;valuesByDate&#x27; is populated then &#x27;value&#x27; should NOT be populated.
-     *
-     * @return valuesByDate
-     **/
-    @Schema(example = "[\"20\",\"50\",\"40\"]", description = "An array of values corresponding to each timestamp in the 'discreteDates' array of this event. The 'valuesByDate' array should exactly match the size of the 'discreteDates' array. If 'valuesByDate' is populated then 'value' should NOT be populated.")
-    public List<String> getValuesByDate() {
-        return valuesByDate;
-    }
-
-    public void setValuesByDate(List<String> valuesByDate) {
-        this.valuesByDate = valuesByDate;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        EventEventParameters eventEventParameters = (EventEventParameters) o;
-        return Objects.equals(this.code, eventEventParameters.code) &&
-                Objects.equals(this.description, eventEventParameters.description) &&
-                Objects.equals(this.key, eventEventParameters.key) &&
-                Objects.equals(this.name, eventEventParameters.name) &&
-                Objects.equals(this.rdfValue, eventEventParameters.rdfValue) &&
-                Objects.equals(this.units, eventEventParameters.units) &&
-                Objects.equals(this.value, eventEventParameters.value) &&
-                Objects.equals(this.valueDescription, eventEventParameters.valueDescription) &&
-                Objects.equals(this.valuesByDate, eventEventParameters.valuesByDate);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(code, description, key, name, rdfValue, units, value, valueDescription, valuesByDate);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class EventEventParameters {\n");
-
-        sb.append("    code: ").append(toIndentedString(code)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    key: ").append(toIndentedString(key)).append("\n");
-        sb.append("    name: ").append(toIndentedString(name)).append("\n");
-        sb.append("    rdfValue: ").append(toIndentedString(rdfValue)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("    valueDescription: ").append(toIndentedString(valueDescription)).append("\n");
-        sb.append("    valuesByDate: ").append(toIndentedString(valuesByDate)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EventsResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EventsResponse.java
deleted file mode 100644
index 6ae300b6..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EventsResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * EventsResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class EventsResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private EventsResponseResult result = null;
-
-    public EventsResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public EventsResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public EventsResponse result(EventsResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public EventsResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(EventsResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        EventsResponse eventsResponse = (EventsResponse) o;
-        return Objects.equals(this._atContext, eventsResponse._atContext) &&
-                Objects.equals(this.metadata, eventsResponse.metadata) &&
-                Objects.equals(this.result, eventsResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class EventsResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EventsResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EventsResponseResult.java
deleted file mode 100644
index c12e7b1c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/EventsResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * EventsResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class EventsResponseResult {
-    @SerializedName("data")
-    private List<Event> data = new ArrayList<Event>();
-
-    public EventsResponseResult data(List<Event> data) {
-        this.data = data;
-        return this;
-    }
-
-    public EventsResponseResult addDataItem(Event dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Event> getData() {
-        return data;
-    }
-
-    public void setData(List<Event> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        EventsResponseResult eventsResponseResult = (EventsResponseResult) o;
-        return Objects.equals(this.data, eventsResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class EventsResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ExternalReferences.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ExternalReferences.java
deleted file mode 100644
index 4f3f1a60..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ExternalReferences.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.Objects;
-
-/**
- * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
- */
-@Schema(description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ExternalReferences extends ArrayList<ExternalReferencesInner> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ExternalReferences {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ExternalReferencesInner.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ExternalReferencesInner.java
deleted file mode 100644
index 8ab48519..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ExternalReferencesInner.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ExternalReferencesInner
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ExternalReferencesInner {
-    @SerializedName("referenceID")
-    private String referenceID = null;
-
-    @SerializedName("referenceId")
-    private String referenceId = null;
-
-    @SerializedName("referenceSource")
-    private String referenceSource = null;
-
-    public ExternalReferencesInner referenceID(String referenceID) {
-        this.referenceID = referenceID;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;referenceId&#x60;. Github issue number #460  &lt;br&gt;The external reference ID. Could be a simple string or a URI.
-     *
-     * @return referenceID
-     **/
-    @Schema(description = "**Deprecated in v2.1** Please use `referenceId`. Github issue number #460  <br>The external reference ID. Could be a simple string or a URI.")
-    public String getReferenceID() {
-        return referenceID;
-    }
-
-    public void setReferenceID(String referenceID) {
-        this.referenceID = referenceID;
-    }
-
-    public ExternalReferencesInner referenceId(String referenceId) {
-        this.referenceId = referenceId;
-        return this;
-    }
-
-    /**
-     * The external reference ID. Could be a simple string or a URI.
-     *
-     * @return referenceId
-     **/
-    @Schema(description = "The external reference ID. Could be a simple string or a URI.")
-    public String getReferenceId() {
-        return referenceId;
-    }
-
-    public void setReferenceId(String referenceId) {
-        this.referenceId = referenceId;
-    }
-
-    public ExternalReferencesInner referenceSource(String referenceSource) {
-        this.referenceSource = referenceSource;
-        return this;
-    }
-
-    /**
-     * An identifier for the source system or database of this reference
-     *
-     * @return referenceSource
-     **/
-    @Schema(description = "An identifier for the source system or database of this reference")
-    public String getReferenceSource() {
-        return referenceSource;
-    }
-
-    public void setReferenceSource(String referenceSource) {
-        this.referenceSource = referenceSource;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ExternalReferencesInner externalReferencesInner = (ExternalReferencesInner) o;
-        return Objects.equals(this.referenceID, externalReferencesInner.referenceID) &&
-                Objects.equals(this.referenceId, externalReferencesInner.referenceId) &&
-                Objects.equals(this.referenceSource, externalReferencesInner.referenceSource);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(referenceID, referenceId, referenceSource);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ExternalReferencesInner {\n");
-
-        sb.append("    referenceID: ").append(toIndentedString(referenceID)).append("\n");
-        sb.append("    referenceId: ").append(toIndentedString(referenceId)).append("\n");
-        sb.append("    referenceSource: ").append(toIndentedString(referenceSource)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/GeoJSON.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/GeoJSON.java
deleted file mode 100644
index b4b0d1c5..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/GeoJSON.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * One geometry as defined by GeoJSON (RFC 7946). All coordinates are decimal values on the WGS84 geographic coordinate reference system.  Copied from RFC 7946 Section 3.1.1  A position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.
- */
-@Schema(description = "One geometry as defined by GeoJSON (RFC 7946). All coordinates are decimal values on the WGS84 geographic coordinate reference system.  Copied from RFC 7946 Section 3.1.1  A position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class GeoJSON {
-    @SerializedName("geometry")
-    private OneOfGeoJSONGeometry geometry = null;
-
-    @SerializedName("type")
-    private String type = "Feature";
-
-    public GeoJSON geometry(OneOfGeoJSONGeometry geometry) {
-        this.geometry = geometry;
-        return this;
-    }
-
-    /**
-     * A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.
-     *
-     * @return geometry
-     **/
-    @Schema(example = "{\"coordinates\":[-76.506042,42.417373,123],\"type\":\"Point\"}", description = "A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.")
-    public OneOfGeoJSONGeometry getGeometry() {
-        return geometry;
-    }
-
-    public void setGeometry(OneOfGeoJSONGeometry geometry) {
-        this.geometry = geometry;
-    }
-
-    public GeoJSON type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The literal string \&quot;Feature\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Feature", description = "The literal string \"Feature\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GeoJSON geoJSON = (GeoJSON) o;
-        return Objects.equals(this.geometry, geoJSON.geometry) &&
-                Objects.equals(this.type, geoJSON.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(geometry, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GeoJSON {\n");
-
-        sb.append("    geometry: ").append(toIndentedString(geometry)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/GeoJSONSearchArea.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/GeoJSONSearchArea.java
deleted file mode 100644
index e1d0f360..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/GeoJSONSearchArea.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * A GeoJSON Polygon which describes an area to search for other GeoJSON objects. All contained Points and intersecting Polygons should be returned as search results.   All coordinates are decimal values on the WGS84 geographic coordinate reference system.
- */
-@Schema(description = "A GeoJSON Polygon which describes an area to search for other GeoJSON objects. All contained Points and intersecting Polygons should be returned as search results.   All coordinates are decimal values on the WGS84 geographic coordinate reference system.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class GeoJSONSearchArea {
-    @SerializedName("geometry")
-    private OneOfGeoJSONSearchAreaGeometry geometry = null;
-
-    @SerializedName("type")
-    private String type = "Feature";
-
-    public GeoJSONSearchArea geometry(OneOfGeoJSONSearchAreaGeometry geometry) {
-        this.geometry = geometry;
-        return this;
-    }
-
-    /**
-     * A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.
-     *
-     * @return geometry
-     **/
-    @Schema(example = "{\"coordinates\":[-76.506042,42.417373,123],\"type\":\"Point\"}", description = "A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.")
-    public OneOfGeoJSONSearchAreaGeometry getGeometry() {
-        return geometry;
-    }
-
-    public void setGeometry(OneOfGeoJSONSearchAreaGeometry geometry) {
-        this.geometry = geometry;
-    }
-
-    public GeoJSONSearchArea type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The literal string \&quot;Feature\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Feature", description = "The literal string \"Feature\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GeoJSONSearchArea geoJSONSearchArea = (GeoJSONSearchArea) o;
-        return Objects.equals(this.geometry, geoJSONSearchArea.geometry) &&
-                Objects.equals(this.type, geoJSONSearchArea.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(geometry, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GeoJSONSearchArea {\n");
-
-        sb.append("    geometry: ").append(toIndentedString(geometry)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Image.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Image.java
deleted file mode 100644
index 8bff2431..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Image.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * Image
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Image {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("copyright")
-    private String copyright = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("descriptiveOntologyTerms")
-    private List<String> descriptiveOntologyTerms = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("imageDbId")
-    private String imageDbId = null;
-
-    @SerializedName("imageFileName")
-    private String imageFileName = null;
-
-    @SerializedName("imageFileSize")
-    private Integer imageFileSize = null;
-
-    @SerializedName("imageHeight")
-    private Integer imageHeight = null;
-
-    @SerializedName("imageLocation")
-    private GeoJSON imageLocation = null;
-
-    @SerializedName("imageName")
-    private String imageName = null;
-
-    @SerializedName("imageTimeStamp")
-    private OffsetDateTime imageTimeStamp = null;
-
-    @SerializedName("imageURL")
-    private String imageURL = null;
-
-    @SerializedName("imageWidth")
-    private Integer imageWidth = null;
-
-    @SerializedName("mimeType")
-    private String mimeType = null;
-
-    @SerializedName("observationDbIds")
-    private List<String> observationDbIds = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    public Image additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Image putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Image copyright(String copyright) {
-        this.copyright = copyright;
-        return this;
-    }
-
-    /**
-     * The copyright information of this image. Example &#x27;Copyright 2018 Bob Robertson&#x27;
-     *
-     * @return copyright
-     **/
-    @Schema(example = "Copyright 2018 Bob Robertson", description = "The copyright information of this image. Example 'Copyright 2018 Bob Robertson'")
-    public String getCopyright() {
-        return copyright;
-    }
-
-    public void setCopyright(String copyright) {
-        this.copyright = copyright;
-    }
-
-    public Image description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * The human readable description of an image.
-     *
-     * @return description
-     **/
-    @Schema(example = "This is a picture of a tomato", description = "The human readable description of an image.")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Image descriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-        return this;
-    }
-
-    public Image addDescriptiveOntologyTermsItem(String descriptiveOntologyTermsItem) {
-        if (this.descriptiveOntologyTerms == null) {
-            this.descriptiveOntologyTerms = new ArrayList<String>();
-        }
-        this.descriptiveOntologyTerms.add(descriptiveOntologyTermsItem);
-        return this;
-    }
-
-    /**
-     * A list of terms to formally describe the image. Each item could be a simple Tag, an Ontology reference Id, or a full ontology URL.
-     *
-     * @return descriptiveOntologyTerms
-     **/
-    @Schema(example = "[\"doi:10.1002/0470841559\",\"Red\",\"ncbi:0300294\"]", description = "A list of terms to formally describe the image. Each item could be a simple Tag, an Ontology reference Id, or a full ontology URL.")
-    public List<String> getDescriptiveOntologyTerms() {
-        return descriptiveOntologyTerms;
-    }
-
-    public void setDescriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-    }
-
-    public Image externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Image addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Image imageDbId(String imageDbId) {
-        this.imageDbId = imageDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier of an image
-     *
-     * @return imageDbId
-     **/
-    @Schema(example = "a55efb9c", description = "The unique identifier of an image")
-    public String getImageDbId() {
-        return imageDbId;
-    }
-
-    public void setImageDbId(String imageDbId) {
-        this.imageDbId = imageDbId;
-    }
-
-    public Image imageFileName(String imageFileName) {
-        this.imageFileName = imageFileName;
-        return this;
-    }
-
-    /**
-     * The name of the image file. Might be the same as &#x27;imageName&#x27;, but could be different.
-     *
-     * @return imageFileName
-     **/
-    @Schema(example = "image_0000231.jpg", description = "The name of the image file. Might be the same as 'imageName', but could be different.")
-    public String getImageFileName() {
-        return imageFileName;
-    }
-
-    public void setImageFileName(String imageFileName) {
-        this.imageFileName = imageFileName;
-    }
-
-    public Image imageFileSize(Integer imageFileSize) {
-        this.imageFileSize = imageFileSize;
-        return this;
-    }
-
-    /**
-     * The size of the image in Bytes.
-     *
-     * @return imageFileSize
-     **/
-    @Schema(example = "50000", description = "The size of the image in Bytes.")
-    public Integer getImageFileSize() {
-        return imageFileSize;
-    }
-
-    public void setImageFileSize(Integer imageFileSize) {
-        this.imageFileSize = imageFileSize;
-    }
-
-    public Image imageHeight(Integer imageHeight) {
-        this.imageHeight = imageHeight;
-        return this;
-    }
-
-    /**
-     * The height of the image in Pixels.
-     *
-     * @return imageHeight
-     **/
-    @Schema(example = "550", description = "The height of the image in Pixels.")
-    public Integer getImageHeight() {
-        return imageHeight;
-    }
-
-    public void setImageHeight(Integer imageHeight) {
-        this.imageHeight = imageHeight;
-    }
-
-    public Image imageLocation(GeoJSON imageLocation) {
-        this.imageLocation = imageLocation;
-        return this;
-    }
-
-    /**
-     * Get imageLocation
-     *
-     * @return imageLocation
-     **/
-    @Schema(description = "")
-    public GeoJSON getImageLocation() {
-        return imageLocation;
-    }
-
-    public void setImageLocation(GeoJSON imageLocation) {
-        this.imageLocation = imageLocation;
-    }
-
-    public Image imageName(String imageName) {
-        this.imageName = imageName;
-        return this;
-    }
-
-    /**
-     * The human readable name of an image. Might be the same as &#x27;imageFileName&#x27;, but could be different.
-     *
-     * @return imageName
-     **/
-    @Schema(example = "Tomato Image 1", description = "The human readable name of an image. Might be the same as 'imageFileName', but could be different.")
-    public String getImageName() {
-        return imageName;
-    }
-
-    public void setImageName(String imageName) {
-        this.imageName = imageName;
-    }
-
-    public Image imageTimeStamp(OffsetDateTime imageTimeStamp) {
-        this.imageTimeStamp = imageTimeStamp;
-        return this;
-    }
-
-    /**
-     * The date and time the image was taken
-     *
-     * @return imageTimeStamp
-     **/
-    @Schema(description = "The date and time the image was taken")
-    public OffsetDateTime getImageTimeStamp() {
-        return imageTimeStamp;
-    }
-
-    public void setImageTimeStamp(OffsetDateTime imageTimeStamp) {
-        this.imageTimeStamp = imageTimeStamp;
-    }
-
-    public Image imageURL(String imageURL) {
-        this.imageURL = imageURL;
-        return this;
-    }
-
-    /**
-     * The complete, absolute URI path to the image file. Images might be stored on a different host or path than the BrAPI web server.
-     *
-     * @return imageURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/images/tomato", description = "The complete, absolute URI path to the image file. Images might be stored on a different host or path than the BrAPI web server.")
-    public String getImageURL() {
-        return imageURL;
-    }
-
-    public void setImageURL(String imageURL) {
-        this.imageURL = imageURL;
-    }
-
-    public Image imageWidth(Integer imageWidth) {
-        this.imageWidth = imageWidth;
-        return this;
-    }
-
-    /**
-     * The width of the image in Pixels.
-     *
-     * @return imageWidth
-     **/
-    @Schema(example = "700", description = "The width of the image in Pixels.")
-    public Integer getImageWidth() {
-        return imageWidth;
-    }
-
-    public void setImageWidth(Integer imageWidth) {
-        this.imageWidth = imageWidth;
-    }
-
-    public Image mimeType(String mimeType) {
-        this.mimeType = mimeType;
-        return this;
-    }
-
-    /**
-     * The file type of the image. Examples &#x27;image/jpeg&#x27;, &#x27;image/png&#x27;, &#x27;image/svg&#x27;, etc
-     *
-     * @return mimeType
-     **/
-    @Schema(example = "image/jpeg", description = "The file type of the image. Examples 'image/jpeg', 'image/png', 'image/svg', etc")
-    public String getMimeType() {
-        return mimeType;
-    }
-
-    public void setMimeType(String mimeType) {
-        this.mimeType = mimeType;
-    }
-
-    public Image observationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-        return this;
-    }
-
-    public Image addObservationDbIdsItem(String observationDbIdsItem) {
-        if (this.observationDbIds == null) {
-            this.observationDbIds = new ArrayList<String>();
-        }
-        this.observationDbIds.add(observationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of observation Ids this image is associated with, if applicable.
-     *
-     * @return observationDbIds
-     **/
-    @Schema(example = "[\"d05dd235\",\"8875177d\",\"c08e81b6\"]", description = "A list of observation Ids this image is associated with, if applicable.")
-    public List<String> getObservationDbIds() {
-        return observationDbIds;
-    }
-
-    public void setObservationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-    }
-
-    public Image observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The related observation unit identifier, if relevant.
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "b7e690b6", description = "The related observation unit identifier, if relevant.")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Image image = (Image) o;
-        return Objects.equals(this.additionalInfo, image.additionalInfo) &&
-                Objects.equals(this.copyright, image.copyright) &&
-                Objects.equals(this.description, image.description) &&
-                Objects.equals(this.descriptiveOntologyTerms, image.descriptiveOntologyTerms) &&
-                Objects.equals(this.externalReferences, image.externalReferences) &&
-                Objects.equals(this.imageDbId, image.imageDbId) &&
-                Objects.equals(this.imageFileName, image.imageFileName) &&
-                Objects.equals(this.imageFileSize, image.imageFileSize) &&
-                Objects.equals(this.imageHeight, image.imageHeight) &&
-                Objects.equals(this.imageLocation, image.imageLocation) &&
-                Objects.equals(this.imageName, image.imageName) &&
-                Objects.equals(this.imageTimeStamp, image.imageTimeStamp) &&
-                Objects.equals(this.imageURL, image.imageURL) &&
-                Objects.equals(this.imageWidth, image.imageWidth) &&
-                Objects.equals(this.mimeType, image.mimeType) &&
-                Objects.equals(this.observationDbIds, image.observationDbIds) &&
-                Objects.equals(this.observationUnitDbId, image.observationUnitDbId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, copyright, description, descriptiveOntologyTerms, externalReferences, imageDbId, imageFileName, imageFileSize, imageHeight, imageLocation, imageName, imageTimeStamp, imageURL, imageWidth, mimeType, observationDbIds, observationUnitDbId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Image {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    copyright: ").append(toIndentedString(copyright)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    descriptiveOntologyTerms: ").append(toIndentedString(descriptiveOntologyTerms)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    imageDbId: ").append(toIndentedString(imageDbId)).append("\n");
-        sb.append("    imageFileName: ").append(toIndentedString(imageFileName)).append("\n");
-        sb.append("    imageFileSize: ").append(toIndentedString(imageFileSize)).append("\n");
-        sb.append("    imageHeight: ").append(toIndentedString(imageHeight)).append("\n");
-        sb.append("    imageLocation: ").append(toIndentedString(imageLocation)).append("\n");
-        sb.append("    imageName: ").append(toIndentedString(imageName)).append("\n");
-        sb.append("    imageTimeStamp: ").append(toIndentedString(imageTimeStamp)).append("\n");
-        sb.append("    imageURL: ").append(toIndentedString(imageURL)).append("\n");
-        sb.append("    imageWidth: ").append(toIndentedString(imageWidth)).append("\n");
-        sb.append("    mimeType: ").append(toIndentedString(mimeType)).append("\n");
-        sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageDeleteResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageDeleteResponse.java
deleted file mode 100644
index 879302c2..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageDeleteResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ImageDeleteResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ImageDeleteResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ImageDeleteResponseResult result = null;
-
-    public ImageDeleteResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ImageDeleteResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ImageDeleteResponse result(ImageDeleteResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ImageDeleteResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ImageDeleteResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ImageDeleteResponse imageDeleteResponse = (ImageDeleteResponse) o;
-        return Objects.equals(this._atContext, imageDeleteResponse._atContext) &&
-                Objects.equals(this.metadata, imageDeleteResponse.metadata) &&
-                Objects.equals(this.result, imageDeleteResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ImageDeleteResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageDeleteResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageDeleteResponseResult.java
deleted file mode 100644
index 16786b68..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageDeleteResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ImageDeleteResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ImageDeleteResponseResult {
-    @SerializedName("imageDbIds")
-    private List<String> imageDbIds = new ArrayList<String>();
-
-    public ImageDeleteResponseResult imageDbIds(List<String> imageDbIds) {
-        this.imageDbIds = imageDbIds;
-        return this;
-    }
-
-    public ImageDeleteResponseResult addImageDbIdsItem(String imageDbIdsItem) {
-        this.imageDbIds.add(imageDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique ids of the Image records which have been successfully deleted
-     *
-     * @return imageDbIds
-     **/
-    @Schema(example = "[\"6a4a59d8\",\"3ff067e0\"]", required = true, description = "The unique ids of the Image records which have been successfully deleted")
-    public List<String> getImageDbIds() {
-        return imageDbIds;
-    }
-
-    public void setImageDbIds(List<String> imageDbIds) {
-        this.imageDbIds = imageDbIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ImageDeleteResponseResult imageDeleteResponseResult = (ImageDeleteResponseResult) o;
-        return Objects.equals(this.imageDbIds, imageDeleteResponseResult.imageDbIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(imageDbIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ImageDeleteResponseResult {\n");
-
-        sb.append("    imageDbIds: ").append(toIndentedString(imageDbIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageListResponse.java
deleted file mode 100644
index 54ef8426..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ImageListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ImageListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ImageListResponseResult result = null;
-
-    public ImageListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ImageListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ImageListResponse result(ImageListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ImageListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ImageListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ImageListResponse imageListResponse = (ImageListResponse) o;
-        return Objects.equals(this._atContext, imageListResponse._atContext) &&
-                Objects.equals(this.metadata, imageListResponse.metadata) &&
-                Objects.equals(this.result, imageListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ImageListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageListResponseResult.java
deleted file mode 100644
index de46e590..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ImageListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ImageListResponseResult {
-    @SerializedName("data")
-    private List<Image> data = new ArrayList<Image>();
-
-    public ImageListResponseResult data(List<Image> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ImageListResponseResult addDataItem(Image dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Image> getData() {
-        return data;
-    }
-
-    public void setData(List<Image> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ImageListResponseResult imageListResponseResult = (ImageListResponseResult) o;
-        return Objects.equals(this.data, imageListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ImageListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageNewRequest.java
deleted file mode 100644
index 2ea201c4..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageNewRequest.java
+++ /dev/null
@@ -1,481 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * ImageNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ImageNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("copyright")
-    private String copyright = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("descriptiveOntologyTerms")
-    private List<String> descriptiveOntologyTerms = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("imageFileName")
-    private String imageFileName = null;
-
-    @SerializedName("imageFileSize")
-    private Integer imageFileSize = null;
-
-    @SerializedName("imageHeight")
-    private Integer imageHeight = null;
-
-    @SerializedName("imageLocation")
-    private GeoJSON imageLocation = null;
-
-    @SerializedName("imageName")
-    private String imageName = null;
-
-    @SerializedName("imageTimeStamp")
-    private OffsetDateTime imageTimeStamp = null;
-
-    @SerializedName("imageURL")
-    private String imageURL = null;
-
-    @SerializedName("imageWidth")
-    private Integer imageWidth = null;
-
-    @SerializedName("mimeType")
-    private String mimeType = null;
-
-    @SerializedName("observationDbIds")
-    private List<String> observationDbIds = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    public ImageNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ImageNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ImageNewRequest copyright(String copyright) {
-        this.copyright = copyright;
-        return this;
-    }
-
-    /**
-     * The copyright information of this image. Example &#x27;Copyright 2018 Bob Robertson&#x27;
-     *
-     * @return copyright
-     **/
-    @Schema(example = "Copyright 2018 Bob Robertson", description = "The copyright information of this image. Example 'Copyright 2018 Bob Robertson'")
-    public String getCopyright() {
-        return copyright;
-    }
-
-    public void setCopyright(String copyright) {
-        this.copyright = copyright;
-    }
-
-    public ImageNewRequest description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * The human readable description of an image.
-     *
-     * @return description
-     **/
-    @Schema(example = "This is a picture of a tomato", description = "The human readable description of an image.")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public ImageNewRequest descriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-        return this;
-    }
-
-    public ImageNewRequest addDescriptiveOntologyTermsItem(String descriptiveOntologyTermsItem) {
-        if (this.descriptiveOntologyTerms == null) {
-            this.descriptiveOntologyTerms = new ArrayList<String>();
-        }
-        this.descriptiveOntologyTerms.add(descriptiveOntologyTermsItem);
-        return this;
-    }
-
-    /**
-     * A list of terms to formally describe the image. Each item could be a simple Tag, an Ontology reference Id, or a full ontology URL.
-     *
-     * @return descriptiveOntologyTerms
-     **/
-    @Schema(example = "[\"doi:10.1002/0470841559\",\"Red\",\"ncbi:0300294\"]", description = "A list of terms to formally describe the image. Each item could be a simple Tag, an Ontology reference Id, or a full ontology URL.")
-    public List<String> getDescriptiveOntologyTerms() {
-        return descriptiveOntologyTerms;
-    }
-
-    public void setDescriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-    }
-
-    public ImageNewRequest externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ImageNewRequest addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ImageNewRequest imageFileName(String imageFileName) {
-        this.imageFileName = imageFileName;
-        return this;
-    }
-
-    /**
-     * The name of the image file. Might be the same as &#x27;imageName&#x27;, but could be different.
-     *
-     * @return imageFileName
-     **/
-    @Schema(example = "image_0000231.jpg", description = "The name of the image file. Might be the same as 'imageName', but could be different.")
-    public String getImageFileName() {
-        return imageFileName;
-    }
-
-    public void setImageFileName(String imageFileName) {
-        this.imageFileName = imageFileName;
-    }
-
-    public ImageNewRequest imageFileSize(Integer imageFileSize) {
-        this.imageFileSize = imageFileSize;
-        return this;
-    }
-
-    /**
-     * The size of the image in Bytes.
-     *
-     * @return imageFileSize
-     **/
-    @Schema(example = "50000", description = "The size of the image in Bytes.")
-    public Integer getImageFileSize() {
-        return imageFileSize;
-    }
-
-    public void setImageFileSize(Integer imageFileSize) {
-        this.imageFileSize = imageFileSize;
-    }
-
-    public ImageNewRequest imageHeight(Integer imageHeight) {
-        this.imageHeight = imageHeight;
-        return this;
-    }
-
-    /**
-     * The height of the image in Pixels.
-     *
-     * @return imageHeight
-     **/
-    @Schema(example = "550", description = "The height of the image in Pixels.")
-    public Integer getImageHeight() {
-        return imageHeight;
-    }
-
-    public void setImageHeight(Integer imageHeight) {
-        this.imageHeight = imageHeight;
-    }
-
-    public ImageNewRequest imageLocation(GeoJSON imageLocation) {
-        this.imageLocation = imageLocation;
-        return this;
-    }
-
-    /**
-     * Get imageLocation
-     *
-     * @return imageLocation
-     **/
-    @Schema(description = "")
-    public GeoJSON getImageLocation() {
-        return imageLocation;
-    }
-
-    public void setImageLocation(GeoJSON imageLocation) {
-        this.imageLocation = imageLocation;
-    }
-
-    public ImageNewRequest imageName(String imageName) {
-        this.imageName = imageName;
-        return this;
-    }
-
-    /**
-     * The human readable name of an image. Might be the same as &#x27;imageFileName&#x27;, but could be different.
-     *
-     * @return imageName
-     **/
-    @Schema(example = "Tomato Image 1", description = "The human readable name of an image. Might be the same as 'imageFileName', but could be different.")
-    public String getImageName() {
-        return imageName;
-    }
-
-    public void setImageName(String imageName) {
-        this.imageName = imageName;
-    }
-
-    public ImageNewRequest imageTimeStamp(OffsetDateTime imageTimeStamp) {
-        this.imageTimeStamp = imageTimeStamp;
-        return this;
-    }
-
-    /**
-     * The date and time the image was taken
-     *
-     * @return imageTimeStamp
-     **/
-    @Schema(description = "The date and time the image was taken")
-    public OffsetDateTime getImageTimeStamp() {
-        return imageTimeStamp;
-    }
-
-    public void setImageTimeStamp(OffsetDateTime imageTimeStamp) {
-        this.imageTimeStamp = imageTimeStamp;
-    }
-
-    public ImageNewRequest imageURL(String imageURL) {
-        this.imageURL = imageURL;
-        return this;
-    }
-
-    /**
-     * The complete, absolute URI path to the image file. Images might be stored on a different host or path than the BrAPI web server.
-     *
-     * @return imageURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/images/tomato", description = "The complete, absolute URI path to the image file. Images might be stored on a different host or path than the BrAPI web server.")
-    public String getImageURL() {
-        return imageURL;
-    }
-
-    public void setImageURL(String imageURL) {
-        this.imageURL = imageURL;
-    }
-
-    public ImageNewRequest imageWidth(Integer imageWidth) {
-        this.imageWidth = imageWidth;
-        return this;
-    }
-
-    /**
-     * The width of the image in Pixels.
-     *
-     * @return imageWidth
-     **/
-    @Schema(example = "700", description = "The width of the image in Pixels.")
-    public Integer getImageWidth() {
-        return imageWidth;
-    }
-
-    public void setImageWidth(Integer imageWidth) {
-        this.imageWidth = imageWidth;
-    }
-
-    public ImageNewRequest mimeType(String mimeType) {
-        this.mimeType = mimeType;
-        return this;
-    }
-
-    /**
-     * The file type of the image. Examples &#x27;image/jpeg&#x27;, &#x27;image/png&#x27;, &#x27;image/svg&#x27;, etc
-     *
-     * @return mimeType
-     **/
-    @Schema(example = "image/jpeg", description = "The file type of the image. Examples 'image/jpeg', 'image/png', 'image/svg', etc")
-    public String getMimeType() {
-        return mimeType;
-    }
-
-    public void setMimeType(String mimeType) {
-        this.mimeType = mimeType;
-    }
-
-    public ImageNewRequest observationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-        return this;
-    }
-
-    public ImageNewRequest addObservationDbIdsItem(String observationDbIdsItem) {
-        if (this.observationDbIds == null) {
-            this.observationDbIds = new ArrayList<String>();
-        }
-        this.observationDbIds.add(observationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of observation Ids this image is associated with, if applicable.
-     *
-     * @return observationDbIds
-     **/
-    @Schema(example = "[\"d05dd235\",\"8875177d\",\"c08e81b6\"]", description = "A list of observation Ids this image is associated with, if applicable.")
-    public List<String> getObservationDbIds() {
-        return observationDbIds;
-    }
-
-    public void setObservationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-    }
-
-    public ImageNewRequest observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The related observation unit identifier, if relevant.
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "b7e690b6", description = "The related observation unit identifier, if relevant.")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ImageNewRequest imageNewRequest = (ImageNewRequest) o;
-        return Objects.equals(this.additionalInfo, imageNewRequest.additionalInfo) &&
-                Objects.equals(this.copyright, imageNewRequest.copyright) &&
-                Objects.equals(this.description, imageNewRequest.description) &&
-                Objects.equals(this.descriptiveOntologyTerms, imageNewRequest.descriptiveOntologyTerms) &&
-                Objects.equals(this.externalReferences, imageNewRequest.externalReferences) &&
-                Objects.equals(this.imageFileName, imageNewRequest.imageFileName) &&
-                Objects.equals(this.imageFileSize, imageNewRequest.imageFileSize) &&
-                Objects.equals(this.imageHeight, imageNewRequest.imageHeight) &&
-                Objects.equals(this.imageLocation, imageNewRequest.imageLocation) &&
-                Objects.equals(this.imageName, imageNewRequest.imageName) &&
-                Objects.equals(this.imageTimeStamp, imageNewRequest.imageTimeStamp) &&
-                Objects.equals(this.imageURL, imageNewRequest.imageURL) &&
-                Objects.equals(this.imageWidth, imageNewRequest.imageWidth) &&
-                Objects.equals(this.mimeType, imageNewRequest.mimeType) &&
-                Objects.equals(this.observationDbIds, imageNewRequest.observationDbIds) &&
-                Objects.equals(this.observationUnitDbId, imageNewRequest.observationUnitDbId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, copyright, description, descriptiveOntologyTerms, externalReferences, imageFileName, imageFileSize, imageHeight, imageLocation, imageName, imageTimeStamp, imageURL, imageWidth, mimeType, observationDbIds, observationUnitDbId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ImageNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    copyright: ").append(toIndentedString(copyright)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    descriptiveOntologyTerms: ").append(toIndentedString(descriptiveOntologyTerms)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    imageFileName: ").append(toIndentedString(imageFileName)).append("\n");
-        sb.append("    imageFileSize: ").append(toIndentedString(imageFileSize)).append("\n");
-        sb.append("    imageHeight: ").append(toIndentedString(imageHeight)).append("\n");
-        sb.append("    imageLocation: ").append(toIndentedString(imageLocation)).append("\n");
-        sb.append("    imageName: ").append(toIndentedString(imageName)).append("\n");
-        sb.append("    imageTimeStamp: ").append(toIndentedString(imageTimeStamp)).append("\n");
-        sb.append("    imageURL: ").append(toIndentedString(imageURL)).append("\n");
-        sb.append("    imageWidth: ").append(toIndentedString(imageWidth)).append("\n");
-        sb.append("    mimeType: ").append(toIndentedString(mimeType)).append("\n");
-        sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageSearchRequest.java
deleted file mode 100644
index 1ce5f1eb..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageSearchRequest.java
+++ /dev/null
@@ -1,747 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ImageSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ImageSearchRequest {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("descriptiveOntologyTerms")
-    private List<String> descriptiveOntologyTerms = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("imageDbIds")
-    private List<String> imageDbIds = null;
-
-    @SerializedName("imageFileNames")
-    private List<String> imageFileNames = null;
-
-    @SerializedName("imageFileSizeMax")
-    private Integer imageFileSizeMax = null;
-
-    @SerializedName("imageFileSizeMin")
-    private Integer imageFileSizeMin = null;
-
-    @SerializedName("imageHeightMax")
-    private Integer imageHeightMax = null;
-
-    @SerializedName("imageHeightMin")
-    private Integer imageHeightMin = null;
-
-    @SerializedName("imageLocation")
-    private GeoJSONSearchArea imageLocation = null;
-
-    @SerializedName("imageNames")
-    private List<String> imageNames = null;
-
-    @SerializedName("imageTimeStampRangeEnd")
-    private OffsetDateTime imageTimeStampRangeEnd = null;
-
-    @SerializedName("imageTimeStampRangeStart")
-    private OffsetDateTime imageTimeStampRangeStart = null;
-
-    @SerializedName("imageWidthMax")
-    private Integer imageWidthMax = null;
-
-    @SerializedName("imageWidthMin")
-    private Integer imageWidthMin = null;
-
-    @SerializedName("mimeTypes")
-    private List<String> mimeTypes = null;
-
-    @SerializedName("observationDbIds")
-    private List<String> observationDbIds = null;
-
-    @SerializedName("observationUnitDbIds")
-    private List<String> observationUnitDbIds = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    public ImageSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public ImageSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public ImageSearchRequest descriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-        return this;
-    }
-
-    public ImageSearchRequest addDescriptiveOntologyTermsItem(String descriptiveOntologyTermsItem) {
-        if (this.descriptiveOntologyTerms == null) {
-            this.descriptiveOntologyTerms = new ArrayList<String>();
-        }
-        this.descriptiveOntologyTerms.add(descriptiveOntologyTermsItem);
-        return this;
-    }
-
-    /**
-     * A list of terms to formally describe the image to search for. Each item could be a simple Tag, an Ontology reference Id, or a full ontology URL.
-     *
-     * @return descriptiveOntologyTerms
-     **/
-    @Schema(example = "[\"doi:10.1002/0470841559\",\"Red\",\"ncbi:0300294\"]", description = "A list of terms to formally describe the image to search for. Each item could be a simple Tag, an Ontology reference Id, or a full ontology URL.")
-    public List<String> getDescriptiveOntologyTerms() {
-        return descriptiveOntologyTerms;
-    }
-
-    public void setDescriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-    }
-
-    public ImageSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public ImageSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public ImageSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public ImageSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public ImageSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public ImageSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public ImageSearchRequest imageDbIds(List<String> imageDbIds) {
-        this.imageDbIds = imageDbIds;
-        return this;
-    }
-
-    public ImageSearchRequest addImageDbIdsItem(String imageDbIdsItem) {
-        if (this.imageDbIds == null) {
-            this.imageDbIds = new ArrayList<String>();
-        }
-        this.imageDbIds.add(imageDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of image Ids to search for
-     *
-     * @return imageDbIds
-     **/
-    @Schema(example = "[\"564b64a6\",\"0d122d1d\"]", description = "A list of image Ids to search for")
-    public List<String> getImageDbIds() {
-        return imageDbIds;
-    }
-
-    public void setImageDbIds(List<String> imageDbIds) {
-        this.imageDbIds = imageDbIds;
-    }
-
-    public ImageSearchRequest imageFileNames(List<String> imageFileNames) {
-        this.imageFileNames = imageFileNames;
-        return this;
-    }
-
-    public ImageSearchRequest addImageFileNamesItem(String imageFileNamesItem) {
-        if (this.imageFileNames == null) {
-            this.imageFileNames = new ArrayList<String>();
-        }
-        this.imageFileNames.add(imageFileNamesItem);
-        return this;
-    }
-
-    /**
-     * Image file names to search for.
-     *
-     * @return imageFileNames
-     **/
-    @Schema(example = "[\"image_01032019.jpg\",\"picture_field_1234.jpg\"]", description = "Image file names to search for.")
-    public List<String> getImageFileNames() {
-        return imageFileNames;
-    }
-
-    public void setImageFileNames(List<String> imageFileNames) {
-        this.imageFileNames = imageFileNames;
-    }
-
-    public ImageSearchRequest imageFileSizeMax(Integer imageFileSizeMax) {
-        this.imageFileSizeMax = imageFileSizeMax;
-        return this;
-    }
-
-    /**
-     * A maximum image file size to search for.
-     *
-     * @return imageFileSizeMax
-     **/
-    @Schema(example = "20000000", description = "A maximum image file size to search for.")
-    public Integer getImageFileSizeMax() {
-        return imageFileSizeMax;
-    }
-
-    public void setImageFileSizeMax(Integer imageFileSizeMax) {
-        this.imageFileSizeMax = imageFileSizeMax;
-    }
-
-    public ImageSearchRequest imageFileSizeMin(Integer imageFileSizeMin) {
-        this.imageFileSizeMin = imageFileSizeMin;
-        return this;
-    }
-
-    /**
-     * A minimum image file size to search for.
-     *
-     * @return imageFileSizeMin
-     **/
-    @Schema(example = "1000", description = "A minimum image file size to search for.")
-    public Integer getImageFileSizeMin() {
-        return imageFileSizeMin;
-    }
-
-    public void setImageFileSizeMin(Integer imageFileSizeMin) {
-        this.imageFileSizeMin = imageFileSizeMin;
-    }
-
-    public ImageSearchRequest imageHeightMax(Integer imageHeightMax) {
-        this.imageHeightMax = imageHeightMax;
-        return this;
-    }
-
-    /**
-     * A maximum image height to search for.
-     *
-     * @return imageHeightMax
-     **/
-    @Schema(example = "1080", description = "A maximum image height to search for.")
-    public Integer getImageHeightMax() {
-        return imageHeightMax;
-    }
-
-    public void setImageHeightMax(Integer imageHeightMax) {
-        this.imageHeightMax = imageHeightMax;
-    }
-
-    public ImageSearchRequest imageHeightMin(Integer imageHeightMin) {
-        this.imageHeightMin = imageHeightMin;
-        return this;
-    }
-
-    /**
-     * A minimum image height to search for.
-     *
-     * @return imageHeightMin
-     **/
-    @Schema(example = "720", description = "A minimum image height to search for.")
-    public Integer getImageHeightMin() {
-        return imageHeightMin;
-    }
-
-    public void setImageHeightMin(Integer imageHeightMin) {
-        this.imageHeightMin = imageHeightMin;
-    }
-
-    public ImageSearchRequest imageLocation(GeoJSONSearchArea imageLocation) {
-        this.imageLocation = imageLocation;
-        return this;
-    }
-
-    /**
-     * Get imageLocation
-     *
-     * @return imageLocation
-     **/
-    @Schema(description = "")
-    public GeoJSONSearchArea getImageLocation() {
-        return imageLocation;
-    }
-
-    public void setImageLocation(GeoJSONSearchArea imageLocation) {
-        this.imageLocation = imageLocation;
-    }
-
-    public ImageSearchRequest imageNames(List<String> imageNames) {
-        this.imageNames = imageNames;
-        return this;
-    }
-
-    public ImageSearchRequest addImageNamesItem(String imageNamesItem) {
-        if (this.imageNames == null) {
-            this.imageNames = new ArrayList<String>();
-        }
-        this.imageNames.add(imageNamesItem);
-        return this;
-    }
-
-    /**
-     * Human readable names to search for.
-     *
-     * @return imageNames
-     **/
-    @Schema(example = "[\"Image 43\",\"Tractor in field\"]", description = "Human readable names to search for.")
-    public List<String> getImageNames() {
-        return imageNames;
-    }
-
-    public void setImageNames(List<String> imageNames) {
-        this.imageNames = imageNames;
-    }
-
-    public ImageSearchRequest imageTimeStampRangeEnd(OffsetDateTime imageTimeStampRangeEnd) {
-        this.imageTimeStampRangeEnd = imageTimeStampRangeEnd;
-        return this;
-    }
-
-    /**
-     * The latest timestamp to search for.
-     *
-     * @return imageTimeStampRangeEnd
-     **/
-    @Schema(description = "The latest timestamp to search for.")
-    public OffsetDateTime getImageTimeStampRangeEnd() {
-        return imageTimeStampRangeEnd;
-    }
-
-    public void setImageTimeStampRangeEnd(OffsetDateTime imageTimeStampRangeEnd) {
-        this.imageTimeStampRangeEnd = imageTimeStampRangeEnd;
-    }
-
-    public ImageSearchRequest imageTimeStampRangeStart(OffsetDateTime imageTimeStampRangeStart) {
-        this.imageTimeStampRangeStart = imageTimeStampRangeStart;
-        return this;
-    }
-
-    /**
-     * The earliest timestamp to search for.
-     *
-     * @return imageTimeStampRangeStart
-     **/
-    @Schema(description = "The earliest timestamp to search for.")
-    public OffsetDateTime getImageTimeStampRangeStart() {
-        return imageTimeStampRangeStart;
-    }
-
-    public void setImageTimeStampRangeStart(OffsetDateTime imageTimeStampRangeStart) {
-        this.imageTimeStampRangeStart = imageTimeStampRangeStart;
-    }
-
-    public ImageSearchRequest imageWidthMax(Integer imageWidthMax) {
-        this.imageWidthMax = imageWidthMax;
-        return this;
-    }
-
-    /**
-     * A maximum image width to search for.
-     *
-     * @return imageWidthMax
-     **/
-    @Schema(example = "1920", description = "A maximum image width to search for.")
-    public Integer getImageWidthMax() {
-        return imageWidthMax;
-    }
-
-    public void setImageWidthMax(Integer imageWidthMax) {
-        this.imageWidthMax = imageWidthMax;
-    }
-
-    public ImageSearchRequest imageWidthMin(Integer imageWidthMin) {
-        this.imageWidthMin = imageWidthMin;
-        return this;
-    }
-
-    /**
-     * A minimum image width to search for.
-     *
-     * @return imageWidthMin
-     **/
-    @Schema(example = "1280", description = "A minimum image width to search for.")
-    public Integer getImageWidthMin() {
-        return imageWidthMin;
-    }
-
-    public void setImageWidthMin(Integer imageWidthMin) {
-        this.imageWidthMin = imageWidthMin;
-    }
-
-    public ImageSearchRequest mimeTypes(List<String> mimeTypes) {
-        this.mimeTypes = mimeTypes;
-        return this;
-    }
-
-    public ImageSearchRequest addMimeTypesItem(String mimeTypesItem) {
-        if (this.mimeTypes == null) {
-            this.mimeTypes = new ArrayList<String>();
-        }
-        this.mimeTypes.add(mimeTypesItem);
-        return this;
-    }
-
-    /**
-     * A set of image file types to search for.
-     *
-     * @return mimeTypes
-     **/
-    @Schema(example = "[\"image/jpg\",\"image/jpeg\",\"image/gif\"]", description = "A set of image file types to search for.")
-    public List<String> getMimeTypes() {
-        return mimeTypes;
-    }
-
-    public void setMimeTypes(List<String> mimeTypes) {
-        this.mimeTypes = mimeTypes;
-    }
-
-    public ImageSearchRequest observationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-        return this;
-    }
-
-    public ImageSearchRequest addObservationDbIdsItem(String observationDbIdsItem) {
-        if (this.observationDbIds == null) {
-            this.observationDbIds = new ArrayList<String>();
-        }
-        this.observationDbIds.add(observationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of observation Ids this image is associated with to search for
-     *
-     * @return observationDbIds
-     **/
-    @Schema(example = "[\"47326456\",\"fc9823ac\"]", description = "A list of observation Ids this image is associated with to search for")
-    public List<String> getObservationDbIds() {
-        return observationDbIds;
-    }
-
-    public void setObservationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-    }
-
-    public ImageSearchRequest observationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-        return this;
-    }
-
-    public ImageSearchRequest addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-        if (this.observationUnitDbIds == null) {
-            this.observationUnitDbIds = new ArrayList<String>();
-        }
-        this.observationUnitDbIds.add(observationUnitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A set of observation unit identifiers to search for.
-     *
-     * @return observationUnitDbIds
-     **/
-    @Schema(example = "[\"f5e4b273\",\"328c9424\"]", description = "A set of observation unit identifiers to search for.")
-    public List<String> getObservationUnitDbIds() {
-        return observationUnitDbIds;
-    }
-
-    public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-    }
-
-    public ImageSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public ImageSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public ImageSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public ImageSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public ImageSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public ImageSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ImageSearchRequest imageSearchRequest = (ImageSearchRequest) o;
-        return Objects.equals(this.commonCropNames, imageSearchRequest.commonCropNames) &&
-                Objects.equals(this.descriptiveOntologyTerms, imageSearchRequest.descriptiveOntologyTerms) &&
-                Objects.equals(this.externalReferenceIDs, imageSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, imageSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, imageSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.imageDbIds, imageSearchRequest.imageDbIds) &&
-                Objects.equals(this.imageFileNames, imageSearchRequest.imageFileNames) &&
-                Objects.equals(this.imageFileSizeMax, imageSearchRequest.imageFileSizeMax) &&
-                Objects.equals(this.imageFileSizeMin, imageSearchRequest.imageFileSizeMin) &&
-                Objects.equals(this.imageHeightMax, imageSearchRequest.imageHeightMax) &&
-                Objects.equals(this.imageHeightMin, imageSearchRequest.imageHeightMin) &&
-                Objects.equals(this.imageLocation, imageSearchRequest.imageLocation) &&
-                Objects.equals(this.imageNames, imageSearchRequest.imageNames) &&
-                Objects.equals(this.imageTimeStampRangeEnd, imageSearchRequest.imageTimeStampRangeEnd) &&
-                Objects.equals(this.imageTimeStampRangeStart, imageSearchRequest.imageTimeStampRangeStart) &&
-                Objects.equals(this.imageWidthMax, imageSearchRequest.imageWidthMax) &&
-                Objects.equals(this.imageWidthMin, imageSearchRequest.imageWidthMin) &&
-                Objects.equals(this.mimeTypes, imageSearchRequest.mimeTypes) &&
-                Objects.equals(this.observationDbIds, imageSearchRequest.observationDbIds) &&
-                Objects.equals(this.observationUnitDbIds, imageSearchRequest.observationUnitDbIds) &&
-                Objects.equals(this.page, imageSearchRequest.page) &&
-                Objects.equals(this.pageSize, imageSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, imageSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, imageSearchRequest.programNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, descriptiveOntologyTerms, externalReferenceIDs, externalReferenceIds, externalReferenceSources, imageDbIds, imageFileNames, imageFileSizeMax, imageFileSizeMin, imageHeightMax, imageHeightMin, imageLocation, imageNames, imageTimeStampRangeEnd, imageTimeStampRangeStart, imageWidthMax, imageWidthMin, mimeTypes, observationDbIds, observationUnitDbIds, page, pageSize, programDbIds, programNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ImageSearchRequest {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    descriptiveOntologyTerms: ").append(toIndentedString(descriptiveOntologyTerms)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    imageDbIds: ").append(toIndentedString(imageDbIds)).append("\n");
-        sb.append("    imageFileNames: ").append(toIndentedString(imageFileNames)).append("\n");
-        sb.append("    imageFileSizeMax: ").append(toIndentedString(imageFileSizeMax)).append("\n");
-        sb.append("    imageFileSizeMin: ").append(toIndentedString(imageFileSizeMin)).append("\n");
-        sb.append("    imageHeightMax: ").append(toIndentedString(imageHeightMax)).append("\n");
-        sb.append("    imageHeightMin: ").append(toIndentedString(imageHeightMin)).append("\n");
-        sb.append("    imageLocation: ").append(toIndentedString(imageLocation)).append("\n");
-        sb.append("    imageNames: ").append(toIndentedString(imageNames)).append("\n");
-        sb.append("    imageTimeStampRangeEnd: ").append(toIndentedString(imageTimeStampRangeEnd)).append("\n");
-        sb.append("    imageTimeStampRangeStart: ").append(toIndentedString(imageTimeStampRangeStart)).append("\n");
-        sb.append("    imageWidthMax: ").append(toIndentedString(imageWidthMax)).append("\n");
-        sb.append("    imageWidthMin: ").append(toIndentedString(imageWidthMin)).append("\n");
-        sb.append("    mimeTypes: ").append(toIndentedString(mimeTypes)).append("\n");
-        sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
-        sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageSingleResponse.java
deleted file mode 100644
index 342ce2d7..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ImageSingleResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ImageSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ImageSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Image result = null;
-
-    public ImageSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ImageSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ImageSingleResponse result(Image result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Image getResult() {
-        return result;
-    }
-
-    public void setResult(Image result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ImageSingleResponse imageSingleResponse = (ImageSingleResponse) o;
-        return Objects.equals(this._atContext, imageSingleResponse._atContext) &&
-                Objects.equals(this.metadata, imageSingleResponse.metadata) &&
-                Objects.equals(this.result, imageSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ImageSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LinearRing.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LinearRing.java
deleted file mode 100644
index ef88dab5..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LinearRing.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An array of at least four positions where the first equals the last
- */
-@Schema(description = "An array of at least four positions where the first equals the last")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class LinearRing extends ArrayList<List> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class LinearRing {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListBaseFields.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListBaseFields.java
deleted file mode 100644
index 3cf7d10a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListBaseFields.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * ListBaseFields
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ListBaseFields {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("dateCreated")
-    private OffsetDateTime dateCreated = null;
-
-    @SerializedName("dateModified")
-    private OffsetDateTime dateModified = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("listDescription")
-    private String listDescription = null;
-
-    @SerializedName("listName")
-    private String listName = null;
-
-    @SerializedName("listOwnerName")
-    private String listOwnerName = null;
-
-    @SerializedName("listOwnerPersonDbId")
-    private String listOwnerPersonDbId = null;
-
-    @SerializedName("listSize")
-    private Integer listSize = null;
-
-    @SerializedName("listSource")
-    private String listSource = null;
-
-    /**
-     * A flag to indicate the type of objects that are referneced in a List
-     */
-    @JsonAdapter(ListTypeEnum.Adapter.class)
-    public enum ListTypeEnum {
-        GERMPLASM("germplasm"),
-        MARKERS("markers"),
-        VARIANTS("variants"),
-        PROGRAMS("programs"),
-        TRIALS("trials"),
-        STUDIES("studies"),
-        OBSERVATIONUNITS("observationUnits"),
-        OBSERVATIONS("observations"),
-        OBSERVATIONVARIABLES("observationVariables"),
-        SAMPLES("samples");
-
-        private String value;
-
-        ListTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static ListTypeEnum fromValue(String input) {
-            for (ListTypeEnum b : ListTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<ListTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final ListTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public ListTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return ListTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("listType")
-    private ListTypeEnum listType = null;
-
-    public ListBaseFields additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ListBaseFields putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(example = "{}", description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ListBaseFields dateCreated(OffsetDateTime dateCreated) {
-        this.dateCreated = dateCreated;
-        return this;
-    }
-
-    /**
-     * Timestamp when the entity was first created
-     *
-     * @return dateCreated
-     **/
-    @Schema(description = "Timestamp when the entity was first created")
-    public OffsetDateTime getDateCreated() {
-        return dateCreated;
-    }
-
-    public void setDateCreated(OffsetDateTime dateCreated) {
-        this.dateCreated = dateCreated;
-    }
-
-    public ListBaseFields dateModified(OffsetDateTime dateModified) {
-        this.dateModified = dateModified;
-        return this;
-    }
-
-    /**
-     * Timestamp when the entity was last updated
-     *
-     * @return dateModified
-     **/
-    @Schema(description = "Timestamp when the entity was last updated")
-    public OffsetDateTime getDateModified() {
-        return dateModified;
-    }
-
-    public void setDateModified(OffsetDateTime dateModified) {
-        this.dateModified = dateModified;
-    }
-
-    public ListBaseFields externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ListBaseFields addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ListBaseFields listDescription(String listDescription) {
-        this.listDescription = listDescription;
-        return this;
-    }
-
-    /**
-     * Description of a List
-     *
-     * @return listDescription
-     **/
-    @Schema(example = "This is a list of germplasm I would like to investigate next season", description = "Description of a List")
-    public String getListDescription() {
-        return listDescription;
-    }
-
-    public void setListDescription(String listDescription) {
-        this.listDescription = listDescription;
-    }
-
-    public ListBaseFields listName(String listName) {
-        this.listName = listName;
-        return this;
-    }
-
-    /**
-     * Human readable name of a List
-     *
-     * @return listName
-     **/
-    @Schema(example = "MyGermplasm_Sept_2020", description = "Human readable name of a List")
-    public String getListName() {
-        return listName;
-    }
-
-    public void setListName(String listName) {
-        this.listName = listName;
-    }
-
-    public ListBaseFields listOwnerName(String listOwnerName) {
-        this.listOwnerName = listOwnerName;
-        return this;
-    }
-
-    /**
-     * Human readable name of a List Owner. (usually a user or person)
-     *
-     * @return listOwnerName
-     **/
-    @Schema(example = "Bob Robertson", description = "Human readable name of a List Owner. (usually a user or person)")
-    public String getListOwnerName() {
-        return listOwnerName;
-    }
-
-    public void setListOwnerName(String listOwnerName) {
-        this.listOwnerName = listOwnerName;
-    }
-
-    public ListBaseFields listOwnerPersonDbId(String listOwnerPersonDbId) {
-        this.listOwnerPersonDbId = listOwnerPersonDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a List Owner. (usually a user or person)
-     *
-     * @return listOwnerPersonDbId
-     **/
-    @Schema(example = "58db0628", description = "The unique identifier for a List Owner. (usually a user or person)")
-    public String getListOwnerPersonDbId() {
-        return listOwnerPersonDbId;
-    }
-
-    public void setListOwnerPersonDbId(String listOwnerPersonDbId) {
-        this.listOwnerPersonDbId = listOwnerPersonDbId;
-    }
-
-    public ListBaseFields listSize(Integer listSize) {
-        this.listSize = listSize;
-        return this;
-    }
-
-    /**
-     * The number of elements in a List
-     *
-     * @return listSize
-     **/
-    @Schema(example = "53", description = "The number of elements in a List")
-    public Integer getListSize() {
-        return listSize;
-    }
-
-    public void setListSize(Integer listSize) {
-        this.listSize = listSize;
-    }
-
-    public ListBaseFields listSource(String listSource) {
-        this.listSource = listSource;
-        return this;
-    }
-
-    /**
-     * The description of where a List originated from
-     *
-     * @return listSource
-     **/
-    @Schema(example = "GeneBank Repository 1.3", description = "The description of where a List originated from")
-    public String getListSource() {
-        return listSource;
-    }
-
-    public void setListSource(String listSource) {
-        this.listSource = listSource;
-    }
-
-    public ListBaseFields listType(ListTypeEnum listType) {
-        this.listType = listType;
-        return this;
-    }
-
-    /**
-     * A flag to indicate the type of objects that are referneced in a List
-     *
-     * @return listType
-     **/
-    @Schema(example = "germplasm", required = true, description = "A flag to indicate the type of objects that are referneced in a List")
-    public ListTypeEnum getListType() {
-        return listType;
-    }
-
-    public void setListType(ListTypeEnum listType) {
-        this.listType = listType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ListBaseFields listBaseFields = (ListBaseFields) o;
-        return Objects.equals(this.additionalInfo, listBaseFields.additionalInfo) &&
-                Objects.equals(this.dateCreated, listBaseFields.dateCreated) &&
-                Objects.equals(this.dateModified, listBaseFields.dateModified) &&
-                Objects.equals(this.externalReferences, listBaseFields.externalReferences) &&
-                Objects.equals(this.listDescription, listBaseFields.listDescription) &&
-                Objects.equals(this.listName, listBaseFields.listName) &&
-                Objects.equals(this.listOwnerName, listBaseFields.listOwnerName) &&
-                Objects.equals(this.listOwnerPersonDbId, listBaseFields.listOwnerPersonDbId) &&
-                Objects.equals(this.listSize, listBaseFields.listSize) &&
-                Objects.equals(this.listSource, listBaseFields.listSource) &&
-                Objects.equals(this.listType, listBaseFields.listType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, dateCreated, dateModified, externalReferences, listDescription, listName, listOwnerName, listOwnerPersonDbId, listSize, listSource, listType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ListBaseFields {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    dateCreated: ").append(toIndentedString(dateCreated)).append("\n");
-        sb.append("    dateModified: ").append(toIndentedString(dateModified)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    listDescription: ").append(toIndentedString(listDescription)).append("\n");
-        sb.append("    listName: ").append(toIndentedString(listName)).append("\n");
-        sb.append("    listOwnerName: ").append(toIndentedString(listOwnerName)).append("\n");
-        sb.append("    listOwnerPersonDbId: ").append(toIndentedString(listOwnerPersonDbId)).append("\n");
-        sb.append("    listSize: ").append(toIndentedString(listSize)).append("\n");
-        sb.append("    listSource: ").append(toIndentedString(listSource)).append("\n");
-        sb.append("    listType: ").append(toIndentedString(listType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListDetails.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListDetails.java
deleted file mode 100644
index a6bd2353..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListDetails.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * ListDetails
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ListDetails {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("data")
-    private List<String> data = null;
-
-    @SerializedName("dateCreated")
-    private OffsetDateTime dateCreated = null;
-
-    @SerializedName("dateModified")
-    private OffsetDateTime dateModified = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("listDbId")
-    private String listDbId = null;
-
-    @SerializedName("listDescription")
-    private String listDescription = null;
-
-    @SerializedName("listName")
-    private String listName = null;
-
-    @SerializedName("listOwnerName")
-    private String listOwnerName = null;
-
-    @SerializedName("listOwnerPersonDbId")
-    private String listOwnerPersonDbId = null;
-
-    @SerializedName("listSize")
-    private Integer listSize = null;
-
-    @SerializedName("listSource")
-    private String listSource = null;
-
-    /**
-     * A flag to indicate the type of objects that are referneced in a List
-     */
-    @JsonAdapter(ListTypeEnum.Adapter.class)
-    public enum ListTypeEnum {
-        GERMPLASM("germplasm"),
-        MARKERS("markers"),
-        VARIANTS("variants"),
-        PROGRAMS("programs"),
-        TRIALS("trials"),
-        STUDIES("studies"),
-        OBSERVATIONUNITS("observationUnits"),
-        OBSERVATIONS("observations"),
-        OBSERVATIONVARIABLES("observationVariables"),
-        SAMPLES("samples");
-
-        private String value;
-
-        ListTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static ListTypeEnum fromValue(String input) {
-            for (ListTypeEnum b : ListTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<ListTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final ListTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public ListTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return ListTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("listType")
-    private ListTypeEnum listType = null;
-
-    public ListDetails additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ListDetails putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(example = "{}", description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ListDetails data(List<String> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ListDetails addDataItem(String dataItem) {
-        if (this.data == null) {
-            this.data = new ArrayList<String>();
-        }
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The array of DbIds of the BrAPI objects contained in a List
-     *
-     * @return data
-     **/
-    @Schema(example = "[\"758a78c0\",\"2c78f9ee\"]", description = "The array of DbIds of the BrAPI objects contained in a List")
-    public List<String> getData() {
-        return data;
-    }
-
-    public void setData(List<String> data) {
-        this.data = data;
-    }
-
-    public ListDetails dateCreated(OffsetDateTime dateCreated) {
-        this.dateCreated = dateCreated;
-        return this;
-    }
-
-    /**
-     * Timestamp when the entity was first created
-     *
-     * @return dateCreated
-     **/
-    @Schema(description = "Timestamp when the entity was first created")
-    public OffsetDateTime getDateCreated() {
-        return dateCreated;
-    }
-
-    public void setDateCreated(OffsetDateTime dateCreated) {
-        this.dateCreated = dateCreated;
-    }
-
-    public ListDetails dateModified(OffsetDateTime dateModified) {
-        this.dateModified = dateModified;
-        return this;
-    }
-
-    /**
-     * Timestamp when the entity was last updated
-     *
-     * @return dateModified
-     **/
-    @Schema(description = "Timestamp when the entity was last updated")
-    public OffsetDateTime getDateModified() {
-        return dateModified;
-    }
-
-    public void setDateModified(OffsetDateTime dateModified) {
-        this.dateModified = dateModified;
-    }
-
-    public ListDetails externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ListDetails addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ListDetails listDbId(String listDbId) {
-        this.listDbId = listDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a List
-     *
-     * @return listDbId
-     **/
-    @Schema(example = "6f621cfa", description = "The unique identifier for a List")
-    public String getListDbId() {
-        return listDbId;
-    }
-
-    public void setListDbId(String listDbId) {
-        this.listDbId = listDbId;
-    }
-
-    public ListDetails listDescription(String listDescription) {
-        this.listDescription = listDescription;
-        return this;
-    }
-
-    /**
-     * Description of a List
-     *
-     * @return listDescription
-     **/
-    @Schema(example = "This is a list of germplasm I would like to investigate next season", description = "Description of a List")
-    public String getListDescription() {
-        return listDescription;
-    }
-
-    public void setListDescription(String listDescription) {
-        this.listDescription = listDescription;
-    }
-
-    public ListDetails listName(String listName) {
-        this.listName = listName;
-        return this;
-    }
-
-    /**
-     * Human readable name of a List
-     *
-     * @return listName
-     **/
-    @Schema(example = "MyGermplasm_Sept_2020", description = "Human readable name of a List")
-    public String getListName() {
-        return listName;
-    }
-
-    public void setListName(String listName) {
-        this.listName = listName;
-    }
-
-    public ListDetails listOwnerName(String listOwnerName) {
-        this.listOwnerName = listOwnerName;
-        return this;
-    }
-
-    /**
-     * Human readable name of a List Owner. (usually a user or person)
-     *
-     * @return listOwnerName
-     **/
-    @Schema(example = "Bob Robertson", description = "Human readable name of a List Owner. (usually a user or person)")
-    public String getListOwnerName() {
-        return listOwnerName;
-    }
-
-    public void setListOwnerName(String listOwnerName) {
-        this.listOwnerName = listOwnerName;
-    }
-
-    public ListDetails listOwnerPersonDbId(String listOwnerPersonDbId) {
-        this.listOwnerPersonDbId = listOwnerPersonDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a List Owner. (usually a user or person)
-     *
-     * @return listOwnerPersonDbId
-     **/
-    @Schema(example = "58db0628", description = "The unique identifier for a List Owner. (usually a user or person)")
-    public String getListOwnerPersonDbId() {
-        return listOwnerPersonDbId;
-    }
-
-    public void setListOwnerPersonDbId(String listOwnerPersonDbId) {
-        this.listOwnerPersonDbId = listOwnerPersonDbId;
-    }
-
-    public ListDetails listSize(Integer listSize) {
-        this.listSize = listSize;
-        return this;
-    }
-
-    /**
-     * The number of elements in a List
-     *
-     * @return listSize
-     **/
-    @Schema(example = "53", description = "The number of elements in a List")
-    public Integer getListSize() {
-        return listSize;
-    }
-
-    public void setListSize(Integer listSize) {
-        this.listSize = listSize;
-    }
-
-    public ListDetails listSource(String listSource) {
-        this.listSource = listSource;
-        return this;
-    }
-
-    /**
-     * The description of where a List originated from
-     *
-     * @return listSource
-     **/
-    @Schema(example = "GeneBank Repository 1.3", description = "The description of where a List originated from")
-    public String getListSource() {
-        return listSource;
-    }
-
-    public void setListSource(String listSource) {
-        this.listSource = listSource;
-    }
-
-    public ListDetails listType(ListTypeEnum listType) {
-        this.listType = listType;
-        return this;
-    }
-
-    /**
-     * A flag to indicate the type of objects that are referneced in a List
-     *
-     * @return listType
-     **/
-    @Schema(example = "germplasm", description = "A flag to indicate the type of objects that are referneced in a List")
-    public ListTypeEnum getListType() {
-        return listType;
-    }
-
-    public void setListType(ListTypeEnum listType) {
-        this.listType = listType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ListDetails listDetails = (ListDetails) o;
-        return Objects.equals(this.additionalInfo, listDetails.additionalInfo) &&
-                Objects.equals(this.data, listDetails.data) &&
-                Objects.equals(this.dateCreated, listDetails.dateCreated) &&
-                Objects.equals(this.dateModified, listDetails.dateModified) &&
-                Objects.equals(this.externalReferences, listDetails.externalReferences) &&
-                Objects.equals(this.listDbId, listDetails.listDbId) &&
-                Objects.equals(this.listDescription, listDetails.listDescription) &&
-                Objects.equals(this.listName, listDetails.listName) &&
-                Objects.equals(this.listOwnerName, listDetails.listOwnerName) &&
-                Objects.equals(this.listOwnerPersonDbId, listDetails.listOwnerPersonDbId) &&
-                Objects.equals(this.listSize, listDetails.listSize) &&
-                Objects.equals(this.listSource, listDetails.listSource) &&
-                Objects.equals(this.listType, listDetails.listType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, data, dateCreated, dateModified, externalReferences, listDbId, listDescription, listName, listOwnerName, listOwnerPersonDbId, listSize, listSource, listType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ListDetails {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("    dateCreated: ").append(toIndentedString(dateCreated)).append("\n");
-        sb.append("    dateModified: ").append(toIndentedString(dateModified)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    listDbId: ").append(toIndentedString(listDbId)).append("\n");
-        sb.append("    listDescription: ").append(toIndentedString(listDescription)).append("\n");
-        sb.append("    listName: ").append(toIndentedString(listName)).append("\n");
-        sb.append("    listOwnerName: ").append(toIndentedString(listOwnerName)).append("\n");
-        sb.append("    listOwnerPersonDbId: ").append(toIndentedString(listOwnerPersonDbId)).append("\n");
-        sb.append("    listSize: ").append(toIndentedString(listSize)).append("\n");
-        sb.append("    listSource: ").append(toIndentedString(listSource)).append("\n");
-        sb.append("    listType: ").append(toIndentedString(listType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListNewRequest.java
deleted file mode 100644
index 63b13616..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListNewRequest.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * ListNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ListNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("data")
-    private List<String> data = null;
-
-    @SerializedName("dateCreated")
-    private OffsetDateTime dateCreated = null;
-
-    @SerializedName("dateModified")
-    private OffsetDateTime dateModified = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("listDescription")
-    private String listDescription = null;
-
-    @SerializedName("listName")
-    private String listName = null;
-
-    @SerializedName("listOwnerName")
-    private String listOwnerName = null;
-
-    @SerializedName("listOwnerPersonDbId")
-    private String listOwnerPersonDbId = null;
-
-    @SerializedName("listSize")
-    private Integer listSize = null;
-
-    @SerializedName("listSource")
-    private String listSource = null;
-
-    /**
-     * A flag to indicate the type of objects that are referneced in a List
-     */
-    @JsonAdapter(ListTypeEnum.Adapter.class)
-    public enum ListTypeEnum {
-        GERMPLASM("germplasm"),
-        MARKERS("markers"),
-        VARIANTS("variants"),
-        PROGRAMS("programs"),
-        TRIALS("trials"),
-        STUDIES("studies"),
-        OBSERVATIONUNITS("observationUnits"),
-        OBSERVATIONS("observations"),
-        OBSERVATIONVARIABLES("observationVariables"),
-        SAMPLES("samples");
-
-        private String value;
-
-        ListTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static ListTypeEnum fromValue(String input) {
-            for (ListTypeEnum b : ListTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<ListTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final ListTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public ListTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return ListTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("listType")
-    private ListTypeEnum listType = null;
-
-    public ListNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ListNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(example = "{}", description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ListNewRequest data(List<String> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ListNewRequest addDataItem(String dataItem) {
-        if (this.data == null) {
-            this.data = new ArrayList<String>();
-        }
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The array of DbIds of the BrAPI objects contained in a List
-     *
-     * @return data
-     **/
-    @Schema(example = "[\"758a78c0\",\"2c78f9ee\"]", description = "The array of DbIds of the BrAPI objects contained in a List")
-    public List<String> getData() {
-        return data;
-    }
-
-    public void setData(List<String> data) {
-        this.data = data;
-    }
-
-    public ListNewRequest dateCreated(OffsetDateTime dateCreated) {
-        this.dateCreated = dateCreated;
-        return this;
-    }
-
-    /**
-     * Timestamp when the entity was first created
-     *
-     * @return dateCreated
-     **/
-    @Schema(description = "Timestamp when the entity was first created")
-    public OffsetDateTime getDateCreated() {
-        return dateCreated;
-    }
-
-    public void setDateCreated(OffsetDateTime dateCreated) {
-        this.dateCreated = dateCreated;
-    }
-
-    public ListNewRequest dateModified(OffsetDateTime dateModified) {
-        this.dateModified = dateModified;
-        return this;
-    }
-
-    /**
-     * Timestamp when the entity was last updated
-     *
-     * @return dateModified
-     **/
-    @Schema(description = "Timestamp when the entity was last updated")
-    public OffsetDateTime getDateModified() {
-        return dateModified;
-    }
-
-    public void setDateModified(OffsetDateTime dateModified) {
-        this.dateModified = dateModified;
-    }
-
-    public ListNewRequest externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ListNewRequest addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ListNewRequest listDescription(String listDescription) {
-        this.listDescription = listDescription;
-        return this;
-    }
-
-    /**
-     * Description of a List
-     *
-     * @return listDescription
-     **/
-    @Schema(example = "This is a list of germplasm I would like to investigate next season", description = "Description of a List")
-    public String getListDescription() {
-        return listDescription;
-    }
-
-    public void setListDescription(String listDescription) {
-        this.listDescription = listDescription;
-    }
-
-    public ListNewRequest listName(String listName) {
-        this.listName = listName;
-        return this;
-    }
-
-    /**
-     * Human readable name of a List
-     *
-     * @return listName
-     **/
-    @Schema(example = "MyGermplasm_Sept_2020", description = "Human readable name of a List")
-    public String getListName() {
-        return listName;
-    }
-
-    public void setListName(String listName) {
-        this.listName = listName;
-    }
-
-    public ListNewRequest listOwnerName(String listOwnerName) {
-        this.listOwnerName = listOwnerName;
-        return this;
-    }
-
-    /**
-     * Human readable name of a List Owner. (usually a user or person)
-     *
-     * @return listOwnerName
-     **/
-    @Schema(example = "Bob Robertson", description = "Human readable name of a List Owner. (usually a user or person)")
-    public String getListOwnerName() {
-        return listOwnerName;
-    }
-
-    public void setListOwnerName(String listOwnerName) {
-        this.listOwnerName = listOwnerName;
-    }
-
-    public ListNewRequest listOwnerPersonDbId(String listOwnerPersonDbId) {
-        this.listOwnerPersonDbId = listOwnerPersonDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a List Owner. (usually a user or person)
-     *
-     * @return listOwnerPersonDbId
-     **/
-    @Schema(example = "58db0628", description = "The unique identifier for a List Owner. (usually a user or person)")
-    public String getListOwnerPersonDbId() {
-        return listOwnerPersonDbId;
-    }
-
-    public void setListOwnerPersonDbId(String listOwnerPersonDbId) {
-        this.listOwnerPersonDbId = listOwnerPersonDbId;
-    }
-
-    public ListNewRequest listSize(Integer listSize) {
-        this.listSize = listSize;
-        return this;
-    }
-
-    /**
-     * The number of elements in a List
-     *
-     * @return listSize
-     **/
-    @Schema(example = "53", description = "The number of elements in a List")
-    public Integer getListSize() {
-        return listSize;
-    }
-
-    public void setListSize(Integer listSize) {
-        this.listSize = listSize;
-    }
-
-    public ListNewRequest listSource(String listSource) {
-        this.listSource = listSource;
-        return this;
-    }
-
-    /**
-     * The description of where a List originated from
-     *
-     * @return listSource
-     **/
-    @Schema(example = "GeneBank Repository 1.3", description = "The description of where a List originated from")
-    public String getListSource() {
-        return listSource;
-    }
-
-    public void setListSource(String listSource) {
-        this.listSource = listSource;
-    }
-
-    public ListNewRequest listType(ListTypeEnum listType) {
-        this.listType = listType;
-        return this;
-    }
-
-    /**
-     * A flag to indicate the type of objects that are referneced in a List
-     *
-     * @return listType
-     **/
-    @Schema(example = "germplasm", description = "A flag to indicate the type of objects that are referneced in a List")
-    public ListTypeEnum getListType() {
-        return listType;
-    }
-
-    public void setListType(ListTypeEnum listType) {
-        this.listType = listType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ListNewRequest listNewRequest = (ListNewRequest) o;
-        return Objects.equals(this.additionalInfo, listNewRequest.additionalInfo) &&
-                Objects.equals(this.data, listNewRequest.data) &&
-                Objects.equals(this.dateCreated, listNewRequest.dateCreated) &&
-                Objects.equals(this.dateModified, listNewRequest.dateModified) &&
-                Objects.equals(this.externalReferences, listNewRequest.externalReferences) &&
-                Objects.equals(this.listDescription, listNewRequest.listDescription) &&
-                Objects.equals(this.listName, listNewRequest.listName) &&
-                Objects.equals(this.listOwnerName, listNewRequest.listOwnerName) &&
-                Objects.equals(this.listOwnerPersonDbId, listNewRequest.listOwnerPersonDbId) &&
-                Objects.equals(this.listSize, listNewRequest.listSize) &&
-                Objects.equals(this.listSource, listNewRequest.listSource) &&
-                Objects.equals(this.listType, listNewRequest.listType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, data, dateCreated, dateModified, externalReferences, listDescription, listName, listOwnerName, listOwnerPersonDbId, listSize, listSource, listType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ListNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("    dateCreated: ").append(toIndentedString(dateCreated)).append("\n");
-        sb.append("    dateModified: ").append(toIndentedString(dateModified)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    listDescription: ").append(toIndentedString(listDescription)).append("\n");
-        sb.append("    listName: ").append(toIndentedString(listName)).append("\n");
-        sb.append("    listOwnerName: ").append(toIndentedString(listOwnerName)).append("\n");
-        sb.append("    listOwnerPersonDbId: ").append(toIndentedString(listOwnerPersonDbId)).append("\n");
-        sb.append("    listSize: ").append(toIndentedString(listSize)).append("\n");
-        sb.append("    listSource: ").append(toIndentedString(listSource)).append("\n");
-        sb.append("    listType: ").append(toIndentedString(listType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListResponse.java
deleted file mode 100644
index 3bdc97cc..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ListDetails result = null;
-
-    public ListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ListResponse result(ListDetails result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ListDetails getResult() {
-        return result;
-    }
-
-    public void setResult(ListDetails result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ListResponse listResponse = (ListResponse) o;
-        return Objects.equals(this._atContext, listResponse._atContext) &&
-                Objects.equals(this.metadata, listResponse.metadata) &&
-                Objects.equals(this.result, listResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListSearchRequest.java
deleted file mode 100644
index 901520d2..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListSearchRequest.java
+++ /dev/null
@@ -1,646 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ListSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ListSearchRequest {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("dateCreatedRangeEnd")
-    private OffsetDateTime dateCreatedRangeEnd = null;
-
-    @SerializedName("dateCreatedRangeStart")
-    private OffsetDateTime dateCreatedRangeStart = null;
-
-    @SerializedName("dateModifiedRangeEnd")
-    private OffsetDateTime dateModifiedRangeEnd = null;
-
-    @SerializedName("dateModifiedRangeStart")
-    private OffsetDateTime dateModifiedRangeStart = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("listDbIds")
-    private List<String> listDbIds = null;
-
-    @SerializedName("listNames")
-    private List<String> listNames = null;
-
-    @SerializedName("listOwnerNames")
-    private List<String> listOwnerNames = null;
-
-    @SerializedName("listOwnerPersonDbIds")
-    private List<String> listOwnerPersonDbIds = null;
-
-    @SerializedName("listSources")
-    private List<String> listSources = null;
-
-    /**
-     * A flag to indicate the type of objects that are referneced in a List
-     */
-    @JsonAdapter(ListTypeEnum.Adapter.class)
-    public enum ListTypeEnum {
-        GERMPLASM("germplasm"),
-        MARKERS("markers"),
-        VARIANTS("variants"),
-        PROGRAMS("programs"),
-        TRIALS("trials"),
-        STUDIES("studies"),
-        OBSERVATIONUNITS("observationUnits"),
-        OBSERVATIONS("observations"),
-        OBSERVATIONVARIABLES("observationVariables"),
-        SAMPLES("samples");
-
-        private String value;
-
-        ListTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static ListTypeEnum fromValue(String input) {
-            for (ListTypeEnum b : ListTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<ListTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final ListTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public ListTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return ListTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("listType")
-    private ListTypeEnum listType = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    public ListSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public ListSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public ListSearchRequest dateCreatedRangeEnd(OffsetDateTime dateCreatedRangeEnd) {
-        this.dateCreatedRangeEnd = dateCreatedRangeEnd;
-        return this;
-    }
-
-    /**
-     * Define the end for an interval of time and only include Lists that are created within this interval.
-     *
-     * @return dateCreatedRangeEnd
-     **/
-    @Schema(description = "Define the end for an interval of time and only include Lists that are created within this interval.")
-    public OffsetDateTime getDateCreatedRangeEnd() {
-        return dateCreatedRangeEnd;
-    }
-
-    public void setDateCreatedRangeEnd(OffsetDateTime dateCreatedRangeEnd) {
-        this.dateCreatedRangeEnd = dateCreatedRangeEnd;
-    }
-
-    public ListSearchRequest dateCreatedRangeStart(OffsetDateTime dateCreatedRangeStart) {
-        this.dateCreatedRangeStart = dateCreatedRangeStart;
-        return this;
-    }
-
-    /**
-     * Define the begining for an interval of time and only include Lists that are created within this interval.
-     *
-     * @return dateCreatedRangeStart
-     **/
-    @Schema(description = "Define the begining for an interval of time and only include Lists that are created within this interval.")
-    public OffsetDateTime getDateCreatedRangeStart() {
-        return dateCreatedRangeStart;
-    }
-
-    public void setDateCreatedRangeStart(OffsetDateTime dateCreatedRangeStart) {
-        this.dateCreatedRangeStart = dateCreatedRangeStart;
-    }
-
-    public ListSearchRequest dateModifiedRangeEnd(OffsetDateTime dateModifiedRangeEnd) {
-        this.dateModifiedRangeEnd = dateModifiedRangeEnd;
-        return this;
-    }
-
-    /**
-     * Define the end for an interval of time and only include Lists that are modified within this interval.
-     *
-     * @return dateModifiedRangeEnd
-     **/
-    @Schema(description = "Define the end for an interval of time and only include Lists that are modified within this interval.")
-    public OffsetDateTime getDateModifiedRangeEnd() {
-        return dateModifiedRangeEnd;
-    }
-
-    public void setDateModifiedRangeEnd(OffsetDateTime dateModifiedRangeEnd) {
-        this.dateModifiedRangeEnd = dateModifiedRangeEnd;
-    }
-
-    public ListSearchRequest dateModifiedRangeStart(OffsetDateTime dateModifiedRangeStart) {
-        this.dateModifiedRangeStart = dateModifiedRangeStart;
-        return this;
-    }
-
-    /**
-     * Define the begining for an interval of time and only include Lists that are modified within this interval.
-     *
-     * @return dateModifiedRangeStart
-     **/
-    @Schema(description = "Define the begining for an interval of time and only include Lists that are modified within this interval.")
-    public OffsetDateTime getDateModifiedRangeStart() {
-        return dateModifiedRangeStart;
-    }
-
-    public void setDateModifiedRangeStart(OffsetDateTime dateModifiedRangeStart) {
-        this.dateModifiedRangeStart = dateModifiedRangeStart;
-    }
-
-    public ListSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public ListSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public ListSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public ListSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public ListSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public ListSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public ListSearchRequest listDbIds(List<String> listDbIds) {
-        this.listDbIds = listDbIds;
-        return this;
-    }
-
-    public ListSearchRequest addListDbIdsItem(String listDbIdsItem) {
-        if (this.listDbIds == null) {
-            this.listDbIds = new ArrayList<String>();
-        }
-        this.listDbIds.add(listDbIdsItem);
-        return this;
-    }
-
-    /**
-     * An array of primary database identifiers to identify a set of Lists
-     *
-     * @return listDbIds
-     **/
-    @Schema(example = "[\"55f20cf6\",\"3193ca3d\"]", description = "An array of primary database identifiers to identify a set of Lists")
-    public List<String> getListDbIds() {
-        return listDbIds;
-    }
-
-    public void setListDbIds(List<String> listDbIds) {
-        this.listDbIds = listDbIds;
-    }
-
-    public ListSearchRequest listNames(List<String> listNames) {
-        this.listNames = listNames;
-        return this;
-    }
-
-    public ListSearchRequest addListNamesItem(String listNamesItem) {
-        if (this.listNames == null) {
-            this.listNames = new ArrayList<String>();
-        }
-        this.listNames.add(listNamesItem);
-        return this;
-    }
-
-    /**
-     * An array of human readable names to identify a set of Lists
-     *
-     * @return listNames
-     **/
-    @Schema(example = "[\"Planing List 1\",\"Bobs List\"]", description = "An array of human readable names to identify a set of Lists")
-    public List<String> getListNames() {
-        return listNames;
-    }
-
-    public void setListNames(List<String> listNames) {
-        this.listNames = listNames;
-    }
-
-    public ListSearchRequest listOwnerNames(List<String> listOwnerNames) {
-        this.listOwnerNames = listOwnerNames;
-        return this;
-    }
-
-    public ListSearchRequest addListOwnerNamesItem(String listOwnerNamesItem) {
-        if (this.listOwnerNames == null) {
-            this.listOwnerNames = new ArrayList<String>();
-        }
-        this.listOwnerNames.add(listOwnerNamesItem);
-        return this;
-    }
-
-    /**
-     * An array of names for the people or entities who are responsible for a set of Lists
-     *
-     * @return listOwnerNames
-     **/
-    @Schema(example = "[\"Bob Robertson\",\"Rob Robertson\"]", description = "An array of names for the people or entities who are responsible for a set of Lists")
-    public List<String> getListOwnerNames() {
-        return listOwnerNames;
-    }
-
-    public void setListOwnerNames(List<String> listOwnerNames) {
-        this.listOwnerNames = listOwnerNames;
-    }
-
-    public ListSearchRequest listOwnerPersonDbIds(List<String> listOwnerPersonDbIds) {
-        this.listOwnerPersonDbIds = listOwnerPersonDbIds;
-        return this;
-    }
-
-    public ListSearchRequest addListOwnerPersonDbIdsItem(String listOwnerPersonDbIdsItem) {
-        if (this.listOwnerPersonDbIds == null) {
-            this.listOwnerPersonDbIds = new ArrayList<String>();
-        }
-        this.listOwnerPersonDbIds.add(listOwnerPersonDbIdsItem);
-        return this;
-    }
-
-    /**
-     * An array of primary database identifiers to identify people or entities who are responsible for a set of Lists
-     *
-     * @return listOwnerPersonDbIds
-     **/
-    @Schema(example = "[\"bob@bob.com\",\"rob@bob.com\"]", description = "An array of primary database identifiers to identify people or entities who are responsible for a set of Lists")
-    public List<String> getListOwnerPersonDbIds() {
-        return listOwnerPersonDbIds;
-    }
-
-    public void setListOwnerPersonDbIds(List<String> listOwnerPersonDbIds) {
-        this.listOwnerPersonDbIds = listOwnerPersonDbIds;
-    }
-
-    public ListSearchRequest listSources(List<String> listSources) {
-        this.listSources = listSources;
-        return this;
-    }
-
-    public ListSearchRequest addListSourcesItem(String listSourcesItem) {
-        if (this.listSources == null) {
-            this.listSources = new ArrayList<String>();
-        }
-        this.listSources.add(listSourcesItem);
-        return this;
-    }
-
-    /**
-     * An array of terms identifying lists from different sources (ie &#x27;USER&#x27;, &#x27;SYSTEM&#x27;, etc)
-     *
-     * @return listSources
-     **/
-    @Schema(example = "[\"USER\",\"SYSTEM\",\"EXTERNAL\"]", description = "An array of terms identifying lists from different sources (ie 'USER', 'SYSTEM', etc)")
-    public List<String> getListSources() {
-        return listSources;
-    }
-
-    public void setListSources(List<String> listSources) {
-        this.listSources = listSources;
-    }
-
-    public ListSearchRequest listType(ListTypeEnum listType) {
-        this.listType = listType;
-        return this;
-    }
-
-    /**
-     * A flag to indicate the type of objects that are referneced in a List
-     *
-     * @return listType
-     **/
-    @Schema(example = "germplasm", description = "A flag to indicate the type of objects that are referneced in a List")
-    public ListTypeEnum getListType() {
-        return listType;
-    }
-
-    public void setListType(ListTypeEnum listType) {
-        this.listType = listType;
-    }
-
-    public ListSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public ListSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public ListSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public ListSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public ListSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public ListSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ListSearchRequest listSearchRequest = (ListSearchRequest) o;
-        return Objects.equals(this.commonCropNames, listSearchRequest.commonCropNames) &&
-                Objects.equals(this.dateCreatedRangeEnd, listSearchRequest.dateCreatedRangeEnd) &&
-                Objects.equals(this.dateCreatedRangeStart, listSearchRequest.dateCreatedRangeStart) &&
-                Objects.equals(this.dateModifiedRangeEnd, listSearchRequest.dateModifiedRangeEnd) &&
-                Objects.equals(this.dateModifiedRangeStart, listSearchRequest.dateModifiedRangeStart) &&
-                Objects.equals(this.externalReferenceIDs, listSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, listSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, listSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.listDbIds, listSearchRequest.listDbIds) &&
-                Objects.equals(this.listNames, listSearchRequest.listNames) &&
-                Objects.equals(this.listOwnerNames, listSearchRequest.listOwnerNames) &&
-                Objects.equals(this.listOwnerPersonDbIds, listSearchRequest.listOwnerPersonDbIds) &&
-                Objects.equals(this.listSources, listSearchRequest.listSources) &&
-                Objects.equals(this.listType, listSearchRequest.listType) &&
-                Objects.equals(this.page, listSearchRequest.page) &&
-                Objects.equals(this.pageSize, listSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, listSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, listSearchRequest.programNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, dateCreatedRangeEnd, dateCreatedRangeStart, dateModifiedRangeEnd, dateModifiedRangeStart, externalReferenceIDs, externalReferenceIds, externalReferenceSources, listDbIds, listNames, listOwnerNames, listOwnerPersonDbIds, listSources, listType, page, pageSize, programDbIds, programNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ListSearchRequest {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    dateCreatedRangeEnd: ").append(toIndentedString(dateCreatedRangeEnd)).append("\n");
-        sb.append("    dateCreatedRangeStart: ").append(toIndentedString(dateCreatedRangeStart)).append("\n");
-        sb.append("    dateModifiedRangeEnd: ").append(toIndentedString(dateModifiedRangeEnd)).append("\n");
-        sb.append("    dateModifiedRangeStart: ").append(toIndentedString(dateModifiedRangeStart)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    listDbIds: ").append(toIndentedString(listDbIds)).append("\n");
-        sb.append("    listNames: ").append(toIndentedString(listNames)).append("\n");
-        sb.append("    listOwnerNames: ").append(toIndentedString(listOwnerNames)).append("\n");
-        sb.append("    listOwnerPersonDbIds: ").append(toIndentedString(listOwnerPersonDbIds)).append("\n");
-        sb.append("    listSources: ").append(toIndentedString(listSources)).append("\n");
-        sb.append("    listType: ").append(toIndentedString(listType)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListSummary.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListSummary.java
deleted file mode 100644
index b6add9f7..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListSummary.java
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * ListSummary
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ListSummary {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("dateCreated")
-    private OffsetDateTime dateCreated = null;
-
-    @SerializedName("dateModified")
-    private OffsetDateTime dateModified = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("listDbId")
-    private String listDbId = null;
-
-    @SerializedName("listDescription")
-    private String listDescription = null;
-
-    @SerializedName("listName")
-    private String listName = null;
-
-    @SerializedName("listOwnerName")
-    private String listOwnerName = null;
-
-    @SerializedName("listOwnerPersonDbId")
-    private String listOwnerPersonDbId = null;
-
-    @SerializedName("listSize")
-    private Integer listSize = null;
-
-    @SerializedName("listSource")
-    private String listSource = null;
-
-    /**
-     * A flag to indicate the type of objects that are referneced in a List
-     */
-    @JsonAdapter(ListTypeEnum.Adapter.class)
-    public enum ListTypeEnum {
-        GERMPLASM("germplasm"),
-        MARKERS("markers"),
-        VARIANTS("variants"),
-        PROGRAMS("programs"),
-        TRIALS("trials"),
-        STUDIES("studies"),
-        OBSERVATIONUNITS("observationUnits"),
-        OBSERVATIONS("observations"),
-        OBSERVATIONVARIABLES("observationVariables"),
-        SAMPLES("samples");
-
-        private String value;
-
-        ListTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static ListTypeEnum fromValue(String input) {
-            for (ListTypeEnum b : ListTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<ListTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final ListTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public ListTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return ListTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("listType")
-    private ListTypeEnum listType = null;
-
-    public ListSummary additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ListSummary putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(example = "{}", description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ListSummary dateCreated(OffsetDateTime dateCreated) {
-        this.dateCreated = dateCreated;
-        return this;
-    }
-
-    /**
-     * Timestamp when the entity was first created
-     *
-     * @return dateCreated
-     **/
-    @Schema(description = "Timestamp when the entity was first created")
-    public OffsetDateTime getDateCreated() {
-        return dateCreated;
-    }
-
-    public void setDateCreated(OffsetDateTime dateCreated) {
-        this.dateCreated = dateCreated;
-    }
-
-    public ListSummary dateModified(OffsetDateTime dateModified) {
-        this.dateModified = dateModified;
-        return this;
-    }
-
-    /**
-     * Timestamp when the entity was last updated
-     *
-     * @return dateModified
-     **/
-    @Schema(description = "Timestamp when the entity was last updated")
-    public OffsetDateTime getDateModified() {
-        return dateModified;
-    }
-
-    public void setDateModified(OffsetDateTime dateModified) {
-        this.dateModified = dateModified;
-    }
-
-    public ListSummary externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ListSummary addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ListSummary listDbId(String listDbId) {
-        this.listDbId = listDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a List
-     *
-     * @return listDbId
-     **/
-    @Schema(example = "6f621cfa", description = "The unique identifier for a List")
-    public String getListDbId() {
-        return listDbId;
-    }
-
-    public void setListDbId(String listDbId) {
-        this.listDbId = listDbId;
-    }
-
-    public ListSummary listDescription(String listDescription) {
-        this.listDescription = listDescription;
-        return this;
-    }
-
-    /**
-     * Description of a List
-     *
-     * @return listDescription
-     **/
-    @Schema(example = "This is a list of germplasm I would like to investigate next season", description = "Description of a List")
-    public String getListDescription() {
-        return listDescription;
-    }
-
-    public void setListDescription(String listDescription) {
-        this.listDescription = listDescription;
-    }
-
-    public ListSummary listName(String listName) {
-        this.listName = listName;
-        return this;
-    }
-
-    /**
-     * Human readable name of a List
-     *
-     * @return listName
-     **/
-    @Schema(example = "MyGermplasm_Sept_2020", description = "Human readable name of a List")
-    public String getListName() {
-        return listName;
-    }
-
-    public void setListName(String listName) {
-        this.listName = listName;
-    }
-
-    public ListSummary listOwnerName(String listOwnerName) {
-        this.listOwnerName = listOwnerName;
-        return this;
-    }
-
-    /**
-     * Human readable name of a List Owner. (usually a user or person)
-     *
-     * @return listOwnerName
-     **/
-    @Schema(example = "Bob Robertson", description = "Human readable name of a List Owner. (usually a user or person)")
-    public String getListOwnerName() {
-        return listOwnerName;
-    }
-
-    public void setListOwnerName(String listOwnerName) {
-        this.listOwnerName = listOwnerName;
-    }
-
-    public ListSummary listOwnerPersonDbId(String listOwnerPersonDbId) {
-        this.listOwnerPersonDbId = listOwnerPersonDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a List Owner. (usually a user or person)
-     *
-     * @return listOwnerPersonDbId
-     **/
-    @Schema(example = "58db0628", description = "The unique identifier for a List Owner. (usually a user or person)")
-    public String getListOwnerPersonDbId() {
-        return listOwnerPersonDbId;
-    }
-
-    public void setListOwnerPersonDbId(String listOwnerPersonDbId) {
-        this.listOwnerPersonDbId = listOwnerPersonDbId;
-    }
-
-    public ListSummary listSize(Integer listSize) {
-        this.listSize = listSize;
-        return this;
-    }
-
-    /**
-     * The number of elements in a List
-     *
-     * @return listSize
-     **/
-    @Schema(example = "53", description = "The number of elements in a List")
-    public Integer getListSize() {
-        return listSize;
-    }
-
-    public void setListSize(Integer listSize) {
-        this.listSize = listSize;
-    }
-
-    public ListSummary listSource(String listSource) {
-        this.listSource = listSource;
-        return this;
-    }
-
-    /**
-     * The description of where a List originated from
-     *
-     * @return listSource
-     **/
-    @Schema(example = "GeneBank Repository 1.3", description = "The description of where a List originated from")
-    public String getListSource() {
-        return listSource;
-    }
-
-    public void setListSource(String listSource) {
-        this.listSource = listSource;
-    }
-
-    public ListSummary listType(ListTypeEnum listType) {
-        this.listType = listType;
-        return this;
-    }
-
-    /**
-     * A flag to indicate the type of objects that are referneced in a List
-     *
-     * @return listType
-     **/
-    @Schema(example = "germplasm", description = "A flag to indicate the type of objects that are referneced in a List")
-    public ListTypeEnum getListType() {
-        return listType;
-    }
-
-    public void setListType(ListTypeEnum listType) {
-        this.listType = listType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ListSummary listSummary = (ListSummary) o;
-        return Objects.equals(this.additionalInfo, listSummary.additionalInfo) &&
-                Objects.equals(this.dateCreated, listSummary.dateCreated) &&
-                Objects.equals(this.dateModified, listSummary.dateModified) &&
-                Objects.equals(this.externalReferences, listSummary.externalReferences) &&
-                Objects.equals(this.listDbId, listSummary.listDbId) &&
-                Objects.equals(this.listDescription, listSummary.listDescription) &&
-                Objects.equals(this.listName, listSummary.listName) &&
-                Objects.equals(this.listOwnerName, listSummary.listOwnerName) &&
-                Objects.equals(this.listOwnerPersonDbId, listSummary.listOwnerPersonDbId) &&
-                Objects.equals(this.listSize, listSummary.listSize) &&
-                Objects.equals(this.listSource, listSummary.listSource) &&
-                Objects.equals(this.listType, listSummary.listType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, dateCreated, dateModified, externalReferences, listDbId, listDescription, listName, listOwnerName, listOwnerPersonDbId, listSize, listSource, listType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ListSummary {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    dateCreated: ").append(toIndentedString(dateCreated)).append("\n");
-        sb.append("    dateModified: ").append(toIndentedString(dateModified)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    listDbId: ").append(toIndentedString(listDbId)).append("\n");
-        sb.append("    listDescription: ").append(toIndentedString(listDescription)).append("\n");
-        sb.append("    listName: ").append(toIndentedString(listName)).append("\n");
-        sb.append("    listOwnerName: ").append(toIndentedString(listOwnerName)).append("\n");
-        sb.append("    listOwnerPersonDbId: ").append(toIndentedString(listOwnerPersonDbId)).append("\n");
-        sb.append("    listSize: ").append(toIndentedString(listSize)).append("\n");
-        sb.append("    listSource: ").append(toIndentedString(listSource)).append("\n");
-        sb.append("    listType: ").append(toIndentedString(listType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListTypes.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListTypes.java
deleted file mode 100644
index bd4956e6..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListTypes.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-/**
- * A flag to indicate the type of objects that are referneced in a List
- */
-@JsonAdapter(ListTypes.Adapter.class)
-public enum ListTypes {
-    GERMPLASM("germplasm"),
-    MARKERS("markers"),
-    VARIANTS("variants"),
-    PROGRAMS("programs"),
-    TRIALS("trials"),
-    STUDIES("studies"),
-    OBSERVATIONUNITS("observationUnits"),
-    OBSERVATIONS("observations"),
-    OBSERVATIONVARIABLES("observationVariables"),
-    SAMPLES("samples");
-
-    private final String value;
-
-    ListTypes(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    public static ListTypes fromValue(String input) {
-        for (ListTypes b : ListTypes.values()) {
-            if (b.value.equals(input)) {
-                return b;
-            }
-        }
-        return null;
-    }
-
-    public static class Adapter extends TypeAdapter<ListTypes> {
-        @Override
-        public void write(final JsonWriter jsonWriter, final ListTypes enumeration) throws IOException {
-            jsonWriter.value(String.valueOf(enumeration.getValue()));
-        }
-
-        @Override
-        public ListTypes read(final JsonReader jsonReader) throws IOException {
-            Object value = jsonReader.nextString();
-            return ListTypes.fromValue((String) (value));
-        }
-    }
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListsListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListsListResponse.java
deleted file mode 100644
index ab46b132..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListsListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ListsListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ListsListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ListsListResponseResult result = null;
-
-    public ListsListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ListsListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ListsListResponse result(ListsListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ListsListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ListsListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ListsListResponse listsListResponse = (ListsListResponse) o;
-        return Objects.equals(this._atContext, listsListResponse._atContext) &&
-                Objects.equals(this.metadata, listsListResponse.metadata) &&
-                Objects.equals(this.result, listsListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ListsListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListsListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListsListResponseResult.java
deleted file mode 100644
index b3084150..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListsListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ListsListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ListsListResponseResult {
-    @SerializedName("data")
-    private List<ListSummary> data = new ArrayList<ListSummary>();
-
-    public ListsListResponseResult data(List<ListSummary> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ListsListResponseResult addDataItem(ListSummary dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<ListSummary> getData() {
-        return data;
-    }
-
-    public void setData(List<ListSummary> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ListsListResponseResult listsListResponseResult = (ListsListResponseResult) o;
-        return Objects.equals(this.data, listsListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ListsListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListsSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListsSingleResponse.java
deleted file mode 100644
index 85cd5a7a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ListsSingleResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ListsSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ListsSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ListDetails result = null;
-
-    public ListsSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ListsSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ListsSingleResponse result(ListDetails result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ListDetails getResult() {
-        return result;
-    }
-
-    public void setResult(ListDetails result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ListsSingleResponse listsSingleResponse = (ListsSingleResponse) o;
-        return Objects.equals(this._atContext, listsSingleResponse._atContext) &&
-                Objects.equals(this.metadata, listsSingleResponse.metadata) &&
-                Objects.equals(this.result, listsSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ListsSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Location.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Location.java
deleted file mode 100644
index db15c1b7..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Location.java
+++ /dev/null
@@ -1,584 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * Location
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class Location {
-    @SerializedName("abbreviation")
-    private String abbreviation = null;
-
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("coordinateDescription")
-    private String coordinateDescription = null;
-
-    @SerializedName("coordinateUncertainty")
-    private String coordinateUncertainty = null;
-
-    @SerializedName("coordinates")
-    private GeoJSON coordinates = null;
-
-    @SerializedName("countryCode")
-    private String countryCode = null;
-
-    @SerializedName("countryName")
-    private String countryName = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("environmentType")
-    private String environmentType = null;
-
-    @SerializedName("exposure")
-    private String exposure = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("instituteAddress")
-    private String instituteAddress = null;
-
-    @SerializedName("instituteName")
-    private String instituteName = null;
-
-    @SerializedName("locationDbId")
-    private String locationDbId = null;
-
-    @SerializedName("locationName")
-    private String locationName = null;
-
-    @SerializedName("locationType")
-    private String locationType = null;
-
-    @SerializedName("parentLocationDbId")
-    private String parentLocationDbId = null;
-
-    @SerializedName("parentLocationName")
-    private String parentLocationName = null;
-
-    @SerializedName("siteStatus")
-    private String siteStatus = null;
-
-    @SerializedName("slope")
-    private String slope = null;
-
-    @SerializedName("topography")
-    private String topography = null;
-
-    public Location abbreviation(String abbreviation) {
-        this.abbreviation = abbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Location
-     *
-     * @return abbreviation
-     **/
-    @Schema(example = "L1", description = "A shortened version of the human readable name for a Location")
-    public String getAbbreviation() {
-        return abbreviation;
-    }
-
-    public void setAbbreviation(String abbreviation) {
-        this.abbreviation = abbreviation;
-    }
-
-    public Location additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Location putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(example = "{}", description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Location coordinateDescription(String coordinateDescription) {
-        this.coordinateDescription = coordinateDescription;
-        return this;
-    }
-
-    /**
-     * Describes the precision and landmarks of the coordinate values used for a Location. (ex. the site, the nearest town, a 10 kilometers radius circle, +/- 20 meters, etc)
-     *
-     * @return coordinateDescription
-     **/
-    @Schema(example = "North East corner of greenhouse", description = "Describes the precision and landmarks of the coordinate values used for a Location. (ex. the site, the nearest town, a 10 kilometers radius circle, +/- 20 meters, etc)")
-    public String getCoordinateDescription() {
-        return coordinateDescription;
-    }
-
-    public void setCoordinateDescription(String coordinateDescription) {
-        this.coordinateDescription = coordinateDescription;
-    }
-
-    public Location coordinateUncertainty(String coordinateUncertainty) {
-        this.coordinateUncertainty = coordinateUncertainty;
-        return this;
-    }
-
-    /**
-     * Uncertainty associated with the coordinates in meters. Leave the value empty if the uncertainty is unknown.
-     *
-     * @return coordinateUncertainty
-     **/
-    @Schema(example = "20", description = "Uncertainty associated with the coordinates in meters. Leave the value empty if the uncertainty is unknown.")
-    public String getCoordinateUncertainty() {
-        return coordinateUncertainty;
-    }
-
-    public void setCoordinateUncertainty(String coordinateUncertainty) {
-        this.coordinateUncertainty = coordinateUncertainty;
-    }
-
-    public Location coordinates(GeoJSON coordinates) {
-        this.coordinates = coordinates;
-        return this;
-    }
-
-    /**
-     * Get coordinates
-     *
-     * @return coordinates
-     **/
-    @Schema(description = "")
-    public GeoJSON getCoordinates() {
-        return coordinates;
-    }
-
-    public void setCoordinates(GeoJSON coordinates) {
-        this.coordinates = coordinates;
-    }
-
-    public Location countryCode(String countryCode) {
-        this.countryCode = countryCode;
-        return this;
-    }
-
-    /**
-     * [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec &lt;br/&gt; MIAPPE V1.1 (DM-17) Geographic location (country) - The country where the experiment took place, either as a full name or preferably as a 2-letter code.&#x27;
-     *
-     * @return countryCode
-     **/
-    @Schema(example = "PER", description = "[ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec <br/> MIAPPE V1.1 (DM-17) Geographic location (country) - The country where the experiment took place, either as a full name or preferably as a 2-letter code.'")
-    public String getCountryCode() {
-        return countryCode;
-    }
-
-    public void setCountryCode(String countryCode) {
-        this.countryCode = countryCode;
-    }
-
-    public Location countryName(String countryName) {
-        this.countryName = countryName;
-        return this;
-    }
-
-    /**
-     * The full name of the country where a Location is located &lt;br/&gt; MIAPPE V1.1 (DM-17) Geographic location (country) - The country where the experiment took place, either as a full name or preferably as a 2-letter code.
-     *
-     * @return countryName
-     **/
-    @Schema(example = "Peru", description = "The full name of the country where a Location is located <br/> MIAPPE V1.1 (DM-17) Geographic location (country) - The country where the experiment took place, either as a full name or preferably as a 2-letter code.")
-    public String getCountryName() {
-        return countryName;
-    }
-
-    public void setCountryName(String countryName) {
-        this.countryName = countryName;
-    }
-
-    public Location documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://brapi.org", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public Location environmentType(String environmentType) {
-        this.environmentType = environmentType;
-        return this;
-    }
-
-    /**
-     * Describes the general type of environment of a Location. (ex. forest, field, nursery, etc)
-     *
-     * @return environmentType
-     **/
-    @Schema(example = "Nursery", description = "Describes the general type of environment of a Location. (ex. forest, field, nursery, etc)")
-    public String getEnvironmentType() {
-        return environmentType;
-    }
-
-    public void setEnvironmentType(String environmentType) {
-        this.environmentType = environmentType;
-    }
-
-    public Location exposure(String exposure) {
-        this.exposure = exposure;
-        return this;
-    }
-
-    /**
-     * Describes the level of protection/exposure for things like sun light and wind at a particular Location
-     *
-     * @return exposure
-     **/
-    @Schema(example = "Structure, no exposure", description = "Describes the level of protection/exposure for things like sun light and wind at a particular Location")
-    public String getExposure() {
-        return exposure;
-    }
-
-    public void setExposure(String exposure) {
-        this.exposure = exposure;
-    }
-
-    public Location externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Location addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Location instituteAddress(String instituteAddress) {
-        this.instituteAddress = instituteAddress;
-        return this;
-    }
-
-    /**
-     * The street address of the institute at a particular Location &lt;br/&gt; MIAPPE V1.1 (DM-16) Contact institution - Name and address of the institution responsible for the study.
-     *
-     * @return instituteAddress
-     **/
-    @Schema(example = "71 Pilgrim Avenue Chevy Chase MD 20815", description = "The street address of the institute at a particular Location <br/> MIAPPE V1.1 (DM-16) Contact institution - Name and address of the institution responsible for the study.")
-    public String getInstituteAddress() {
-        return instituteAddress;
-    }
-
-    public void setInstituteAddress(String instituteAddress) {
-        this.instituteAddress = instituteAddress;
-    }
-
-    public Location instituteName(String instituteName) {
-        this.instituteName = instituteName;
-        return this;
-    }
-
-    /**
-     * The full name of the institute at a particular Location &lt;br/&gt; MIAPPE V1.1 (DM-16) Contact institution - Name and address of the institution responsible for the study.
-     *
-     * @return instituteName
-     **/
-    @Schema(example = "Plant Science Institute", description = "The full name of the institute at a particular Location <br/> MIAPPE V1.1 (DM-16) Contact institution - Name and address of the institution responsible for the study.")
-    public String getInstituteName() {
-        return instituteName;
-    }
-
-    public void setInstituteName(String instituteName) {
-        this.instituteName = instituteName;
-    }
-
-    public Location locationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Location
-     *
-     * @return locationDbId
-     **/
-    @Schema(example = "3cfdd67d", description = "The unique identifier for a Location")
-    public String getLocationDbId() {
-        return locationDbId;
-    }
-
-    public void setLocationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-    }
-
-    public Location locationName(String locationName) {
-        this.locationName = locationName;
-        return this;
-    }
-
-    /**
-     * A human readable name for a Location &lt;br/&gt; MIAPPE V1.1 (DM-18) Experimental site name - The name of the natural site, experimental field, greenhouse, phenotyping facility, etc. where the experiment took place.
-     *
-     * @return locationName
-     **/
-    @Schema(example = "Location 1", description = "A human readable name for a Location <br/> MIAPPE V1.1 (DM-18) Experimental site name - The name of the natural site, experimental field, greenhouse, phenotyping facility, etc. where the experiment took place.")
-    public String getLocationName() {
-        return locationName;
-    }
-
-    public void setLocationName(String locationName) {
-        this.locationName = locationName;
-    }
-
-    public Location locationType(String locationType) {
-        this.locationType = locationType;
-        return this;
-    }
-
-    /**
-     * A short description of a type of Location (ex. Field Station, Breeding Location, Storage Location, etc)
-     *
-     * @return locationType
-     **/
-    @Schema(example = "Field Station", description = "A short description of a type of Location (ex. Field Station, Breeding Location, Storage Location, etc)")
-    public String getLocationType() {
-        return locationType;
-    }
-
-    public void setLocationType(String locationType) {
-        this.locationType = locationType;
-    }
-
-    public Location parentLocationDbId(String parentLocationDbId) {
-        this.parentLocationDbId = parentLocationDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Location &lt;br/&gt; The Parent Location defines the encompassing Location that a smaller Location belongs to.  For example, an Institution might have multiple Field Stations inside it and each Field Station might have multiple Fields.
-     *
-     * @return parentLocationDbId
-     **/
-    @Schema(example = "0a93f7d8", description = "The unique identifier for a Location <br/> The Parent Location defines the encompassing Location that a smaller Location belongs to.  For example, an Institution might have multiple Field Stations inside it and each Field Station might have multiple Fields.")
-    public String getParentLocationDbId() {
-        return parentLocationDbId;
-    }
-
-    public void setParentLocationDbId(String parentLocationDbId) {
-        this.parentLocationDbId = parentLocationDbId;
-    }
-
-    public Location parentLocationName(String parentLocationName) {
-        this.parentLocationName = parentLocationName;
-        return this;
-    }
-
-    /**
-     * A human readable name for a location &lt;br/&gt; The Parent Location defines the encompassing Location that a smaller Location belongs to.   For example, an Institution might have multiple Field Stations inside it and each Field Station might have multiple Fields.
-     *
-     * @return parentLocationName
-     **/
-    @Schema(example = "Field Station Alpha", description = "A human readable name for a location <br/> The Parent Location defines the encompassing Location that a smaller Location belongs to.   For example, an Institution might have multiple Field Stations inside it and each Field Station might have multiple Fields.")
-    public String getParentLocationName() {
-        return parentLocationName;
-    }
-
-    public void setParentLocationName(String parentLocationName) {
-        this.parentLocationName = parentLocationName;
-    }
-
-    public Location siteStatus(String siteStatus) {
-        this.siteStatus = siteStatus;
-        return this;
-    }
-
-    /**
-     * Description of the accessibility of the location (ex. Public, Private)
-     *
-     * @return siteStatus
-     **/
-    @Schema(example = "Private", description = "Description of the accessibility of the location (ex. Public, Private)")
-    public String getSiteStatus() {
-        return siteStatus;
-    }
-
-    public void setSiteStatus(String siteStatus) {
-        this.siteStatus = siteStatus;
-    }
-
-    public Location slope(String slope) {
-        this.slope = slope;
-        return this;
-    }
-
-    /**
-     * Describes the approximate slope (height/distance) of a Location.
-     *
-     * @return slope
-     **/
-    @Schema(example = "0", description = "Describes the approximate slope (height/distance) of a Location.")
-    public String getSlope() {
-        return slope;
-    }
-
-    public void setSlope(String slope) {
-        this.slope = slope;
-    }
-
-    public Location topography(String topography) {
-        this.topography = topography;
-        return this;
-    }
-
-    /**
-     * Describes the topography of the land at a Location. (ex. Plateau, Cirque, Hill, Valley, etc)
-     *
-     * @return topography
-     **/
-    @Schema(example = "Valley", description = "Describes the topography of the land at a Location. (ex. Plateau, Cirque, Hill, Valley, etc)")
-    public String getTopography() {
-        return topography;
-    }
-
-    public void setTopography(String topography) {
-        this.topography = topography;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Location location = (Location) o;
-        return Objects.equals(this.abbreviation, location.abbreviation) &&
-                Objects.equals(this.additionalInfo, location.additionalInfo) &&
-                Objects.equals(this.coordinateDescription, location.coordinateDescription) &&
-                Objects.equals(this.coordinateUncertainty, location.coordinateUncertainty) &&
-                Objects.equals(this.coordinates, location.coordinates) &&
-                Objects.equals(this.countryCode, location.countryCode) &&
-                Objects.equals(this.countryName, location.countryName) &&
-                Objects.equals(this.documentationURL, location.documentationURL) &&
-                Objects.equals(this.environmentType, location.environmentType) &&
-                Objects.equals(this.exposure, location.exposure) &&
-                Objects.equals(this.externalReferences, location.externalReferences) &&
-                Objects.equals(this.instituteAddress, location.instituteAddress) &&
-                Objects.equals(this.instituteName, location.instituteName) &&
-                Objects.equals(this.locationDbId, location.locationDbId) &&
-                Objects.equals(this.locationName, location.locationName) &&
-                Objects.equals(this.locationType, location.locationType) &&
-                Objects.equals(this.parentLocationDbId, location.parentLocationDbId) &&
-                Objects.equals(this.parentLocationName, location.parentLocationName) &&
-                Objects.equals(this.siteStatus, location.siteStatus) &&
-                Objects.equals(this.slope, location.slope) &&
-                Objects.equals(this.topography, location.topography);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(abbreviation, additionalInfo, coordinateDescription, coordinateUncertainty, coordinates, countryCode, countryName, documentationURL, environmentType, exposure, externalReferences, instituteAddress, instituteName, locationDbId, locationName, locationType, parentLocationDbId, parentLocationName, siteStatus, slope, topography);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Location {\n");
-
-        sb.append("    abbreviation: ").append(toIndentedString(abbreviation)).append("\n");
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    coordinateDescription: ").append(toIndentedString(coordinateDescription)).append("\n");
-        sb.append("    coordinateUncertainty: ").append(toIndentedString(coordinateUncertainty)).append("\n");
-        sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
-        sb.append("    countryCode: ").append(toIndentedString(countryCode)).append("\n");
-        sb.append("    countryName: ").append(toIndentedString(countryName)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    environmentType: ").append(toIndentedString(environmentType)).append("\n");
-        sb.append("    exposure: ").append(toIndentedString(exposure)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    instituteAddress: ").append(toIndentedString(instituteAddress)).append("\n");
-        sb.append("    instituteName: ").append(toIndentedString(instituteName)).append("\n");
-        sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
-        sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
-        sb.append("    locationType: ").append(toIndentedString(locationType)).append("\n");
-        sb.append("    parentLocationDbId: ").append(toIndentedString(parentLocationDbId)).append("\n");
-        sb.append("    parentLocationName: ").append(toIndentedString(parentLocationName)).append("\n");
-        sb.append("    siteStatus: ").append(toIndentedString(siteStatus)).append("\n");
-        sb.append("    slope: ").append(toIndentedString(slope)).append("\n");
-        sb.append("    topography: ").append(toIndentedString(topography)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationListResponse.java
deleted file mode 100644
index 3ec3a171..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * LocationListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class LocationListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private LocationListResponseResult result = null;
-
-    public LocationListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public LocationListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public LocationListResponse result(LocationListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public LocationListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(LocationListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        LocationListResponse locationListResponse = (LocationListResponse) o;
-        return Objects.equals(this._atContext, locationListResponse._atContext) &&
-                Objects.equals(this.metadata, locationListResponse.metadata) &&
-                Objects.equals(this.result, locationListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class LocationListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationListResponseResult.java
deleted file mode 100644
index f0f2b278..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * LocationListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class LocationListResponseResult {
-    @SerializedName("data")
-    private List<Location> data = new ArrayList<Location>();
-
-    public LocationListResponseResult data(List<Location> data) {
-        this.data = data;
-        return this;
-    }
-
-    public LocationListResponseResult addDataItem(Location dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Location> getData() {
-        return data;
-    }
-
-    public void setData(List<Location> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        LocationListResponseResult locationListResponseResult = (LocationListResponseResult) o;
-        return Objects.equals(this.data, locationListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class LocationListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationNewRequest.java
deleted file mode 100644
index 91c56858..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationNewRequest.java
+++ /dev/null
@@ -1,560 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * LocationNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class LocationNewRequest {
-    @SerializedName("abbreviation")
-    private String abbreviation = null;
-
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("coordinateDescription")
-    private String coordinateDescription = null;
-
-    @SerializedName("coordinateUncertainty")
-    private String coordinateUncertainty = null;
-
-    @SerializedName("coordinates")
-    private GeoJSON coordinates = null;
-
-    @SerializedName("countryCode")
-    private String countryCode = null;
-
-    @SerializedName("countryName")
-    private String countryName = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("environmentType")
-    private String environmentType = null;
-
-    @SerializedName("exposure")
-    private String exposure = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("instituteAddress")
-    private String instituteAddress = null;
-
-    @SerializedName("instituteName")
-    private String instituteName = null;
-
-    @SerializedName("locationName")
-    private String locationName = null;
-
-    @SerializedName("locationType")
-    private String locationType = null;
-
-    @SerializedName("parentLocationDbId")
-    private String parentLocationDbId = null;
-
-    @SerializedName("parentLocationName")
-    private String parentLocationName = null;
-
-    @SerializedName("siteStatus")
-    private String siteStatus = null;
-
-    @SerializedName("slope")
-    private String slope = null;
-
-    @SerializedName("topography")
-    private String topography = null;
-
-    public LocationNewRequest abbreviation(String abbreviation) {
-        this.abbreviation = abbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Location
-     *
-     * @return abbreviation
-     **/
-    @Schema(example = "L1", description = "A shortened version of the human readable name for a Location")
-    public String getAbbreviation() {
-        return abbreviation;
-    }
-
-    public void setAbbreviation(String abbreviation) {
-        this.abbreviation = abbreviation;
-    }
-
-    public LocationNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public LocationNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(example = "{}", description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public LocationNewRequest coordinateDescription(String coordinateDescription) {
-        this.coordinateDescription = coordinateDescription;
-        return this;
-    }
-
-    /**
-     * Describes the precision and landmarks of the coordinate values used for a Location. (ex. the site, the nearest town, a 10 kilometers radius circle, +/- 20 meters, etc)
-     *
-     * @return coordinateDescription
-     **/
-    @Schema(example = "North East corner of greenhouse", description = "Describes the precision and landmarks of the coordinate values used for a Location. (ex. the site, the nearest town, a 10 kilometers radius circle, +/- 20 meters, etc)")
-    public String getCoordinateDescription() {
-        return coordinateDescription;
-    }
-
-    public void setCoordinateDescription(String coordinateDescription) {
-        this.coordinateDescription = coordinateDescription;
-    }
-
-    public LocationNewRequest coordinateUncertainty(String coordinateUncertainty) {
-        this.coordinateUncertainty = coordinateUncertainty;
-        return this;
-    }
-
-    /**
-     * Uncertainty associated with the coordinates in meters. Leave the value empty if the uncertainty is unknown.
-     *
-     * @return coordinateUncertainty
-     **/
-    @Schema(example = "20", description = "Uncertainty associated with the coordinates in meters. Leave the value empty if the uncertainty is unknown.")
-    public String getCoordinateUncertainty() {
-        return coordinateUncertainty;
-    }
-
-    public void setCoordinateUncertainty(String coordinateUncertainty) {
-        this.coordinateUncertainty = coordinateUncertainty;
-    }
-
-    public LocationNewRequest coordinates(GeoJSON coordinates) {
-        this.coordinates = coordinates;
-        return this;
-    }
-
-    /**
-     * Get coordinates
-     *
-     * @return coordinates
-     **/
-    @Schema(description = "")
-    public GeoJSON getCoordinates() {
-        return coordinates;
-    }
-
-    public void setCoordinates(GeoJSON coordinates) {
-        this.coordinates = coordinates;
-    }
-
-    public LocationNewRequest countryCode(String countryCode) {
-        this.countryCode = countryCode;
-        return this;
-    }
-
-    /**
-     * [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec &lt;br/&gt; MIAPPE V1.1 (DM-17) Geographic location (country) - The country where the experiment took place, either as a full name or preferably as a 2-letter code.&#x27;
-     *
-     * @return countryCode
-     **/
-    @Schema(example = "PER", description = "[ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec <br/> MIAPPE V1.1 (DM-17) Geographic location (country) - The country where the experiment took place, either as a full name or preferably as a 2-letter code.'")
-    public String getCountryCode() {
-        return countryCode;
-    }
-
-    public void setCountryCode(String countryCode) {
-        this.countryCode = countryCode;
-    }
-
-    public LocationNewRequest countryName(String countryName) {
-        this.countryName = countryName;
-        return this;
-    }
-
-    /**
-     * The full name of the country where a Location is located &lt;br/&gt; MIAPPE V1.1 (DM-17) Geographic location (country) - The country where the experiment took place, either as a full name or preferably as a 2-letter code.
-     *
-     * @return countryName
-     **/
-    @Schema(example = "Peru", description = "The full name of the country where a Location is located <br/> MIAPPE V1.1 (DM-17) Geographic location (country) - The country where the experiment took place, either as a full name or preferably as a 2-letter code.")
-    public String getCountryName() {
-        return countryName;
-    }
-
-    public void setCountryName(String countryName) {
-        this.countryName = countryName;
-    }
-
-    public LocationNewRequest documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://brapi.org", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public LocationNewRequest environmentType(String environmentType) {
-        this.environmentType = environmentType;
-        return this;
-    }
-
-    /**
-     * Describes the general type of environment of a Location. (ex. forest, field, nursery, etc)
-     *
-     * @return environmentType
-     **/
-    @Schema(example = "Nursery", description = "Describes the general type of environment of a Location. (ex. forest, field, nursery, etc)")
-    public String getEnvironmentType() {
-        return environmentType;
-    }
-
-    public void setEnvironmentType(String environmentType) {
-        this.environmentType = environmentType;
-    }
-
-    public LocationNewRequest exposure(String exposure) {
-        this.exposure = exposure;
-        return this;
-    }
-
-    /**
-     * Describes the level of protection/exposure for things like sun light and wind at a particular Location
-     *
-     * @return exposure
-     **/
-    @Schema(example = "Structure, no exposure", description = "Describes the level of protection/exposure for things like sun light and wind at a particular Location")
-    public String getExposure() {
-        return exposure;
-    }
-
-    public void setExposure(String exposure) {
-        this.exposure = exposure;
-    }
-
-    public LocationNewRequest externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public LocationNewRequest addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public LocationNewRequest instituteAddress(String instituteAddress) {
-        this.instituteAddress = instituteAddress;
-        return this;
-    }
-
-    /**
-     * The street address of the institute at a particular Location &lt;br/&gt; MIAPPE V1.1 (DM-16) Contact institution - Name and address of the institution responsible for the study.
-     *
-     * @return instituteAddress
-     **/
-    @Schema(example = "71 Pilgrim Avenue Chevy Chase MD 20815", description = "The street address of the institute at a particular Location <br/> MIAPPE V1.1 (DM-16) Contact institution - Name and address of the institution responsible for the study.")
-    public String getInstituteAddress() {
-        return instituteAddress;
-    }
-
-    public void setInstituteAddress(String instituteAddress) {
-        this.instituteAddress = instituteAddress;
-    }
-
-    public LocationNewRequest instituteName(String instituteName) {
-        this.instituteName = instituteName;
-        return this;
-    }
-
-    /**
-     * The full name of the institute at a particular Location &lt;br/&gt; MIAPPE V1.1 (DM-16) Contact institution - Name and address of the institution responsible for the study.
-     *
-     * @return instituteName
-     **/
-    @Schema(example = "Plant Science Institute", description = "The full name of the institute at a particular Location <br/> MIAPPE V1.1 (DM-16) Contact institution - Name and address of the institution responsible for the study.")
-    public String getInstituteName() {
-        return instituteName;
-    }
-
-    public void setInstituteName(String instituteName) {
-        this.instituteName = instituteName;
-    }
-
-    public LocationNewRequest locationName(String locationName) {
-        this.locationName = locationName;
-        return this;
-    }
-
-    /**
-     * A human readable name for a Location &lt;br/&gt; MIAPPE V1.1 (DM-18) Experimental site name - The name of the natural site, experimental field, greenhouse, phenotyping facility, etc. where the experiment took place.
-     *
-     * @return locationName
-     **/
-    @Schema(example = "Location 1", description = "A human readable name for a Location <br/> MIAPPE V1.1 (DM-18) Experimental site name - The name of the natural site, experimental field, greenhouse, phenotyping facility, etc. where the experiment took place.")
-    public String getLocationName() {
-        return locationName;
-    }
-
-    public void setLocationName(String locationName) {
-        this.locationName = locationName;
-    }
-
-    public LocationNewRequest locationType(String locationType) {
-        this.locationType = locationType;
-        return this;
-    }
-
-    /**
-     * A short description of a type of Location (ex. Field Station, Breeding Location, Storage Location, etc)
-     *
-     * @return locationType
-     **/
-    @Schema(example = "Field Station", description = "A short description of a type of Location (ex. Field Station, Breeding Location, Storage Location, etc)")
-    public String getLocationType() {
-        return locationType;
-    }
-
-    public void setLocationType(String locationType) {
-        this.locationType = locationType;
-    }
-
-    public LocationNewRequest parentLocationDbId(String parentLocationDbId) {
-        this.parentLocationDbId = parentLocationDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Location &lt;br/&gt; The Parent Location defines the encompassing Location that a smaller Location belongs to.  For example, an Institution might have multiple Field Stations inside it and each Field Station might have multiple Fields.
-     *
-     * @return parentLocationDbId
-     **/
-    @Schema(example = "0a93f7d8", description = "The unique identifier for a Location <br/> The Parent Location defines the encompassing Location that a smaller Location belongs to.  For example, an Institution might have multiple Field Stations inside it and each Field Station might have multiple Fields.")
-    public String getParentLocationDbId() {
-        return parentLocationDbId;
-    }
-
-    public void setParentLocationDbId(String parentLocationDbId) {
-        this.parentLocationDbId = parentLocationDbId;
-    }
-
-    public LocationNewRequest parentLocationName(String parentLocationName) {
-        this.parentLocationName = parentLocationName;
-        return this;
-    }
-
-    /**
-     * A human readable name for a location &lt;br/&gt; The Parent Location defines the encompassing Location that a smaller Location belongs to.   For example, an Institution might have multiple Field Stations inside it and each Field Station might have multiple Fields.
-     *
-     * @return parentLocationName
-     **/
-    @Schema(example = "Field Station Alpha", description = "A human readable name for a location <br/> The Parent Location defines the encompassing Location that a smaller Location belongs to.   For example, an Institution might have multiple Field Stations inside it and each Field Station might have multiple Fields.")
-    public String getParentLocationName() {
-        return parentLocationName;
-    }
-
-    public void setParentLocationName(String parentLocationName) {
-        this.parentLocationName = parentLocationName;
-    }
-
-    public LocationNewRequest siteStatus(String siteStatus) {
-        this.siteStatus = siteStatus;
-        return this;
-    }
-
-    /**
-     * Description of the accessibility of the location (ex. Public, Private)
-     *
-     * @return siteStatus
-     **/
-    @Schema(example = "Private", description = "Description of the accessibility of the location (ex. Public, Private)")
-    public String getSiteStatus() {
-        return siteStatus;
-    }
-
-    public void setSiteStatus(String siteStatus) {
-        this.siteStatus = siteStatus;
-    }
-
-    public LocationNewRequest slope(String slope) {
-        this.slope = slope;
-        return this;
-    }
-
-    /**
-     * Describes the approximate slope (height/distance) of a Location.
-     *
-     * @return slope
-     **/
-    @Schema(example = "0", description = "Describes the approximate slope (height/distance) of a Location.")
-    public String getSlope() {
-        return slope;
-    }
-
-    public void setSlope(String slope) {
-        this.slope = slope;
-    }
-
-    public LocationNewRequest topography(String topography) {
-        this.topography = topography;
-        return this;
-    }
-
-    /**
-     * Describes the topography of the land at a Location. (ex. Plateau, Cirque, Hill, Valley, etc)
-     *
-     * @return topography
-     **/
-    @Schema(example = "Valley", description = "Describes the topography of the land at a Location. (ex. Plateau, Cirque, Hill, Valley, etc)")
-    public String getTopography() {
-        return topography;
-    }
-
-    public void setTopography(String topography) {
-        this.topography = topography;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        LocationNewRequest locationNewRequest = (LocationNewRequest) o;
-        return Objects.equals(this.abbreviation, locationNewRequest.abbreviation) &&
-                Objects.equals(this.additionalInfo, locationNewRequest.additionalInfo) &&
-                Objects.equals(this.coordinateDescription, locationNewRequest.coordinateDescription) &&
-                Objects.equals(this.coordinateUncertainty, locationNewRequest.coordinateUncertainty) &&
-                Objects.equals(this.coordinates, locationNewRequest.coordinates) &&
-                Objects.equals(this.countryCode, locationNewRequest.countryCode) &&
-                Objects.equals(this.countryName, locationNewRequest.countryName) &&
-                Objects.equals(this.documentationURL, locationNewRequest.documentationURL) &&
-                Objects.equals(this.environmentType, locationNewRequest.environmentType) &&
-                Objects.equals(this.exposure, locationNewRequest.exposure) &&
-                Objects.equals(this.externalReferences, locationNewRequest.externalReferences) &&
-                Objects.equals(this.instituteAddress, locationNewRequest.instituteAddress) &&
-                Objects.equals(this.instituteName, locationNewRequest.instituteName) &&
-                Objects.equals(this.locationName, locationNewRequest.locationName) &&
-                Objects.equals(this.locationType, locationNewRequest.locationType) &&
-                Objects.equals(this.parentLocationDbId, locationNewRequest.parentLocationDbId) &&
-                Objects.equals(this.parentLocationName, locationNewRequest.parentLocationName) &&
-                Objects.equals(this.siteStatus, locationNewRequest.siteStatus) &&
-                Objects.equals(this.slope, locationNewRequest.slope) &&
-                Objects.equals(this.topography, locationNewRequest.topography);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(abbreviation, additionalInfo, coordinateDescription, coordinateUncertainty, coordinates, countryCode, countryName, documentationURL, environmentType, exposure, externalReferences, instituteAddress, instituteName, locationName, locationType, parentLocationDbId, parentLocationName, siteStatus, slope, topography);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class LocationNewRequest {\n");
-
-        sb.append("    abbreviation: ").append(toIndentedString(abbreviation)).append("\n");
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    coordinateDescription: ").append(toIndentedString(coordinateDescription)).append("\n");
-        sb.append("    coordinateUncertainty: ").append(toIndentedString(coordinateUncertainty)).append("\n");
-        sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
-        sb.append("    countryCode: ").append(toIndentedString(countryCode)).append("\n");
-        sb.append("    countryName: ").append(toIndentedString(countryName)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    environmentType: ").append(toIndentedString(environmentType)).append("\n");
-        sb.append("    exposure: ").append(toIndentedString(exposure)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    instituteAddress: ").append(toIndentedString(instituteAddress)).append("\n");
-        sb.append("    instituteName: ").append(toIndentedString(instituteName)).append("\n");
-        sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
-        sb.append("    locationType: ").append(toIndentedString(locationType)).append("\n");
-        sb.append("    parentLocationDbId: ").append(toIndentedString(parentLocationDbId)).append("\n");
-        sb.append("    parentLocationName: ").append(toIndentedString(parentLocationName)).append("\n");
-        sb.append("    siteStatus: ").append(toIndentedString(siteStatus)).append("\n");
-        sb.append("    slope: ").append(toIndentedString(slope)).append("\n");
-        sb.append("    topography: ").append(toIndentedString(topography)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationSearchRequest.java
deleted file mode 100644
index 1acaebbe..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationSearchRequest.java
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * LocationSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class LocationSearchRequest {
-    @SerializedName("abbreviations")
-    private List<String> abbreviations = null;
-
-    @SerializedName("altitudeMax")
-    private BigDecimal altitudeMax = null;
-
-    @SerializedName("altitudeMin")
-    private BigDecimal altitudeMin = null;
-
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("coordinates")
-    private GeoJSONSearchArea coordinates = null;
-
-    @SerializedName("countryCodes")
-    private List<String> countryCodes = null;
-
-    @SerializedName("countryNames")
-    private List<String> countryNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("instituteAddresses")
-    private List<String> instituteAddresses = null;
-
-    @SerializedName("instituteNames")
-    private List<String> instituteNames = null;
-
-    @SerializedName("locationDbIds")
-    private List<String> locationDbIds = null;
-
-    @SerializedName("locationNames")
-    private List<String> locationNames = null;
-
-    @SerializedName("locationTypes")
-    private List<String> locationTypes = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("parentLocationDbIds")
-    private List<String> parentLocationDbIds = null;
-
-    @SerializedName("parentLocationNames")
-    private List<String> parentLocationNames = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    public LocationSearchRequest abbreviations(List<String> abbreviations) {
-        this.abbreviations = abbreviations;
-        return this;
-    }
-
-    public LocationSearchRequest addAbbreviationsItem(String abbreviationsItem) {
-        if (this.abbreviations == null) {
-            this.abbreviations = new ArrayList<String>();
-        }
-        this.abbreviations.add(abbreviationsItem);
-        return this;
-    }
-
-    /**
-     * A list of shortened human readable names for a set of Locations
-     *
-     * @return abbreviations
-     **/
-    @Schema(example = "[\"L1\",\"LHC\"]", description = "A list of shortened human readable names for a set of Locations")
-    public List<String> getAbbreviations() {
-        return abbreviations;
-    }
-
-    public void setAbbreviations(List<String> abbreviations) {
-        this.abbreviations = abbreviations;
-    }
-
-    public LocationSearchRequest altitudeMax(BigDecimal altitudeMax) {
-        this.altitudeMax = altitudeMax;
-        return this;
-    }
-
-    /**
-     * The maximum altitude to search for
-     *
-     * @return altitudeMax
-     **/
-    @Schema(example = "200", description = "The maximum altitude to search for")
-    public BigDecimal getAltitudeMax() {
-        return altitudeMax;
-    }
-
-    public void setAltitudeMax(BigDecimal altitudeMax) {
-        this.altitudeMax = altitudeMax;
-    }
-
-    public LocationSearchRequest altitudeMin(BigDecimal altitudeMin) {
-        this.altitudeMin = altitudeMin;
-        return this;
-    }
-
-    /**
-     * The minimum altitude to search for
-     *
-     * @return altitudeMin
-     **/
-    @Schema(example = "20", description = "The minimum altitude to search for")
-    public BigDecimal getAltitudeMin() {
-        return altitudeMin;
-    }
-
-    public void setAltitudeMin(BigDecimal altitudeMin) {
-        this.altitudeMin = altitudeMin;
-    }
-
-    public LocationSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public LocationSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public LocationSearchRequest coordinates(GeoJSONSearchArea coordinates) {
-        this.coordinates = coordinates;
-        return this;
-    }
-
-    /**
-     * Get coordinates
-     *
-     * @return coordinates
-     **/
-    @Schema(description = "")
-    public GeoJSONSearchArea getCoordinates() {
-        return coordinates;
-    }
-
-    public void setCoordinates(GeoJSONSearchArea coordinates) {
-        this.coordinates = coordinates;
-    }
-
-    public LocationSearchRequest countryCodes(List<String> countryCodes) {
-        this.countryCodes = countryCodes;
-        return this;
-    }
-
-    public LocationSearchRequest addCountryCodesItem(String countryCodesItem) {
-        if (this.countryCodes == null) {
-            this.countryCodes = new ArrayList<String>();
-        }
-        this.countryCodes.add(countryCodesItem);
-        return this;
-    }
-
-    /**
-     * [ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec
-     *
-     * @return countryCodes
-     **/
-    @Schema(example = "[\"USA\",\"PER\"]", description = "[ISO_3166-1_alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) spec")
-    public List<String> getCountryCodes() {
-        return countryCodes;
-    }
-
-    public void setCountryCodes(List<String> countryCodes) {
-        this.countryCodes = countryCodes;
-    }
-
-    public LocationSearchRequest countryNames(List<String> countryNames) {
-        this.countryNames = countryNames;
-        return this;
-    }
-
-    public LocationSearchRequest addCountryNamesItem(String countryNamesItem) {
-        if (this.countryNames == null) {
-            this.countryNames = new ArrayList<String>();
-        }
-        this.countryNames.add(countryNamesItem);
-        return this;
-    }
-
-    /**
-     * The full name of the country to search for
-     *
-     * @return countryNames
-     **/
-    @Schema(example = "[\"United States of America\",\"Peru\"]", description = "The full name of the country to search for")
-    public List<String> getCountryNames() {
-        return countryNames;
-    }
-
-    public void setCountryNames(List<String> countryNames) {
-        this.countryNames = countryNames;
-    }
-
-    public LocationSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public LocationSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public LocationSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public LocationSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public LocationSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public LocationSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public LocationSearchRequest instituteAddresses(List<String> instituteAddresses) {
-        this.instituteAddresses = instituteAddresses;
-        return this;
-    }
-
-    public LocationSearchRequest addInstituteAddressesItem(String instituteAddressesItem) {
-        if (this.instituteAddresses == null) {
-            this.instituteAddresses = new ArrayList<String>();
-        }
-        this.instituteAddresses.add(instituteAddressesItem);
-        return this;
-    }
-
-    /**
-     * The street address of the institute to search for
-     *
-     * @return instituteAddresses
-     **/
-    @Schema(example = "[\"123 Main Street\",\"456 Side Street\"]", description = "The street address of the institute to search for")
-    public List<String> getInstituteAddresses() {
-        return instituteAddresses;
-    }
-
-    public void setInstituteAddresses(List<String> instituteAddresses) {
-        this.instituteAddresses = instituteAddresses;
-    }
-
-    public LocationSearchRequest instituteNames(List<String> instituteNames) {
-        this.instituteNames = instituteNames;
-        return this;
-    }
-
-    public LocationSearchRequest addInstituteNamesItem(String instituteNamesItem) {
-        if (this.instituteNames == null) {
-            this.instituteNames = new ArrayList<String>();
-        }
-        this.instituteNames.add(instituteNamesItem);
-        return this;
-    }
-
-    /**
-     * The name of the institute to search for
-     *
-     * @return instituteNames
-     **/
-    @Schema(example = "[\"The Institute\",\"The Other Institute\"]", description = "The name of the institute to search for")
-    public List<String> getInstituteNames() {
-        return instituteNames;
-    }
-
-    public void setInstituteNames(List<String> instituteNames) {
-        this.instituteNames = instituteNames;
-    }
-
-    public LocationSearchRequest locationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-        return this;
-    }
-
-    public LocationSearchRequest addLocationDbIdsItem(String locationDbIdsItem) {
-        if (this.locationDbIds == null) {
-            this.locationDbIds = new ArrayList<String>();
-        }
-        this.locationDbIds.add(locationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The location ids to search for
-     *
-     * @return locationDbIds
-     **/
-    @Schema(example = "[\"b28911cf\",\"5071d1e4\"]", description = "The location ids to search for")
-    public List<String> getLocationDbIds() {
-        return locationDbIds;
-    }
-
-    public void setLocationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-    }
-
-    public LocationSearchRequest locationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-        return this;
-    }
-
-    public LocationSearchRequest addLocationNamesItem(String locationNamesItem) {
-        if (this.locationNames == null) {
-            this.locationNames = new ArrayList<String>();
-        }
-        this.locationNames.add(locationNamesItem);
-        return this;
-    }
-
-    /**
-     * A human readable names to search for
-     *
-     * @return locationNames
-     **/
-    @Schema(example = "[\"Location Alpha\",\"The Large Hadron Collider\"]", description = "A human readable names to search for")
-    public List<String> getLocationNames() {
-        return locationNames;
-    }
-
-    public void setLocationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-    }
-
-    public LocationSearchRequest locationTypes(List<String> locationTypes) {
-        this.locationTypes = locationTypes;
-        return this;
-    }
-
-    public LocationSearchRequest addLocationTypesItem(String locationTypesItem) {
-        if (this.locationTypes == null) {
-            this.locationTypes = new ArrayList<String>();
-        }
-        this.locationTypes.add(locationTypesItem);
-        return this;
-    }
-
-    /**
-     * The type of location this represents (ex. Breeding Location, Storage Location, etc)
-     *
-     * @return locationTypes
-     **/
-    @Schema(example = "[\"Nursery\",\"Storage Location\"]", description = "The type of location this represents (ex. Breeding Location, Storage Location, etc)")
-    public List<String> getLocationTypes() {
-        return locationTypes;
-    }
-
-    public void setLocationTypes(List<String> locationTypes) {
-        this.locationTypes = locationTypes;
-    }
-
-    public LocationSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public LocationSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public LocationSearchRequest parentLocationDbIds(List<String> parentLocationDbIds) {
-        this.parentLocationDbIds = parentLocationDbIds;
-        return this;
-    }
-
-    public LocationSearchRequest addParentLocationDbIdsItem(String parentLocationDbIdsItem) {
-        if (this.parentLocationDbIds == null) {
-            this.parentLocationDbIds = new ArrayList<String>();
-        }
-        this.parentLocationDbIds.add(parentLocationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Location &lt;br/&gt; The Parent Location defines the encompassing location that this location belongs to.  For example, an Institution might have multiple Field Stations inside it and each Field Station might have multiple Fields.
-     *
-     * @return parentLocationDbIds
-     **/
-    @Schema(example = "[\"b28911cf\",\"5071d1e4\"]", description = "The unique identifier for a Location <br/> The Parent Location defines the encompassing location that this location belongs to.  For example, an Institution might have multiple Field Stations inside it and each Field Station might have multiple Fields.")
-    public List<String> getParentLocationDbIds() {
-        return parentLocationDbIds;
-    }
-
-    public void setParentLocationDbIds(List<String> parentLocationDbIds) {
-        this.parentLocationDbIds = parentLocationDbIds;
-    }
-
-    public LocationSearchRequest parentLocationNames(List<String> parentLocationNames) {
-        this.parentLocationNames = parentLocationNames;
-        return this;
-    }
-
-    public LocationSearchRequest addParentLocationNamesItem(String parentLocationNamesItem) {
-        if (this.parentLocationNames == null) {
-            this.parentLocationNames = new ArrayList<String>();
-        }
-        this.parentLocationNames.add(parentLocationNamesItem);
-        return this;
-    }
-
-    /**
-     * A human readable name for a location &lt;br/&gt; The Parent Location defines the encompassing location that this location belongs to.  For example, an Institution might have multiple Field Stations inside it and each Field Station might have multiple Fields.
-     *
-     * @return parentLocationNames
-     **/
-    @Schema(example = "[\"Location Alpha\",\"The Large Hadron Collider\"]", description = "A human readable name for a location <br/> The Parent Location defines the encompassing location that this location belongs to.  For example, an Institution might have multiple Field Stations inside it and each Field Station might have multiple Fields.")
-    public List<String> getParentLocationNames() {
-        return parentLocationNames;
-    }
-
-    public void setParentLocationNames(List<String> parentLocationNames) {
-        this.parentLocationNames = parentLocationNames;
-    }
-
-    public LocationSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public LocationSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public LocationSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public LocationSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        LocationSearchRequest locationSearchRequest = (LocationSearchRequest) o;
-        return Objects.equals(this.abbreviations, locationSearchRequest.abbreviations) &&
-                Objects.equals(this.altitudeMax, locationSearchRequest.altitudeMax) &&
-                Objects.equals(this.altitudeMin, locationSearchRequest.altitudeMin) &&
-                Objects.equals(this.commonCropNames, locationSearchRequest.commonCropNames) &&
-                Objects.equals(this.coordinates, locationSearchRequest.coordinates) &&
-                Objects.equals(this.countryCodes, locationSearchRequest.countryCodes) &&
-                Objects.equals(this.countryNames, locationSearchRequest.countryNames) &&
-                Objects.equals(this.externalReferenceIDs, locationSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, locationSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, locationSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.instituteAddresses, locationSearchRequest.instituteAddresses) &&
-                Objects.equals(this.instituteNames, locationSearchRequest.instituteNames) &&
-                Objects.equals(this.locationDbIds, locationSearchRequest.locationDbIds) &&
-                Objects.equals(this.locationNames, locationSearchRequest.locationNames) &&
-                Objects.equals(this.locationTypes, locationSearchRequest.locationTypes) &&
-                Objects.equals(this.page, locationSearchRequest.page) &&
-                Objects.equals(this.pageSize, locationSearchRequest.pageSize) &&
-                Objects.equals(this.parentLocationDbIds, locationSearchRequest.parentLocationDbIds) &&
-                Objects.equals(this.parentLocationNames, locationSearchRequest.parentLocationNames) &&
-                Objects.equals(this.programDbIds, locationSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, locationSearchRequest.programNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(abbreviations, altitudeMax, altitudeMin, commonCropNames, coordinates, countryCodes, countryNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, instituteAddresses, instituteNames, locationDbIds, locationNames, locationTypes, page, pageSize, parentLocationDbIds, parentLocationNames, programDbIds, programNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class LocationSearchRequest {\n");
-
-        sb.append("    abbreviations: ").append(toIndentedString(abbreviations)).append("\n");
-        sb.append("    altitudeMax: ").append(toIndentedString(altitudeMax)).append("\n");
-        sb.append("    altitudeMin: ").append(toIndentedString(altitudeMin)).append("\n");
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
-        sb.append("    countryCodes: ").append(toIndentedString(countryCodes)).append("\n");
-        sb.append("    countryNames: ").append(toIndentedString(countryNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    instituteAddresses: ").append(toIndentedString(instituteAddresses)).append("\n");
-        sb.append("    instituteNames: ").append(toIndentedString(instituteNames)).append("\n");
-        sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-        sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-        sb.append("    locationTypes: ").append(toIndentedString(locationTypes)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    parentLocationDbIds: ").append(toIndentedString(parentLocationDbIds)).append("\n");
-        sb.append("    parentLocationNames: ").append(toIndentedString(parentLocationNames)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationSingleResponse.java
deleted file mode 100644
index 6a9b6a92..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/LocationSingleResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * LocationSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class LocationSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Location result = null;
-
-    public LocationSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public LocationSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public LocationSingleResponse result(Location result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Location getResult() {
-        return result;
-    }
-
-    public void setResult(Location result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        LocationSingleResponse locationSingleResponse = (LocationSingleResponse) o;
-        return Objects.equals(this._atContext, locationSingleResponse._atContext) &&
-                Objects.equals(this.metadata, locationSingleResponse.metadata) &&
-                Objects.equals(this.result, locationSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class LocationSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Metadata.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Metadata.java
deleted file mode 100644
index 34d95011..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Metadata.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-//TODO this is generated for each module, probably only need one
-/**
- * An object in the BrAPI standard response model that describes some information about the service call being performed. This includes supplementary data, status log messages, and pagination information.
- */
-@Schema(description = "An object in the BrAPI standard response model that describes some information about the service call being performed. This includes supplementary data, status log messages, and pagination information.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class Metadata {
-    @SerializedName("datafiles")
-    private List<MetadataDatafiles> datafiles = null;
-
-    @SerializedName("pagination")
-    private MetadataPagination pagination = null;
-
-    @SerializedName("status")
-    private List<MetadataStatus> status = null;
-
-    public Metadata datafiles(List<MetadataDatafiles> datafiles) {
-        this.datafiles = datafiles;
-        return this;
-    }
-
-    public Metadata addDatafilesItem(MetadataDatafiles datafilesItem) {
-        if (this.datafiles == null) {
-            this.datafiles = new ArrayList<MetadataDatafiles>();
-        }
-        this.datafiles.add(datafilesItem);
-        return this;
-    }
-
-    /**
-     * The datafiles contains a list of file URLs and metadata.  These files contain additional information related to the returned object and can be retrieved by a subsequent call.  This could be a supplementary data file, an informational file, the uploaded file where the data originated from, a generated file representing the whole dataset in a particular format, or any other related file.
-     *
-     * @return datafiles
-     **/
-    @Schema(example = "[]", description = "The datafiles contains a list of file URLs and metadata.  These files contain additional information related to the returned object and can be retrieved by a subsequent call.  This could be a supplementary data file, an informational file, the uploaded file where the data originated from, a generated file representing the whole dataset in a particular format, or any other related file. ")
-    public List<MetadataDatafiles> getDatafiles() {
-        return datafiles;
-    }
-
-    public void setDatafiles(List<MetadataDatafiles> datafiles) {
-        this.datafiles = datafiles;
-    }
-
-    public Metadata pagination(MetadataPagination pagination) {
-        this.pagination = pagination;
-        return this;
-    }
-
-    /**
-     * Get pagination
-     *
-     * @return pagination
-     **/
-    @Schema(description = "")
-    public MetadataPagination getPagination() {
-        return pagination;
-    }
-
-    public void setPagination(MetadataPagination pagination) {
-        this.pagination = pagination;
-    }
-
-    public Metadata status(List<MetadataStatus> status) {
-        this.status = status;
-        return this;
-    }
-
-    public Metadata addStatusItem(MetadataStatus statusItem) {
-        if (this.status == null) {
-            this.status = new ArrayList<MetadataStatus>();
-        }
-        this.status.add(statusItem);
-        return this;
-    }
-
-    /**
-     * The status field contains a list of informational status messages from the server.  If no status is reported, an empty list should be returned. See Error Reporting for more information.
-     *
-     * @return status
-     **/
-    @Schema(description = "The status field contains a list of informational status messages from the server.  If no status is reported, an empty list should be returned. See Error Reporting for more information.")
-    public List<MetadataStatus> getStatus() {
-        return status;
-    }
-
-    public void setStatus(List<MetadataStatus> status) {
-        this.status = status;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Metadata metadata = (Metadata) o;
-        return Objects.equals(this.datafiles, metadata.datafiles) &&
-                Objects.equals(this.pagination, metadata.pagination) &&
-                Objects.equals(this.status, metadata.status);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(datafiles, pagination, status);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Metadata {\n");
-
-        sb.append("    datafiles: ").append(toIndentedString(datafiles)).append("\n");
-        sb.append("    pagination: ").append(toIndentedString(pagination)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataBase.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataBase.java
deleted file mode 100644
index e37d0bb5..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataBase.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An object in the BrAPI standard response model that describes some information about the service call being performed. This includes supplementary data, status log messages, and pagination information.
- */
-@Schema(description = "An object in the BrAPI standard response model that describes some information about the service call being performed. This includes supplementary data, status log messages, and pagination information.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class MetadataBase {
-    @SerializedName("datafiles")
-    private List<MetadataDatafiles> datafiles = null;
-
-    @SerializedName("status")
-    private List<MetadataStatus> status = null;
-
-    public MetadataBase datafiles(List<MetadataDatafiles> datafiles) {
-        this.datafiles = datafiles;
-        return this;
-    }
-
-    public MetadataBase addDatafilesItem(MetadataDatafiles datafilesItem) {
-        if (this.datafiles == null) {
-            this.datafiles = new ArrayList<MetadataDatafiles>();
-        }
-        this.datafiles.add(datafilesItem);
-        return this;
-    }
-
-    /**
-     * The datafiles contains a list of file URLs and metadata.  These files contain additional information related to the returned object and can be retrieved by a subsequent call.  This could be a supplementary data file, an informational file, the uploaded file where the data originated from, a generated file representing the whole dataset in a particular format, or any other related file.
-     *
-     * @return datafiles
-     **/
-    @Schema(example = "[]", description = "The datafiles contains a list of file URLs and metadata.  These files contain additional information related to the returned object and can be retrieved by a subsequent call.  This could be a supplementary data file, an informational file, the uploaded file where the data originated from, a generated file representing the whole dataset in a particular format, or any other related file. ")
-    public List<MetadataDatafiles> getDatafiles() {
-        return datafiles;
-    }
-
-    public void setDatafiles(List<MetadataDatafiles> datafiles) {
-        this.datafiles = datafiles;
-    }
-
-    public MetadataBase status(List<MetadataStatus> status) {
-        this.status = status;
-        return this;
-    }
-
-    public MetadataBase addStatusItem(MetadataStatus statusItem) {
-        if (this.status == null) {
-            this.status = new ArrayList<MetadataStatus>();
-        }
-        this.status.add(statusItem);
-        return this;
-    }
-
-    /**
-     * The status field contains a list of informational status messages from the server.  If no status is reported, an empty list should be returned. See Error Reporting for more information.
-     *
-     * @return status
-     **/
-    @Schema(description = "The status field contains a list of informational status messages from the server.  If no status is reported, an empty list should be returned. See Error Reporting for more information.")
-    public List<MetadataStatus> getStatus() {
-        return status;
-    }
-
-    public void setStatus(List<MetadataStatus> status) {
-        this.status = status;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MetadataBase metadataBase = (MetadataBase) o;
-        return Objects.equals(this.datafiles, metadataBase.datafiles) &&
-                Objects.equals(this.status, metadataBase.status);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(datafiles, status);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MetadataBase {\n");
-
-        sb.append("    datafiles: ").append(toIndentedString(datafiles)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataDatafiles.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataDatafiles.java
deleted file mode 100644
index e544fa76..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataDatafiles.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * A dataFile contains a URL and the relevant file metadata to represent a file
- */
-@Schema(description = "A dataFile contains a URL and the relevant file metadata to represent a file")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class MetadataDatafiles {
-    @SerializedName("fileDescription")
-    private String fileDescription = null;
-
-    @SerializedName("fileMD5Hash")
-    private String fileMD5Hash = null;
-
-    @SerializedName("fileName")
-    private String fileName = null;
-
-    @SerializedName("fileSize")
-    private Integer fileSize = null;
-
-    @SerializedName("fileType")
-    private String fileType = null;
-
-    @SerializedName("fileURL")
-    private String fileURL = null;
-
-    public MetadataDatafiles fileDescription(String fileDescription) {
-        this.fileDescription = fileDescription;
-        return this;
-    }
-
-    /**
-     * A human readable description of the file contents
-     *
-     * @return fileDescription
-     **/
-    @Schema(example = "This is an Excel data file", description = "A human readable description of the file contents")
-    public String getFileDescription() {
-        return fileDescription;
-    }
-
-    public void setFileDescription(String fileDescription) {
-        this.fileDescription = fileDescription;
-    }
-
-    public MetadataDatafiles fileMD5Hash(String fileMD5Hash) {
-        this.fileMD5Hash = fileMD5Hash;
-        return this;
-    }
-
-    /**
-     * The MD5 Hash of the file contents to be used as a check sum
-     *
-     * @return fileMD5Hash
-     **/
-    @Schema(example = "c2365e900c81a89cf74d83dab60df146", description = "The MD5 Hash of the file contents to be used as a check sum")
-    public String getFileMD5Hash() {
-        return fileMD5Hash;
-    }
-
-    public void setFileMD5Hash(String fileMD5Hash) {
-        this.fileMD5Hash = fileMD5Hash;
-    }
-
-    public MetadataDatafiles fileName(String fileName) {
-        this.fileName = fileName;
-        return this;
-    }
-
-    /**
-     * The name of the file
-     *
-     * @return fileName
-     **/
-    @Schema(example = "datafile.xlsx", description = "The name of the file")
-    public String getFileName() {
-        return fileName;
-    }
-
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
-    public MetadataDatafiles fileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-        return this;
-    }
-
-    /**
-     * The size of the file in bytes
-     *
-     * @return fileSize
-     **/
-    @Schema(example = "4398", description = "The size of the file in bytes")
-    public Integer getFileSize() {
-        return fileSize;
-    }
-
-    public void setFileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-    }
-
-    public MetadataDatafiles fileType(String fileType) {
-        this.fileType = fileType;
-        return this;
-    }
-
-    /**
-     * The type or format of the file. Preferably MIME Type.
-     *
-     * @return fileType
-     **/
-    @Schema(example = "application/vnd.ms-excel", description = "The type or format of the file. Preferably MIME Type.")
-    public String getFileType() {
-        return fileType;
-    }
-
-    public void setFileType(String fileType) {
-        this.fileType = fileType;
-    }
-
-    public MetadataDatafiles fileURL(String fileURL) {
-        this.fileURL = fileURL;
-        return this;
-    }
-
-    /**
-     * The absolute URL where the file is located
-     *
-     * @return fileURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/examples/datafile.xlsx", required = true, description = "The absolute URL where the file is located")
-    public String getFileURL() {
-        return fileURL;
-    }
-
-    public void setFileURL(String fileURL) {
-        this.fileURL = fileURL;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MetadataDatafiles metadataDatafiles = (MetadataDatafiles) o;
-        return Objects.equals(this.fileDescription, metadataDatafiles.fileDescription) &&
-                Objects.equals(this.fileMD5Hash, metadataDatafiles.fileMD5Hash) &&
-                Objects.equals(this.fileName, metadataDatafiles.fileName) &&
-                Objects.equals(this.fileSize, metadataDatafiles.fileSize) &&
-                Objects.equals(this.fileType, metadataDatafiles.fileType) &&
-                Objects.equals(this.fileURL, metadataDatafiles.fileURL);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(fileDescription, fileMD5Hash, fileName, fileSize, fileType, fileURL);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MetadataDatafiles {\n");
-
-        sb.append("    fileDescription: ").append(toIndentedString(fileDescription)).append("\n");
-        sb.append("    fileMD5Hash: ").append(toIndentedString(fileMD5Hash)).append("\n");
-        sb.append("    fileName: ").append(toIndentedString(fileName)).append("\n");
-        sb.append("    fileSize: ").append(toIndentedString(fileSize)).append("\n");
-        sb.append("    fileType: ").append(toIndentedString(fileType)).append("\n");
-        sb.append("    fileURL: ").append(toIndentedString(fileURL)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataPagination.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataPagination.java
deleted file mode 100644
index 8e185bc8..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataPagination.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * The pagination object is applicable only when the payload contains a \&quot;data\&quot; key. It describes the pagination of the data contained in the \&quot;data\&quot; array, as a way to identify which subset of data is being returned.  &lt;br&gt; Pages are zero indexed, so the first page will be page 0 (zero).
- */
-@Schema(description = "The pagination object is applicable only when the payload contains a \"data\" key. It describes the pagination of the data contained in the \"data\" array, as a way to identify which subset of data is being returned.  <br> Pages are zero indexed, so the first page will be page 0 (zero).")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class MetadataPagination {
-    @SerializedName("currentPage")
-    private Integer currentPage = 0;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = 1000;
-
-    @SerializedName("totalCount")
-    private Integer totalCount = null;
-
-    @SerializedName("totalPages")
-    private Integer totalPages = null;
-
-    public MetadataPagination currentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-        return this;
-    }
-
-    /**
-     * The index number for the returned page of data. This should always match the requested page number or the default page (0).
-     *
-     * @return currentPage
-     **/
-    @Schema(example = "0", required = true, description = "The index number for the returned page of data. This should always match the requested page number or the default page (0).")
-    public Integer getCurrentPage() {
-        return currentPage;
-    }
-
-    public void setCurrentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-    }
-
-    public MetadataPagination pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", required = true, description = "The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public MetadataPagination totalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-        return this;
-    }
-
-    /**
-     * The total number of elements that are available on the server and match the requested query parameters.
-     *
-     * @return totalCount
-     **/
-    @Schema(example = "10", description = "The total number of elements that are available on the server and match the requested query parameters.")
-    public Integer getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public MetadataPagination totalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-        return this;
-    }
-
-    /**
-     * The total number of pages of elements available on the server. This should be calculated with the following formula.  &lt;br&gt; totalPages &#x3D; CEILING( totalCount / requested_page_size)
-     *
-     * @return totalPages
-     **/
-    @Schema(example = "1", description = "The total number of pages of elements available on the server. This should be calculated with the following formula.  <br> totalPages = CEILING( totalCount / requested_page_size)")
-    public Integer getTotalPages() {
-        return totalPages;
-    }
-
-    public void setTotalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MetadataPagination metadataPagination = (MetadataPagination) o;
-        return Objects.equals(this.currentPage, metadataPagination.currentPage) &&
-                Objects.equals(this.pageSize, metadataPagination.pageSize) &&
-                Objects.equals(this.totalCount, metadataPagination.totalCount) &&
-                Objects.equals(this.totalPages, metadataPagination.totalPages);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(currentPage, pageSize, totalCount, totalPages);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MetadataPagination {\n");
-
-        sb.append("    currentPage: ").append(toIndentedString(currentPage)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    totalCount: ").append(toIndentedString(totalCount)).append("\n");
-        sb.append("    totalPages: ").append(toIndentedString(totalPages)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataStatus.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataStatus.java
deleted file mode 100644
index a31479e9..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataStatus.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * An array of status messages to convey technical logging information from the server to the client.
- */
-@Schema(description = "An array of status messages to convey technical logging information from the server to the client.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class MetadataStatus {
-    @SerializedName("message")
-    private String message = null;
-
-    /**
-     * The logging level for the attached message
-     */
-    @JsonAdapter(MessageTypeEnum.Adapter.class)
-    public enum MessageTypeEnum {
-        DEBUG("DEBUG"),
-        ERROR("ERROR"),
-        WARNING("WARNING"),
-        INFO("INFO");
-
-        private String value;
-
-        MessageTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static MessageTypeEnum fromValue(String input) {
-            for (MessageTypeEnum b : MessageTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<MessageTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final MessageTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public MessageTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return MessageTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("messageType")
-    private MessageTypeEnum messageType = null;
-
-    public MetadataStatus message(String message) {
-        this.message = message;
-        return this;
-    }
-
-    /**
-     * A short message concerning the status of this request/response
-     *
-     * @return message
-     **/
-    @Schema(example = "Request accepted, response successful", required = true, description = "A short message concerning the status of this request/response")
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public MetadataStatus messageType(MessageTypeEnum messageType) {
-        this.messageType = messageType;
-        return this;
-    }
-
-    /**
-     * The logging level for the attached message
-     *
-     * @return messageType
-     **/
-    @Schema(example = "INFO", required = true, description = "The logging level for the attached message")
-    public MessageTypeEnum getMessageType() {
-        return messageType;
-    }
-
-    public void setMessageType(MessageTypeEnum messageType) {
-        this.messageType = messageType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MetadataStatus metadataStatus = (MetadataStatus) o;
-        return Objects.equals(this.message, metadataStatus.message) &&
-                Objects.equals(this.messageType, metadataStatus.messageType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(message, messageType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MetadataStatus {\n");
-
-        sb.append("    message: ").append(toIndentedString(message)).append("\n");
-        sb.append("    messageType: ").append(toIndentedString(messageType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataTokenPagination.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataTokenPagination.java
deleted file mode 100644
index 3732a76a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataTokenPagination.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An object in the BrAPI standard response model that describes some information about the service call being performed. This includes supplementary data, status log messages, and pagination information.
- */
-@Schema(description = "An object in the BrAPI standard response model that describes some information about the service call being performed. This includes supplementary data, status log messages, and pagination information.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class MetadataTokenPagination {
-    @SerializedName("datafiles")
-    private List<MetadataDatafiles> datafiles = null;
-
-    @SerializedName("pagination")
-    private MetadataTokenPaginationPagination pagination = null;
-
-    @SerializedName("status")
-    private List<MetadataStatus> status = null;
-
-    public MetadataTokenPagination datafiles(List<MetadataDatafiles> datafiles) {
-        this.datafiles = datafiles;
-        return this;
-    }
-
-    public MetadataTokenPagination addDatafilesItem(MetadataDatafiles datafilesItem) {
-        if (this.datafiles == null) {
-            this.datafiles = new ArrayList<MetadataDatafiles>();
-        }
-        this.datafiles.add(datafilesItem);
-        return this;
-    }
-
-    /**
-     * The datafiles contains a list of file URLs and metadata.  These files contain additional information related to the returned object and can be retrieved by a subsequent call.  This could be a supplementary data file, an informational file, the uploaded file where the data originated from, a generated file representing the whole dataset in a particular format, or any other related file.
-     *
-     * @return datafiles
-     **/
-    @Schema(example = "[]", description = "The datafiles contains a list of file URLs and metadata.  These files contain additional information related to the returned object and can be retrieved by a subsequent call.  This could be a supplementary data file, an informational file, the uploaded file where the data originated from, a generated file representing the whole dataset in a particular format, or any other related file. ")
-    public List<MetadataDatafiles> getDatafiles() {
-        return datafiles;
-    }
-
-    public void setDatafiles(List<MetadataDatafiles> datafiles) {
-        this.datafiles = datafiles;
-    }
-
-    public MetadataTokenPagination pagination(MetadataTokenPaginationPagination pagination) {
-        this.pagination = pagination;
-        return this;
-    }
-
-    /**
-     * Get pagination
-     *
-     * @return pagination
-     **/
-    @Schema(description = "")
-    public MetadataTokenPaginationPagination getPagination() {
-        return pagination;
-    }
-
-    public void setPagination(MetadataTokenPaginationPagination pagination) {
-        this.pagination = pagination;
-    }
-
-    public MetadataTokenPagination status(List<MetadataStatus> status) {
-        this.status = status;
-        return this;
-    }
-
-    public MetadataTokenPagination addStatusItem(MetadataStatus statusItem) {
-        if (this.status == null) {
-            this.status = new ArrayList<MetadataStatus>();
-        }
-        this.status.add(statusItem);
-        return this;
-    }
-
-    /**
-     * The status field contains a list of informational status messages from the server.  If no status is reported, an empty list should be returned. See Error Reporting for more information.
-     *
-     * @return status
-     **/
-    @Schema(description = "The status field contains a list of informational status messages from the server.  If no status is reported, an empty list should be returned. See Error Reporting for more information.")
-    public List<MetadataStatus> getStatus() {
-        return status;
-    }
-
-    public void setStatus(List<MetadataStatus> status) {
-        this.status = status;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MetadataTokenPagination metadataTokenPagination = (MetadataTokenPagination) o;
-        return Objects.equals(this.datafiles, metadataTokenPagination.datafiles) &&
-                Objects.equals(this.pagination, metadataTokenPagination.pagination) &&
-                Objects.equals(this.status, metadataTokenPagination.status);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(datafiles, pagination, status);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MetadataTokenPagination {\n");
-
-        sb.append("    datafiles: ").append(toIndentedString(datafiles)).append("\n");
-        sb.append("    pagination: ").append(toIndentedString(pagination)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataTokenPaginationPagination.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataTokenPaginationPagination.java
deleted file mode 100644
index 18ac7dfa..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MetadataTokenPaginationPagination.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The pagination object is applicable only when the payload contains a \&quot;data\&quot; key. It describes the pagination of the data contained in the \&quot;data\&quot; array, as a way to identify which subset of data is being returned.  &lt;br&gt;Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken to construct an additional query and move to the next or previous page respectively.
- */
-@Schema(description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The pagination object is applicable only when the payload contains a \"data\" key. It describes the pagination of the data contained in the \"data\" array, as a way to identify which subset of data is being returned.  <br>Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken to construct an additional query and move to the next or previous page respectively.  ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class MetadataTokenPaginationPagination {
-    @SerializedName("currentPage")
-    private Integer currentPage = 0;
-
-    @SerializedName("currentPageToken")
-    private String currentPageToken = null;
-
-    @SerializedName("nextPageToken")
-    private String nextPageToken = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = 1000;
-
-    @SerializedName("prevPageToken")
-    private String prevPageToken = null;
-
-    @SerializedName("totalCount")
-    private Integer totalCount = null;
-
-    @SerializedName("totalPages")
-    private Integer totalPages = null;
-
-    public MetadataTokenPaginationPagination currentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-        return this;
-    }
-
-    /**
-     * The index number for the returned page of data. This should always match the requested page number or the default page (0).
-     *
-     * @return currentPage
-     **/
-    @Schema(example = "0", description = "The index number for the returned page of data. This should always match the requested page number or the default page (0).")
-    public Integer getCurrentPage() {
-        return currentPage;
-    }
-
-    public void setCurrentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-    }
-
-    public MetadataTokenPaginationPagination currentPageToken(String currentPageToken) {
-        this.currentPageToken = currentPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the current page of data.
-     *
-     * @return currentPageToken
-     **/
-    @Schema(example = "48bc6ac1", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the current page of data.")
-    public String getCurrentPageToken() {
-        return currentPageToken;
-    }
-
-    public void setCurrentPageToken(String currentPageToken) {
-        this.currentPageToken = currentPageToken;
-    }
-
-    public MetadataTokenPaginationPagination nextPageToken(String nextPageToken) {
-        this.nextPageToken = nextPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the next page of data.
-     *
-     * @return nextPageToken
-     **/
-    @Schema(example = "cb668f63", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the next page of data.")
-    public String getNextPageToken() {
-        return nextPageToken;
-    }
-
-    public void setNextPageToken(String nextPageToken) {
-        this.nextPageToken = nextPageToken;
-    }
-
-    public MetadataTokenPaginationPagination pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public MetadataTokenPaginationPagination prevPageToken(String prevPageToken) {
-        this.prevPageToken = prevPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the previous page of data.
-     *
-     * @return prevPageToken
-     **/
-    @Schema(example = "9659857e", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the previous page of data.")
-    public String getPrevPageToken() {
-        return prevPageToken;
-    }
-
-    public void setPrevPageToken(String prevPageToken) {
-        this.prevPageToken = prevPageToken;
-    }
-
-    public MetadataTokenPaginationPagination totalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-        return this;
-    }
-
-    /**
-     * The total number of elements that are available on the server and match the requested query parameters.
-     *
-     * @return totalCount
-     **/
-    @Schema(example = "10", description = "The total number of elements that are available on the server and match the requested query parameters.")
-    public Integer getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public MetadataTokenPaginationPagination totalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-        return this;
-    }
-
-    /**
-     * The total number of pages of elements available on the server. This should be calculated with the following formula.  &lt;br&gt; totalPages &#x3D; CEILING( totalCount / requested_page_size)
-     *
-     * @return totalPages
-     **/
-    @Schema(example = "1", description = "The total number of pages of elements available on the server. This should be calculated with the following formula.  <br> totalPages = CEILING( totalCount / requested_page_size)")
-    public Integer getTotalPages() {
-        return totalPages;
-    }
-
-    public void setTotalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MetadataTokenPaginationPagination metadataTokenPaginationPagination = (MetadataTokenPaginationPagination) o;
-        return Objects.equals(this.currentPage, metadataTokenPaginationPagination.currentPage) &&
-                Objects.equals(this.currentPageToken, metadataTokenPaginationPagination.currentPageToken) &&
-                Objects.equals(this.nextPageToken, metadataTokenPaginationPagination.nextPageToken) &&
-                Objects.equals(this.pageSize, metadataTokenPaginationPagination.pageSize) &&
-                Objects.equals(this.prevPageToken, metadataTokenPaginationPagination.prevPageToken) &&
-                Objects.equals(this.totalCount, metadataTokenPaginationPagination.totalCount) &&
-                Objects.equals(this.totalPages, metadataTokenPaginationPagination.totalPages);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(currentPage, currentPageToken, nextPageToken, pageSize, prevPageToken, totalCount, totalPages);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MetadataTokenPaginationPagination {\n");
-
-        sb.append("    currentPage: ").append(toIndentedString(currentPage)).append("\n");
-        sb.append("    currentPageToken: ").append(toIndentedString(currentPageToken)).append("\n");
-        sb.append("    nextPageToken: ").append(toIndentedString(nextPageToken)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    prevPageToken: ").append(toIndentedString(prevPageToken)).append("\n");
-        sb.append("    totalCount: ").append(toIndentedString(totalCount)).append("\n");
-        sb.append("    totalPages: ").append(toIndentedString(totalPages)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Method.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Method.java
deleted file mode 100644
index 9836f45b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Method.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A description of the way an Observation should be collected.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Method \&quot;estimation\&quot; or \&quot;drone image processing\&quot;.
- */
-@Schema(description = "A description of the way an Observation should be collected.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Method \"estimation\" or \"drone image processing\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Method {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("bibliographicalReference")
-    private String bibliographicalReference = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("formula")
-    private String formula = null;
-
-    @SerializedName("methodClass")
-    private String methodClass = null;
-
-    @SerializedName("methodDbId")
-    private String methodDbId = null;
-
-    @SerializedName("methodName")
-    private String methodName = null;
-
-    @SerializedName("methodPUI")
-    private String methodPUI = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    public Method additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Method putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Method bibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-        return this;
-    }
-
-    /**
-     * Bibliographical reference describing the method. &lt;br/&gt;MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.
-     *
-     * @return bibliographicalReference
-     **/
-    @Schema(example = "Smith, 1893, Really Cool Paper, Popular Journal", description = "Bibliographical reference describing the method. <br/>MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.")
-    public String getBibliographicalReference() {
-        return bibliographicalReference;
-    }
-
-    public void setBibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-    }
-
-    public Method description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Method description &lt;br/&gt;MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)
-     *
-     * @return description
-     **/
-    @Schema(example = "A measuring tape was used", description = "Method description <br/>MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Method externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Method addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Method formula(String formula) {
-        this.formula = formula;
-        return this;
-    }
-
-    /**
-     * For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation
-     *
-     * @return formula
-     **/
-    @Schema(example = "a^2 + b^2 = c^2", description = "For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation")
-    public String getFormula() {
-        return formula;
-    }
-
-    public void setFormula(String formula) {
-        this.formula = formula;
-    }
-
-    public Method methodClass(String methodClass) {
-        this.methodClass = methodClass;
-        return this;
-    }
-
-    /**
-     * Method class (examples: \&quot;Measurement\&quot;, \&quot;Counting\&quot;, \&quot;Estimation\&quot;, \&quot;Computation\&quot;, etc.)
-     *
-     * @return methodClass
-     **/
-    @Schema(example = "Measurement", description = "Method class (examples: \"Measurement\", \"Counting\", \"Estimation\", \"Computation\", etc.)")
-    public String getMethodClass() {
-        return methodClass;
-    }
-
-    public void setMethodClass(String methodClass) {
-        this.methodClass = methodClass;
-    }
-
-    public Method methodDbId(String methodDbId) {
-        this.methodDbId = methodDbId;
-        return this;
-    }
-
-    /**
-     * Method unique identifier
-     *
-     * @return methodDbId
-     **/
-    @Schema(example = "0adb2764", description = "Method unique identifier")
-    public String getMethodDbId() {
-        return methodDbId;
-    }
-
-    public void setMethodDbId(String methodDbId) {
-        this.methodDbId = methodDbId;
-    }
-
-    public Method methodName(String methodName) {
-        this.methodName = methodName;
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodName
-     **/
-    @Schema(example = "Measuring Tape", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public String getMethodName() {
-        return methodName;
-    }
-
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
-    public Method methodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000212", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public String getMethodPUI() {
-        return methodPUI;
-    }
-
-    public void setMethodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-    }
-
-    public Method ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Method method = (Method) o;
-        return Objects.equals(this.additionalInfo, method.additionalInfo) &&
-                Objects.equals(this.bibliographicalReference, method.bibliographicalReference) &&
-                Objects.equals(this.description, method.description) &&
-                Objects.equals(this.externalReferences, method.externalReferences) &&
-                Objects.equals(this.formula, method.formula) &&
-                Objects.equals(this.methodClass, method.methodClass) &&
-                Objects.equals(this.methodDbId, method.methodDbId) &&
-                Objects.equals(this.methodName, method.methodName) &&
-                Objects.equals(this.methodPUI, method.methodPUI) &&
-                Objects.equals(this.ontologyReference, method.ontologyReference);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, bibliographicalReference, description, externalReferences, formula, methodClass, methodDbId, methodName, methodPUI, ontologyReference);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Method {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    bibliographicalReference: ").append(toIndentedString(bibliographicalReference)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    formula: ").append(toIndentedString(formula)).append("\n");
-        sb.append("    methodClass: ").append(toIndentedString(methodClass)).append("\n");
-        sb.append("    methodDbId: ").append(toIndentedString(methodDbId)).append("\n");
-        sb.append("    methodName: ").append(toIndentedString(methodName)).append("\n");
-        sb.append("    methodPUI: ").append(toIndentedString(methodPUI)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodBaseClass.java
deleted file mode 100644
index 01009cb3..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodBaseClass.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A description of the way an Observation should be collected.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Method \&quot;estimation\&quot; or \&quot;drone image processing\&quot;.
- */
-@Schema(description = "A description of the way an Observation should be collected.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Method \"estimation\" or \"drone image processing\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class MethodBaseClass {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("bibliographicalReference")
-    private String bibliographicalReference = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("formula")
-    private String formula = null;
-
-    @SerializedName("methodClass")
-    private String methodClass = null;
-
-    @SerializedName("methodName")
-    private String methodName = null;
-
-    @SerializedName("methodPUI")
-    private String methodPUI = null;
-
-    @SerializedName("ontologyReference")
-    private MethodBaseClassOntologyReference ontologyReference = null;
-
-    public MethodBaseClass additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public MethodBaseClass putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public MethodBaseClass bibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-        return this;
-    }
-
-    /**
-     * Bibliographical reference describing the method. &lt;br/&gt;MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.
-     *
-     * @return bibliographicalReference
-     **/
-    @Schema(example = "Smith, 1893, Really Cool Paper, Popular Journal", description = "Bibliographical reference describing the method. <br/>MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.")
-    public String getBibliographicalReference() {
-        return bibliographicalReference;
-    }
-
-    public void setBibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-    }
-
-    public MethodBaseClass description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Method description &lt;br/&gt;MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)
-     *
-     * @return description
-     **/
-    @Schema(example = "A measuring tape was used", description = "Method description <br/>MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public MethodBaseClass externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public MethodBaseClass addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public MethodBaseClass formula(String formula) {
-        this.formula = formula;
-        return this;
-    }
-
-    /**
-     * For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation
-     *
-     * @return formula
-     **/
-    @Schema(example = "a^2 + b^2 = c^2", description = "For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation")
-    public String getFormula() {
-        return formula;
-    }
-
-    public void setFormula(String formula) {
-        this.formula = formula;
-    }
-
-    public MethodBaseClass methodClass(String methodClass) {
-        this.methodClass = methodClass;
-        return this;
-    }
-
-    /**
-     * Method class (examples: \&quot;Measurement\&quot;, \&quot;Counting\&quot;, \&quot;Estimation\&quot;, \&quot;Computation\&quot;, etc.)
-     *
-     * @return methodClass
-     **/
-    @Schema(example = "Measurement", description = "Method class (examples: \"Measurement\", \"Counting\", \"Estimation\", \"Computation\", etc.)")
-    public String getMethodClass() {
-        return methodClass;
-    }
-
-    public void setMethodClass(String methodClass) {
-        this.methodClass = methodClass;
-    }
-
-    public MethodBaseClass methodName(String methodName) {
-        this.methodName = methodName;
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodName
-     **/
-    @Schema(example = "Measuring Tape", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public String getMethodName() {
-        return methodName;
-    }
-
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
-    public MethodBaseClass methodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000212", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public String getMethodPUI() {
-        return methodPUI;
-    }
-
-    public void setMethodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-    }
-
-    public MethodBaseClass ontologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodBaseClassOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodBaseClass methodBaseClass = (MethodBaseClass) o;
-        return Objects.equals(this.additionalInfo, methodBaseClass.additionalInfo) &&
-                Objects.equals(this.bibliographicalReference, methodBaseClass.bibliographicalReference) &&
-                Objects.equals(this.description, methodBaseClass.description) &&
-                Objects.equals(this.externalReferences, methodBaseClass.externalReferences) &&
-                Objects.equals(this.formula, methodBaseClass.formula) &&
-                Objects.equals(this.methodClass, methodBaseClass.methodClass) &&
-                Objects.equals(this.methodName, methodBaseClass.methodName) &&
-                Objects.equals(this.methodPUI, methodBaseClass.methodPUI) &&
-                Objects.equals(this.ontologyReference, methodBaseClass.ontologyReference);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, bibliographicalReference, description, externalReferences, formula, methodClass, methodName, methodPUI, ontologyReference);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodBaseClass {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    bibliographicalReference: ").append(toIndentedString(bibliographicalReference)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    formula: ").append(toIndentedString(formula)).append("\n");
-        sb.append("    methodClass: ").append(toIndentedString(methodClass)).append("\n");
-        sb.append("    methodName: ").append(toIndentedString(methodName)).append("\n");
-        sb.append("    methodPUI: ").append(toIndentedString(methodPUI)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodBaseClassOntologyReference.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodBaseClassOntologyReference.java
deleted file mode 100644
index 4876e5eb..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodBaseClassOntologyReference.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).
- */
-@Schema(description = "MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class MethodBaseClassOntologyReference {
-    @SerializedName("documentationLinks")
-    private List<MethodBaseClassOntologyReferenceDocumentationLinks> documentationLinks = null;
-
-    @SerializedName("ontologyDbId")
-    private String ontologyDbId = null;
-
-    @SerializedName("ontologyName")
-    private String ontologyName = null;
-
-    @SerializedName("version")
-    private String version = null;
-
-    public MethodBaseClassOntologyReference documentationLinks(List<MethodBaseClassOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-        return this;
-    }
-
-    public MethodBaseClassOntologyReference addDocumentationLinksItem(MethodBaseClassOntologyReferenceDocumentationLinks documentationLinksItem) {
-        if (this.documentationLinks == null) {
-            this.documentationLinks = new ArrayList<MethodBaseClassOntologyReferenceDocumentationLinks>();
-        }
-        this.documentationLinks.add(documentationLinksItem);
-        return this;
-    }
-
-    /**
-     * links to various ontology documentation
-     *
-     * @return documentationLinks
-     **/
-    @Schema(description = "links to various ontology documentation")
-    public List<MethodBaseClassOntologyReferenceDocumentationLinks> getDocumentationLinks() {
-        return documentationLinks;
-    }
-
-    public void setDocumentationLinks(List<MethodBaseClassOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-    }
-
-    public MethodBaseClassOntologyReference ontologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-        return this;
-    }
-
-    /**
-     * Ontology database unique identifier
-     *
-     * @return ontologyDbId
-     **/
-    @Schema(example = "6b071868", required = true, description = "Ontology database unique identifier")
-    public String getOntologyDbId() {
-        return ontologyDbId;
-    }
-
-    public void setOntologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-    }
-
-    public MethodBaseClassOntologyReference ontologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-        return this;
-    }
-
-    /**
-     * Ontology name
-     *
-     * @return ontologyName
-     **/
-    @Schema(example = "The Crop Ontology", required = true, description = "Ontology name")
-    public String getOntologyName() {
-        return ontologyName;
-    }
-
-    public void setOntologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-    }
-
-    public MethodBaseClassOntologyReference version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    /**
-     * Ontology version (no specific format)
-     *
-     * @return version
-     **/
-    @Schema(example = "7.2.3", description = "Ontology version (no specific format)")
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodBaseClassOntologyReference methodBaseClassOntologyReference = (MethodBaseClassOntologyReference) o;
-        return Objects.equals(this.documentationLinks, methodBaseClassOntologyReference.documentationLinks) &&
-                Objects.equals(this.ontologyDbId, methodBaseClassOntologyReference.ontologyDbId) &&
-                Objects.equals(this.ontologyName, methodBaseClassOntologyReference.ontologyName) &&
-                Objects.equals(this.version, methodBaseClassOntologyReference.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(documentationLinks, ontologyDbId, ontologyName, version);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodBaseClassOntologyReference {\n");
-
-        sb.append("    documentationLinks: ").append(toIndentedString(documentationLinks)).append("\n");
-        sb.append("    ontologyDbId: ").append(toIndentedString(ontologyDbId)).append("\n");
-        sb.append("    ontologyName: ").append(toIndentedString(ontologyName)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodBaseClassOntologyReferenceDocumentationLinks.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodBaseClassOntologyReferenceDocumentationLinks.java
deleted file mode 100644
index f698863d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodBaseClassOntologyReferenceDocumentationLinks.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * MethodBaseClassOntologyReferenceDocumentationLinks
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class MethodBaseClassOntologyReferenceDocumentationLinks {
-    @SerializedName("URL")
-    private String URL = null;
-
-    /**
-     * Gets or Sets type
-     */
-    @JsonAdapter(TypeEnum.Adapter.class)
-    public enum TypeEnum {
-        OBO("OBO"),
-        RDF("RDF"),
-        WEBPAGE("WEBPAGE");
-
-        private String value;
-
-        TypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static TypeEnum fromValue(String input) {
-            for (TypeEnum b : TypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<TypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final TypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public TypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return TypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("type")
-    private TypeEnum type = null;
-
-    public MethodBaseClassOntologyReferenceDocumentationLinks URL(String URL) {
-        this.URL = URL;
-        return this;
-    }
-
-    /**
-     * Get URL
-     *
-     * @return URL
-     **/
-    @Schema(example = "http://purl.obolibrary.org/obo/ro.owl", description = "")
-    public String getURL() {
-        return URL;
-    }
-
-    public void setURL(String URL) {
-        this.URL = URL;
-    }
-
-    public MethodBaseClassOntologyReferenceDocumentationLinks type(TypeEnum type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * Get type
-     *
-     * @return type
-     **/
-    @Schema(example = "OBO", description = "")
-    public TypeEnum getType() {
-        return type;
-    }
-
-    public void setType(TypeEnum type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodBaseClassOntologyReferenceDocumentationLinks methodBaseClassOntologyReferenceDocumentationLinks = (MethodBaseClassOntologyReferenceDocumentationLinks) o;
-        return Objects.equals(this.URL, methodBaseClassOntologyReferenceDocumentationLinks.URL) &&
-                Objects.equals(this.type, methodBaseClassOntologyReferenceDocumentationLinks.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(URL, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodBaseClassOntologyReferenceDocumentationLinks {\n");
-
-        sb.append("    URL: ").append(toIndentedString(URL)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodListResponse.java
deleted file mode 100644
index 143a2ee9..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * MethodListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class MethodListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private MethodListResponseResult result = null;
-
-    public MethodListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public MethodListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public MethodListResponse result(MethodListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public MethodListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(MethodListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodListResponse methodListResponse = (MethodListResponse) o;
-        return Objects.equals(this._atContext, methodListResponse._atContext) &&
-                Objects.equals(this.metadata, methodListResponse.metadata) &&
-                Objects.equals(this.result, methodListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodListResponseResult.java
deleted file mode 100644
index 3c999211..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * MethodListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class MethodListResponseResult {
-    @SerializedName("data")
-    private List<Method> data = new ArrayList<Method>();
-
-    public MethodListResponseResult data(List<Method> data) {
-        this.data = data;
-        return this;
-    }
-
-    public MethodListResponseResult addDataItem(Method dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Method> getData() {
-        return data;
-    }
-
-    public void setData(List<Method> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodListResponseResult methodListResponseResult = (MethodListResponseResult) o;
-        return Objects.equals(this.data, methodListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodNewRequest.java
deleted file mode 100644
index a8974320..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodNewRequest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import java.util.Objects;
-
-/**
- * MethodNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class MethodNewRequest {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash();
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodNewRequest {\n");
-
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodOntologyReference.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodOntologyReference.java
deleted file mode 100644
index 52b4b4b3..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodOntologyReference.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).
- */
-@Schema(description = "MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class MethodOntologyReference {
-    @SerializedName("documentationLinks")
-    private List<MethodOntologyReferenceDocumentationLinks> documentationLinks = null;
-
-    @SerializedName("ontologyDbId")
-    private String ontologyDbId = null;
-
-    @SerializedName("ontologyName")
-    private String ontologyName = null;
-
-    @SerializedName("version")
-    private String version = null;
-
-    public MethodOntologyReference documentationLinks(List<MethodOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-        return this;
-    }
-
-    public MethodOntologyReference addDocumentationLinksItem(MethodOntologyReferenceDocumentationLinks documentationLinksItem) {
-        if (this.documentationLinks == null) {
-            this.documentationLinks = new ArrayList<MethodOntologyReferenceDocumentationLinks>();
-        }
-        this.documentationLinks.add(documentationLinksItem);
-        return this;
-    }
-
-    /**
-     * links to various ontology documentation
-     *
-     * @return documentationLinks
-     **/
-    @Schema(description = "links to various ontology documentation")
-    public List<MethodOntologyReferenceDocumentationLinks> getDocumentationLinks() {
-        return documentationLinks;
-    }
-
-    public void setDocumentationLinks(List<MethodOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-    }
-
-    public MethodOntologyReference ontologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-        return this;
-    }
-
-    /**
-     * Ontology database unique identifier
-     *
-     * @return ontologyDbId
-     **/
-    @Schema(example = "6b071868", required = true, description = "Ontology database unique identifier")
-    public String getOntologyDbId() {
-        return ontologyDbId;
-    }
-
-    public void setOntologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-    }
-
-    public MethodOntologyReference ontologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-        return this;
-    }
-
-    /**
-     * Ontology name
-     *
-     * @return ontologyName
-     **/
-    @Schema(example = "The Crop Ontology", required = true, description = "Ontology name")
-    public String getOntologyName() {
-        return ontologyName;
-    }
-
-    public void setOntologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-    }
-
-    public MethodOntologyReference version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    /**
-     * Ontology version (no specific format)
-     *
-     * @return version
-     **/
-    @Schema(example = "7.2.3", description = "Ontology version (no specific format)")
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodOntologyReference methodOntologyReference = (MethodOntologyReference) o;
-        return Objects.equals(this.documentationLinks, methodOntologyReference.documentationLinks) &&
-                Objects.equals(this.ontologyDbId, methodOntologyReference.ontologyDbId) &&
-                Objects.equals(this.ontologyName, methodOntologyReference.ontologyName) &&
-                Objects.equals(this.version, methodOntologyReference.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(documentationLinks, ontologyDbId, ontologyName, version);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodOntologyReference {\n");
-
-        sb.append("    documentationLinks: ").append(toIndentedString(documentationLinks)).append("\n");
-        sb.append("    ontologyDbId: ").append(toIndentedString(ontologyDbId)).append("\n");
-        sb.append("    ontologyName: ").append(toIndentedString(ontologyName)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodOntologyReferenceDocumentationLinks.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodOntologyReferenceDocumentationLinks.java
deleted file mode 100644
index d748424b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodOntologyReferenceDocumentationLinks.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * MethodOntologyReferenceDocumentationLinks
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class MethodOntologyReferenceDocumentationLinks {
-    @SerializedName("URL")
-    private String URL = null;
-
-    /**
-     * Gets or Sets type
-     */
-    @JsonAdapter(TypeEnum.Adapter.class)
-    public enum TypeEnum {
-        OBO("OBO"),
-        RDF("RDF"),
-        WEBPAGE("WEBPAGE");
-
-        private String value;
-
-        TypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static TypeEnum fromValue(String input) {
-            for (TypeEnum b : TypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<TypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final TypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public TypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return TypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("type")
-    private TypeEnum type = null;
-
-    public MethodOntologyReferenceDocumentationLinks URL(String URL) {
-        this.URL = URL;
-        return this;
-    }
-
-    /**
-     * Get URL
-     *
-     * @return URL
-     **/
-    @Schema(example = "http://purl.obolibrary.org/obo/ro.owl", description = "")
-    public String getURL() {
-        return URL;
-    }
-
-    public void setURL(String URL) {
-        this.URL = URL;
-    }
-
-    public MethodOntologyReferenceDocumentationLinks type(TypeEnum type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * Get type
-     *
-     * @return type
-     **/
-    @Schema(example = "OBO", description = "")
-    public TypeEnum getType() {
-        return type;
-    }
-
-    public void setType(TypeEnum type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodOntologyReferenceDocumentationLinks methodOntologyReferenceDocumentationLinks = (MethodOntologyReferenceDocumentationLinks) o;
-        return Objects.equals(this.URL, methodOntologyReferenceDocumentationLinks.URL) &&
-                Objects.equals(this.type, methodOntologyReferenceDocumentationLinks.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(URL, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodOntologyReferenceDocumentationLinks {\n");
-
-        sb.append("    URL: ").append(toIndentedString(URL)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodSingleResponse.java
deleted file mode 100644
index 0ebb9018..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/MethodSingleResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * MethodSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class MethodSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Method result = null;
-
-    public MethodSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public MethodSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public MethodSingleResponse result(Method result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Method getResult() {
-        return result;
-    }
-
-    public void setResult(Method result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodSingleResponse methodSingleResponse = (MethodSingleResponse) o;
-        return Objects.equals(this._atContext, methodSingleResponse._atContext) &&
-                Objects.equals(this.metadata, methodSingleResponse.metadata) &&
-                Objects.equals(this.result, methodSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Model202AcceptedSearchResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Model202AcceptedSearchResponse.java
deleted file mode 100644
index 50f31b8c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Model202AcceptedSearchResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Model202AcceptedSearchResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class Model202AcceptedSearchResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Model202AcceptedSearchResponseResult result = null;
-
-    public Model202AcceptedSearchResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public Model202AcceptedSearchResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public Model202AcceptedSearchResponse result(Model202AcceptedSearchResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(description = "")
-    public Model202AcceptedSearchResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(Model202AcceptedSearchResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Model202AcceptedSearchResponse _202AcceptedSearchResponse = (Model202AcceptedSearchResponse) o;
-        return Objects.equals(this._atContext, _202AcceptedSearchResponse._atContext) &&
-                Objects.equals(this.metadata, _202AcceptedSearchResponse.metadata) &&
-                Objects.equals(this.result, _202AcceptedSearchResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Model202AcceptedSearchResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Model202AcceptedSearchResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Model202AcceptedSearchResponseResult.java
deleted file mode 100644
index 768c310f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Model202AcceptedSearchResponseResult.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Model202AcceptedSearchResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class Model202AcceptedSearchResponseResult {
-    @SerializedName("searchResultsDbId")
-    private String searchResultsDbId = null;
-
-    public Model202AcceptedSearchResponseResult searchResultsDbId(String searchResultsDbId) {
-        this.searchResultsDbId = searchResultsDbId;
-        return this;
-    }
-
-    /**
-     * Get searchResultsDbId
-     *
-     * @return searchResultsDbId
-     **/
-    @Schema(example = "551ae08c", description = "")
-    public String getSearchResultsDbId() {
-        return searchResultsDbId;
-    }
-
-    public void setSearchResultsDbId(String searchResultsDbId) {
-        this.searchResultsDbId = searchResultsDbId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Model202AcceptedSearchResponseResult _202AcceptedSearchResponseResult = (Model202AcceptedSearchResponseResult) o;
-        return Objects.equals(this.searchResultsDbId, _202AcceptedSearchResponseResult.searchResultsDbId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(searchResultsDbId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Model202AcceptedSearchResponseResult {\n");
-
-        sb.append("    searchResultsDbId: ").append(toIndentedString(searchResultsDbId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Observation.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Observation.java
deleted file mode 100644
index 9dd79960..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Observation.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * Observation
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Observation {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("collector")
-    private String collector = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("geoCoordinates")
-    private GeoJSON geoCoordinates = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("observationDbId")
-    private String observationDbId = null;
-
-    @SerializedName("observationTimeStamp")
-    private OffsetDateTime observationTimeStamp = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    @SerializedName("observationUnitName")
-    private String observationUnitName = null;
-
-    @SerializedName("observationVariableDbId")
-    private String observationVariableDbId = null;
-
-    @SerializedName("observationVariableName")
-    private String observationVariableName = null;
-
-    @SerializedName("season")
-    private ObservationSeason season = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("uploadedBy")
-    private String uploadedBy = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    public Observation additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Observation putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Observation collector(String collector) {
-        this.collector = collector;
-        return this;
-    }
-
-    /**
-     * The name or identifier of the entity which collected the observation
-     *
-     * @return collector
-     **/
-    @Schema(example = "917d3ae0", description = "The name or identifier of the entity which collected the observation")
-    public String getCollector() {
-        return collector;
-    }
-
-    public void setCollector(String collector) {
-        this.collector = collector;
-    }
-
-    public Observation externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Observation addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Observation geoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-        return this;
-    }
-
-    /**
-     * Get geoCoordinates
-     *
-     * @return geoCoordinates
-     **/
-    @Schema(description = "")
-    public GeoJSON getGeoCoordinates() {
-        return geoCoordinates;
-    }
-
-    public void setGeoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-    }
-
-    public Observation germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "2408ab11", description = "The ID which uniquely identifies a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public Observation germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * Name of the germplasm. It can be the preferred name and does not have to be unique.
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000003", description = "Name of the germplasm. It can be the preferred name and does not have to be unique.")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public Observation observationDbId(String observationDbId) {
-        this.observationDbId = observationDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation
-     *
-     * @return observationDbId
-     **/
-    @Schema(example = "ef24b615", description = "The ID which uniquely identifies an observation")
-    public String getObservationDbId() {
-        return observationDbId;
-    }
-
-    public void setObservationDbId(String observationDbId) {
-        this.observationDbId = observationDbId;
-    }
-
-    public Observation observationTimeStamp(OffsetDateTime observationTimeStamp) {
-        this.observationTimeStamp = observationTimeStamp;
-        return this;
-    }
-
-    /**
-     * The date and time when this observation was made
-     *
-     * @return observationTimeStamp
-     **/
-    @Schema(description = "The date and time when this observation was made")
-    public OffsetDateTime getObservationTimeStamp() {
-        return observationTimeStamp;
-    }
-
-    public void setObservationTimeStamp(OffsetDateTime observationTimeStamp) {
-        this.observationTimeStamp = observationTimeStamp;
-    }
-
-    public Observation observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation unit
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "598111d4", description = "The ID which uniquely identifies an observation unit")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-    public Observation observationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-        return this;
-    }
-
-    /**
-     * A human readable name for an observation unit
-     *
-     * @return observationUnitName
-     **/
-    @Schema(example = "Plot 1", description = "A human readable name for an observation unit")
-    public String getObservationUnitName() {
-        return observationUnitName;
-    }
-
-    public void setObservationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-    }
-
-    public Observation observationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation variable
-     *
-     * @return observationVariableDbId
-     **/
-    @Schema(example = "c403d107", description = "The ID which uniquely identifies an observation variable")
-    public String getObservationVariableDbId() {
-        return observationVariableDbId;
-    }
-
-    public void setObservationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-    }
-
-    public Observation observationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-        return this;
-    }
-
-    /**
-     * A human readable name for an observation variable
-     *
-     * @return observationVariableName
-     **/
-    @Schema(example = "Plant Height in meters", description = "A human readable name for an observation variable")
-    public String getObservationVariableName() {
-        return observationVariableName;
-    }
-
-    public void setObservationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-    }
-
-    public Observation season(ObservationSeason season) {
-        this.season = season;
-        return this;
-    }
-
-    /**
-     * Get season
-     *
-     * @return season
-     **/
-    @Schema(description = "")
-    public ObservationSeason getSeason() {
-        return season;
-    }
-
-    public void setSeason(ObservationSeason season) {
-        this.season = season;
-    }
-
-    public Observation studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a study within the given database server
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "ef2829db", description = "The ID which uniquely identifies a study within the given database server")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public Observation uploadedBy(String uploadedBy) {
-        this.uploadedBy = uploadedBy;
-        return this;
-    }
-
-    /**
-     * The name or id of the user who uploaded the observation to the database system
-     *
-     * @return uploadedBy
-     **/
-    @Schema(example = "a2f7f60b", description = "The name or id of the user who uploaded the observation to the database system")
-    public String getUploadedBy() {
-        return uploadedBy;
-    }
-
-    public void setUploadedBy(String uploadedBy) {
-        this.uploadedBy = uploadedBy;
-    }
-
-    public Observation value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * The value of the data collected as an observation
-     *
-     * @return value
-     **/
-    @Schema(example = "2.3", description = "The value of the data collected as an observation")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Observation observation = (Observation) o;
-        return Objects.equals(this.additionalInfo, observation.additionalInfo) &&
-                Objects.equals(this.collector, observation.collector) &&
-                Objects.equals(this.externalReferences, observation.externalReferences) &&
-                Objects.equals(this.geoCoordinates, observation.geoCoordinates) &&
-                Objects.equals(this.germplasmDbId, observation.germplasmDbId) &&
-                Objects.equals(this.germplasmName, observation.germplasmName) &&
-                Objects.equals(this.observationDbId, observation.observationDbId) &&
-                Objects.equals(this.observationTimeStamp, observation.observationTimeStamp) &&
-                Objects.equals(this.observationUnitDbId, observation.observationUnitDbId) &&
-                Objects.equals(this.observationUnitName, observation.observationUnitName) &&
-                Objects.equals(this.observationVariableDbId, observation.observationVariableDbId) &&
-                Objects.equals(this.observationVariableName, observation.observationVariableName) &&
-                Objects.equals(this.season, observation.season) &&
-                Objects.equals(this.studyDbId, observation.studyDbId) &&
-                Objects.equals(this.uploadedBy, observation.uploadedBy) &&
-                Objects.equals(this.value, observation.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, collector, externalReferences, geoCoordinates, germplasmDbId, germplasmName, observationDbId, observationTimeStamp, observationUnitDbId, observationUnitName, observationVariableDbId, observationVariableName, season, studyDbId, uploadedBy, value);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Observation {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    collector: ").append(toIndentedString(collector)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    geoCoordinates: ").append(toIndentedString(geoCoordinates)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    observationDbId: ").append(toIndentedString(observationDbId)).append("\n");
-        sb.append("    observationTimeStamp: ").append(toIndentedString(observationTimeStamp)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("    observationUnitName: ").append(toIndentedString(observationUnitName)).append("\n");
-        sb.append("    observationVariableDbId: ").append(toIndentedString(observationVariableDbId)).append("\n");
-        sb.append("    observationVariableName: ").append(toIndentedString(observationVariableName)).append("\n");
-        sb.append("    season: ").append(toIndentedString(season)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    uploadedBy: ").append(toIndentedString(uploadedBy)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationDeleteResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationDeleteResponse.java
deleted file mode 100644
index 37c0054a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationDeleteResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationDeleteResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationDeleteResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationDeleteResponseResult result = null;
-
-    public ObservationDeleteResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationDeleteResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationDeleteResponse result(ObservationDeleteResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationDeleteResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationDeleteResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationDeleteResponse observationDeleteResponse = (ObservationDeleteResponse) o;
-        return Objects.equals(this._atContext, observationDeleteResponse._atContext) &&
-                Objects.equals(this.metadata, observationDeleteResponse.metadata) &&
-                Objects.equals(this.result, observationDeleteResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationDeleteResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationDeleteResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationDeleteResponseResult.java
deleted file mode 100644
index 1ac5e566..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationDeleteResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationDeleteResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationDeleteResponseResult {
-    @SerializedName("observationDbIds")
-    private List<String> observationDbIds = new ArrayList<String>();
-
-    public ObservationDeleteResponseResult observationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-        return this;
-    }
-
-    public ObservationDeleteResponseResult addObservationDbIdsItem(String observationDbIdsItem) {
-        this.observationDbIds.add(observationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique ids of the Observation records which have been successfully deleted
-     *
-     * @return observationDbIds
-     **/
-    @Schema(example = "[\"6a4a59d8\",\"3ff067e0\"]", required = true, description = "The unique ids of the Observation records which have been successfully deleted")
-    public List<String> getObservationDbIds() {
-        return observationDbIds;
-    }
-
-    public void setObservationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationDeleteResponseResult observationDeleteResponseResult = (ObservationDeleteResponseResult) o;
-        return Objects.equals(this.observationDbIds, observationDeleteResponseResult.observationDbIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(observationDbIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationDeleteResponseResult {\n");
-
-        sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationLevelListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationLevelListResponse.java
deleted file mode 100644
index 1908fdb8..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationLevelListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationLevelListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationLevelListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationLevelListResponseResult result = null;
-
-    public ObservationLevelListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationLevelListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationLevelListResponse result(ObservationLevelListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationLevelListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationLevelListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationLevelListResponse observationLevelListResponse = (ObservationLevelListResponse) o;
-        return Objects.equals(this._atContext, observationLevelListResponse._atContext) &&
-                Objects.equals(this.metadata, observationLevelListResponse.metadata) &&
-                Objects.equals(this.result, observationLevelListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationLevelListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationLevelListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationLevelListResponseResult.java
deleted file mode 100644
index 33f9130a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationLevelListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationLevelListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationLevelListResponseResult {
-    @SerializedName("data")
-    private List<ObservationUnitHierarchyLevel> data = new ArrayList<ObservationUnitHierarchyLevel>();
-
-    public ObservationLevelListResponseResult data(List<ObservationUnitHierarchyLevel> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ObservationLevelListResponseResult addDataItem(ObservationUnitHierarchyLevel dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(example = "[{\"levelName\":\"field\",\"levelOrder\":0},{\"levelName\":\"block\",\"levelOrder\":1},{\"levelName\":\"plot\",\"levelOrder\":2},{\"levelName\":\"sub-plot\",\"levelOrder\":3},{\"levelName\":\"plant\",\"levelOrder\":4}]", required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<ObservationUnitHierarchyLevel> getData() {
-        return data;
-    }
-
-    public void setData(List<ObservationUnitHierarchyLevel> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationLevelListResponseResult observationLevelListResponseResult = (ObservationLevelListResponseResult) o;
-        return Objects.equals(this.data, observationLevelListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationLevelListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationListResponse.java
deleted file mode 100644
index 449f7825..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationListResponseResult result = null;
-
-    public ObservationListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationListResponse result(ObservationListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationListResponse observationListResponse = (ObservationListResponse) o;
-        return Objects.equals(this._atContext, observationListResponse._atContext) &&
-                Objects.equals(this.metadata, observationListResponse.metadata) &&
-                Objects.equals(this.result, observationListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationListResponseResult.java
deleted file mode 100644
index df5db29f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationListResponseResult {
-    @SerializedName("data")
-    private List<Observation> data = new ArrayList<Observation>();
-
-    public ObservationListResponseResult data(List<Observation> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ObservationListResponseResult addDataItem(Observation dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Observation> getData() {
-        return data;
-    }
-
-    public void setData(List<Observation> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationListResponseResult observationListResponseResult = (ObservationListResponseResult) o;
-        return Objects.equals(this.data, observationListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationNewRequest.java
deleted file mode 100644
index 886d1fe3..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationNewRequest.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * ObservationNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("collector")
-    private String collector = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("geoCoordinates")
-    private GeoJSON geoCoordinates = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("observationTimeStamp")
-    private OffsetDateTime observationTimeStamp = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    @SerializedName("observationUnitName")
-    private String observationUnitName = null;
-
-    @SerializedName("observationVariableDbId")
-    private String observationVariableDbId = null;
-
-    @SerializedName("observationVariableName")
-    private String observationVariableName = null;
-
-    @SerializedName("season")
-    private ObservationSeason season = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("uploadedBy")
-    private String uploadedBy = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    public ObservationNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationNewRequest collector(String collector) {
-        this.collector = collector;
-        return this;
-    }
-
-    /**
-     * The name or identifier of the entity which collected the observation
-     *
-     * @return collector
-     **/
-    @Schema(example = "917d3ae0", description = "The name or identifier of the entity which collected the observation")
-    public String getCollector() {
-        return collector;
-    }
-
-    public void setCollector(String collector) {
-        this.collector = collector;
-    }
-
-    public ObservationNewRequest externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationNewRequest addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationNewRequest geoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-        return this;
-    }
-
-    /**
-     * Get geoCoordinates
-     *
-     * @return geoCoordinates
-     **/
-    @Schema(description = "")
-    public GeoJSON getGeoCoordinates() {
-        return geoCoordinates;
-    }
-
-    public void setGeoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-    }
-
-    public ObservationNewRequest germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "2408ab11", description = "The ID which uniquely identifies a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public ObservationNewRequest germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * Name of the germplasm. It can be the preferred name and does not have to be unique.
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000003", description = "Name of the germplasm. It can be the preferred name and does not have to be unique.")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public ObservationNewRequest observationTimeStamp(OffsetDateTime observationTimeStamp) {
-        this.observationTimeStamp = observationTimeStamp;
-        return this;
-    }
-
-    /**
-     * The date and time when this observation was made
-     *
-     * @return observationTimeStamp
-     **/
-    @Schema(description = "The date and time when this observation was made")
-    public OffsetDateTime getObservationTimeStamp() {
-        return observationTimeStamp;
-    }
-
-    public void setObservationTimeStamp(OffsetDateTime observationTimeStamp) {
-        this.observationTimeStamp = observationTimeStamp;
-    }
-
-    public ObservationNewRequest observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation unit
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "598111d4", description = "The ID which uniquely identifies an observation unit")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-    public ObservationNewRequest observationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-        return this;
-    }
-
-    /**
-     * A human readable name for an observation unit
-     *
-     * @return observationUnitName
-     **/
-    @Schema(example = "Plot 1", description = "A human readable name for an observation unit")
-    public String getObservationUnitName() {
-        return observationUnitName;
-    }
-
-    public void setObservationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-    }
-
-    public ObservationNewRequest observationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation variable
-     *
-     * @return observationVariableDbId
-     **/
-    @Schema(example = "c403d107", description = "The ID which uniquely identifies an observation variable")
-    public String getObservationVariableDbId() {
-        return observationVariableDbId;
-    }
-
-    public void setObservationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-    }
-
-    public ObservationNewRequest observationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-        return this;
-    }
-
-    /**
-     * A human readable name for an observation variable
-     *
-     * @return observationVariableName
-     **/
-    @Schema(example = "Plant Height in meters", description = "A human readable name for an observation variable")
-    public String getObservationVariableName() {
-        return observationVariableName;
-    }
-
-    public void setObservationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-    }
-
-    public ObservationNewRequest season(ObservationSeason season) {
-        this.season = season;
-        return this;
-    }
-
-    /**
-     * Get season
-     *
-     * @return season
-     **/
-    @Schema(description = "")
-    public ObservationSeason getSeason() {
-        return season;
-    }
-
-    public void setSeason(ObservationSeason season) {
-        this.season = season;
-    }
-
-    public ObservationNewRequest studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a study within the given database server
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "ef2829db", description = "The ID which uniquely identifies a study within the given database server")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public ObservationNewRequest uploadedBy(String uploadedBy) {
-        this.uploadedBy = uploadedBy;
-        return this;
-    }
-
-    /**
-     * The name or id of the user who uploaded the observation to the database system
-     *
-     * @return uploadedBy
-     **/
-    @Schema(example = "a2f7f60b", description = "The name or id of the user who uploaded the observation to the database system")
-    public String getUploadedBy() {
-        return uploadedBy;
-    }
-
-    public void setUploadedBy(String uploadedBy) {
-        this.uploadedBy = uploadedBy;
-    }
-
-    public ObservationNewRequest value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * The value of the data collected as an observation
-     *
-     * @return value
-     **/
-    @Schema(example = "2.3", description = "The value of the data collected as an observation")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationNewRequest observationNewRequest = (ObservationNewRequest) o;
-        return Objects.equals(this.additionalInfo, observationNewRequest.additionalInfo) &&
-                Objects.equals(this.collector, observationNewRequest.collector) &&
-                Objects.equals(this.externalReferences, observationNewRequest.externalReferences) &&
-                Objects.equals(this.geoCoordinates, observationNewRequest.geoCoordinates) &&
-                Objects.equals(this.germplasmDbId, observationNewRequest.germplasmDbId) &&
-                Objects.equals(this.germplasmName, observationNewRequest.germplasmName) &&
-                Objects.equals(this.observationTimeStamp, observationNewRequest.observationTimeStamp) &&
-                Objects.equals(this.observationUnitDbId, observationNewRequest.observationUnitDbId) &&
-                Objects.equals(this.observationUnitName, observationNewRequest.observationUnitName) &&
-                Objects.equals(this.observationVariableDbId, observationNewRequest.observationVariableDbId) &&
-                Objects.equals(this.observationVariableName, observationNewRequest.observationVariableName) &&
-                Objects.equals(this.season, observationNewRequest.season) &&
-                Objects.equals(this.studyDbId, observationNewRequest.studyDbId) &&
-                Objects.equals(this.uploadedBy, observationNewRequest.uploadedBy) &&
-                Objects.equals(this.value, observationNewRequest.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, collector, externalReferences, geoCoordinates, germplasmDbId, germplasmName, observationTimeStamp, observationUnitDbId, observationUnitName, observationVariableDbId, observationVariableName, season, studyDbId, uploadedBy, value);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    collector: ").append(toIndentedString(collector)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    geoCoordinates: ").append(toIndentedString(geoCoordinates)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    observationTimeStamp: ").append(toIndentedString(observationTimeStamp)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("    observationUnitName: ").append(toIndentedString(observationUnitName)).append("\n");
-        sb.append("    observationVariableDbId: ").append(toIndentedString(observationVariableDbId)).append("\n");
-        sb.append("    observationVariableName: ").append(toIndentedString(observationVariableName)).append("\n");
-        sb.append("    season: ").append(toIndentedString(season)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    uploadedBy: ").append(toIndentedString(uploadedBy)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationSearchRequest.java
deleted file mode 100644
index e14d5388..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationSearchRequest.java
+++ /dev/null
@@ -1,867 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationSearchRequest {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("locationDbIds")
-    private List<String> locationDbIds = null;
-
-    @SerializedName("locationNames")
-    private List<String> locationNames = null;
-
-    @SerializedName("observationDbIds")
-    private List<String> observationDbIds = null;
-
-    @SerializedName("observationLevelRelationships")
-    private List<ObservationUnitLevelRelationship1> observationLevelRelationships = null;
-
-    @SerializedName("observationLevels")
-    private List<ObservationUnitLevel1> observationLevels = null;
-
-    @SerializedName("observationTimeStampRangeEnd")
-    private OffsetDateTime observationTimeStampRangeEnd = null;
-
-    @SerializedName("observationTimeStampRangeStart")
-    private OffsetDateTime observationTimeStampRangeStart = null;
-
-    @SerializedName("observationUnitDbIds")
-    private List<String> observationUnitDbIds = null;
-
-    @SerializedName("observationVariableDbIds")
-    private List<String> observationVariableDbIds = null;
-
-    @SerializedName("observationVariableNames")
-    private List<String> observationVariableNames = null;
-
-    @SerializedName("observationVariablePUIs")
-    private List<String> observationVariablePUIs = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("seasonDbIds")
-    private List<String> seasonDbIds = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public ObservationSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public ObservationSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public ObservationSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public ObservationSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public ObservationSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public ObservationSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public ObservationSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public ObservationSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public ObservationSearchRequest germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public ObservationSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public ObservationSearchRequest locationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addLocationDbIdsItem(String locationDbIdsItem) {
-        if (this.locationDbIds == null) {
-            this.locationDbIds = new ArrayList<String>();
-        }
-        this.locationDbIds.add(locationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The location ids to search for
-     *
-     * @return locationDbIds
-     **/
-    @Schema(example = "[\"b28911cf\",\"5071d1e4\"]", description = "The location ids to search for")
-    public List<String> getLocationDbIds() {
-        return locationDbIds;
-    }
-
-    public void setLocationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-    }
-
-    public ObservationSearchRequest locationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-        return this;
-    }
-
-    public ObservationSearchRequest addLocationNamesItem(String locationNamesItem) {
-        if (this.locationNames == null) {
-            this.locationNames = new ArrayList<String>();
-        }
-        this.locationNames.add(locationNamesItem);
-        return this;
-    }
-
-    /**
-     * A human readable names to search for
-     *
-     * @return locationNames
-     **/
-    @Schema(example = "[\"Location Alpha\",\"The Large Hadron Collider\"]", description = "A human readable names to search for")
-    public List<String> getLocationNames() {
-        return locationNames;
-    }
-
-    public void setLocationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-    }
-
-    public ObservationSearchRequest observationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addObservationDbIdsItem(String observationDbIdsItem) {
-        if (this.observationDbIds == null) {
-            this.observationDbIds = new ArrayList<String>();
-        }
-        this.observationDbIds.add(observationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique id of an Observation
-     *
-     * @return observationDbIds
-     **/
-    @Schema(example = "[\"6a4a59d8\",\"3ff067e0\"]", description = "The unique id of an Observation")
-    public List<String> getObservationDbIds() {
-        return observationDbIds;
-    }
-
-    public void setObservationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-    }
-
-    public ObservationSearchRequest observationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-        return this;
-    }
-
-    public ObservationSearchRequest addObservationLevelRelationshipsItem(ObservationUnitLevelRelationship1 observationLevelRelationshipsItem) {
-        if (this.observationLevelRelationships == null) {
-            this.observationLevelRelationships = new ArrayList<ObservationUnitLevelRelationship1>();
-        }
-        this.observationLevelRelationships.add(observationLevelRelationshipsItem);
-        return this;
-    }
-
-    /**
-     * Searches for values in ObservationUnit-&gt;observationUnitPosition-&gt;observationLevelRelationships
-     *
-     * @return observationLevelRelationships
-     **/
-    @Schema(example = "[{\"levelCode\":\"Field_1\",\"levelName\":\"field\"}]", description = "Searches for values in ObservationUnit->observationUnitPosition->observationLevelRelationships")
-    public List<ObservationUnitLevelRelationship1> getObservationLevelRelationships() {
-        return observationLevelRelationships;
-    }
-
-    public void setObservationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-    }
-
-    public ObservationSearchRequest observationLevels(List<ObservationUnitLevel1> observationLevels) {
-        this.observationLevels = observationLevels;
-        return this;
-    }
-
-    public ObservationSearchRequest addObservationLevelsItem(ObservationUnitLevel1 observationLevelsItem) {
-        if (this.observationLevels == null) {
-            this.observationLevels = new ArrayList<ObservationUnitLevel1>();
-        }
-        this.observationLevels.add(observationLevelsItem);
-        return this;
-    }
-
-    /**
-     * Searches for values in ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel
-     *
-     * @return observationLevels
-     **/
-    @Schema(example = "[{\"levelCode\":\"Plot_123\",\"levelName\":\"plot\"},{\"levelCode\":\"Plot_456\",\"levelName\":\"plot\"},{\"levelCode\":\"Plot_789\",\"levelName\":\"plot\"}]", description = "Searches for values in ObservationUnit->observationUnitPosition->observationLevel")
-    public List<ObservationUnitLevel1> getObservationLevels() {
-        return observationLevels;
-    }
-
-    public void setObservationLevels(List<ObservationUnitLevel1> observationLevels) {
-        this.observationLevels = observationLevels;
-    }
-
-    public ObservationSearchRequest observationTimeStampRangeEnd(OffsetDateTime observationTimeStampRangeEnd) {
-        this.observationTimeStampRangeEnd = observationTimeStampRangeEnd;
-        return this;
-    }
-
-    /**
-     * Timestamp range end
-     *
-     * @return observationTimeStampRangeEnd
-     **/
-    @Schema(description = "Timestamp range end")
-    public OffsetDateTime getObservationTimeStampRangeEnd() {
-        return observationTimeStampRangeEnd;
-    }
-
-    public void setObservationTimeStampRangeEnd(OffsetDateTime observationTimeStampRangeEnd) {
-        this.observationTimeStampRangeEnd = observationTimeStampRangeEnd;
-    }
-
-    public ObservationSearchRequest observationTimeStampRangeStart(OffsetDateTime observationTimeStampRangeStart) {
-        this.observationTimeStampRangeStart = observationTimeStampRangeStart;
-        return this;
-    }
-
-    /**
-     * Timestamp range start
-     *
-     * @return observationTimeStampRangeStart
-     **/
-    @Schema(description = "Timestamp range start")
-    public OffsetDateTime getObservationTimeStampRangeStart() {
-        return observationTimeStampRangeStart;
-    }
-
-    public void setObservationTimeStampRangeStart(OffsetDateTime observationTimeStampRangeStart) {
-        this.observationTimeStampRangeStart = observationTimeStampRangeStart;
-    }
-
-    public ObservationSearchRequest observationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-        if (this.observationUnitDbIds == null) {
-            this.observationUnitDbIds = new ArrayList<String>();
-        }
-        this.observationUnitDbIds.add(observationUnitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique id of an Observation Unit
-     *
-     * @return observationUnitDbIds
-     **/
-    @Schema(example = "[\"76f559b5\",\"066bc5d3\"]", description = "The unique id of an Observation Unit")
-    public List<String> getObservationUnitDbIds() {
-        return observationUnitDbIds;
-    }
-
-    public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-    }
-
-    public ObservationSearchRequest observationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-        if (this.observationVariableDbIds == null) {
-            this.observationVariableDbIds = new ArrayList<String>();
-        }
-        this.observationVariableDbIds.add(observationVariableDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The DbIds of Variables to search for
-     *
-     * @return observationVariableDbIds
-     **/
-    @Schema(example = "[\"a646187d\",\"6d23513b\"]", description = "The DbIds of Variables to search for")
-    public List<String> getObservationVariableDbIds() {
-        return observationVariableDbIds;
-    }
-
-    public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-    }
-
-    public ObservationSearchRequest observationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-        return this;
-    }
-
-    public ObservationSearchRequest addObservationVariableNamesItem(String observationVariableNamesItem) {
-        if (this.observationVariableNames == null) {
-            this.observationVariableNames = new ArrayList<String>();
-        }
-        this.observationVariableNames.add(observationVariableNamesItem);
-        return this;
-    }
-
-    /**
-     * The names of Variables to search for
-     *
-     * @return observationVariableNames
-     **/
-    @Schema(example = "[\"Plant Height in meters\",\"Wheat rust score 1-5\"]", description = "The names of Variables to search for")
-    public List<String> getObservationVariableNames() {
-        return observationVariableNames;
-    }
-
-    public void setObservationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-    }
-
-    public ObservationSearchRequest observationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-        return this;
-    }
-
-    public ObservationSearchRequest addObservationVariablePUIsItem(String observationVariablePUIsItem) {
-        if (this.observationVariablePUIs == null) {
-            this.observationVariablePUIs = new ArrayList<String>();
-        }
-        this.observationVariablePUIs.add(observationVariablePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI
-     *
-     * @return observationVariablePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008012\",\"http://my-traits.com/trait/CO_123:0007261\"]", description = "The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI")
-    public List<String> getObservationVariablePUIs() {
-        return observationVariablePUIs;
-    }
-
-    public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-    }
-
-    public ObservationSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public ObservationSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public ObservationSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public ObservationSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public ObservationSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public ObservationSearchRequest seasonDbIds(List<String> seasonDbIds) {
-        this.seasonDbIds = seasonDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addSeasonDbIdsItem(String seasonDbIdsItem) {
-        if (this.seasonDbIds == null) {
-            this.seasonDbIds = new ArrayList<String>();
-        }
-        this.seasonDbIds.add(seasonDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The year or Phenotyping campaign of a multi-annual study (trees, grape, ...)
-     *
-     * @return seasonDbIds
-     **/
-    @Schema(example = "[\"Spring 2018\",\"Season A\"]", description = "The year or Phenotyping campaign of a multi-annual study (trees, grape, ...)")
-    public List<String> getSeasonDbIds() {
-        return seasonDbIds;
-    }
-
-    public void setSeasonDbIds(List<String> seasonDbIds) {
-        this.seasonDbIds = seasonDbIds;
-    }
-
-    public ObservationSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public ObservationSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public ObservationSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public ObservationSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public ObservationSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public ObservationSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationSearchRequest observationSearchRequest = (ObservationSearchRequest) o;
-        return Objects.equals(this.commonCropNames, observationSearchRequest.commonCropNames) &&
-                Objects.equals(this.externalReferenceIDs, observationSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, observationSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, observationSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.germplasmDbIds, observationSearchRequest.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, observationSearchRequest.germplasmNames) &&
-                Objects.equals(this.locationDbIds, observationSearchRequest.locationDbIds) &&
-                Objects.equals(this.locationNames, observationSearchRequest.locationNames) &&
-                Objects.equals(this.observationDbIds, observationSearchRequest.observationDbIds) &&
-                Objects.equals(this.observationLevelRelationships, observationSearchRequest.observationLevelRelationships) &&
-                Objects.equals(this.observationLevels, observationSearchRequest.observationLevels) &&
-                Objects.equals(this.observationTimeStampRangeEnd, observationSearchRequest.observationTimeStampRangeEnd) &&
-                Objects.equals(this.observationTimeStampRangeStart, observationSearchRequest.observationTimeStampRangeStart) &&
-                Objects.equals(this.observationUnitDbIds, observationSearchRequest.observationUnitDbIds) &&
-                Objects.equals(this.observationVariableDbIds, observationSearchRequest.observationVariableDbIds) &&
-                Objects.equals(this.observationVariableNames, observationSearchRequest.observationVariableNames) &&
-                Objects.equals(this.observationVariablePUIs, observationSearchRequest.observationVariablePUIs) &&
-                Objects.equals(this.page, observationSearchRequest.page) &&
-                Objects.equals(this.pageSize, observationSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, observationSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, observationSearchRequest.programNames) &&
-                Objects.equals(this.seasonDbIds, observationSearchRequest.seasonDbIds) &&
-                Objects.equals(this.studyDbIds, observationSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, observationSearchRequest.studyNames) &&
-                Objects.equals(this.trialDbIds, observationSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, observationSearchRequest.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds, germplasmNames, locationDbIds, locationNames, observationDbIds, observationLevelRelationships, observationLevels, observationTimeStampRangeEnd, observationTimeStampRangeStart, observationUnitDbIds, observationVariableDbIds, observationVariableNames, observationVariablePUIs, page, pageSize, programDbIds, programNames, seasonDbIds, studyDbIds, studyNames, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationSearchRequest {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-        sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-        sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
-        sb.append("    observationLevelRelationships: ").append(toIndentedString(observationLevelRelationships)).append("\n");
-        sb.append("    observationLevels: ").append(toIndentedString(observationLevels)).append("\n");
-        sb.append("    observationTimeStampRangeEnd: ").append(toIndentedString(observationTimeStampRangeEnd)).append("\n");
-        sb.append("    observationTimeStampRangeStart: ").append(toIndentedString(observationTimeStampRangeStart)).append("\n");
-        sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-        sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-        sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
-        sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    seasonDbIds: ").append(toIndentedString(seasonDbIds)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationSeason.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationSeason.java
deleted file mode 100644
index ca917809..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationSeason.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationSeason
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationSeason {
-    @SerializedName("season")
-    private String season = null;
-
-    @SerializedName("seasonDbId")
-    private String seasonDbId = null;
-
-    @SerializedName("seasonName")
-    private String seasonName = null;
-
-    @SerializedName("year")
-    private Integer year = null;
-
-    public ObservationSeason season(String season) {
-        this.season = season;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;seasonName&#x60;. Github issue number #456  &lt;br&gt;Name of the season. ex. &#x27;Spring&#x27;, &#x27;Q2&#x27;, &#x27;Season A&#x27;, etc.
-     *
-     * @return season
-     **/
-    @Schema(example = "Spring", description = "**Deprecated in v2.1** Please use `seasonName`. Github issue number #456  <br>Name of the season. ex. 'Spring', 'Q2', 'Season A', etc.")
-    public String getSeason() {
-        return season;
-    }
-
-    public void setSeason(String season) {
-        this.season = season;
-    }
-
-    public ObservationSeason seasonDbId(String seasonDbId) {
-        this.seasonDbId = seasonDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a season. For backward compatibility it can be a string like &#x27;2012&#x27;, &#x27;1957-2004&#x27;
-     *
-     * @return seasonDbId
-     **/
-    @Schema(example = "Spring_2018", required = true, description = "The ID which uniquely identifies a season. For backward compatibility it can be a string like '2012', '1957-2004'")
-    public String getSeasonDbId() {
-        return seasonDbId;
-    }
-
-    public void setSeasonDbId(String seasonDbId) {
-        this.seasonDbId = seasonDbId;
-    }
-
-    public ObservationSeason seasonName(String seasonName) {
-        this.seasonName = seasonName;
-        return this;
-    }
-
-    /**
-     * Name of the season. ex. &#x27;Spring&#x27;, &#x27;Q2&#x27;, &#x27;Season A&#x27;, etc.
-     *
-     * @return seasonName
-     **/
-    @Schema(example = "Spring", description = "Name of the season. ex. 'Spring', 'Q2', 'Season A', etc.")
-    public String getSeasonName() {
-        return seasonName;
-    }
-
-    public void setSeasonName(String seasonName) {
-        this.seasonName = seasonName;
-    }
-
-    public ObservationSeason year(Integer year) {
-        this.year = year;
-        return this;
-    }
-
-    /**
-     * The 4 digit year of the season.
-     *
-     * @return year
-     **/
-    @Schema(example = "2018", description = "The 4 digit year of the season.")
-    public Integer getYear() {
-        return year;
-    }
-
-    public void setYear(Integer year) {
-        this.year = year;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationSeason observationSeason = (ObservationSeason) o;
-        return Objects.equals(this.season, observationSeason.season) &&
-                Objects.equals(this.seasonDbId, observationSeason.seasonDbId) &&
-                Objects.equals(this.seasonName, observationSeason.seasonName) &&
-                Objects.equals(this.year, observationSeason.year);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(season, seasonDbId, seasonName, year);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationSeason {\n");
-
-        sb.append("    season: ").append(toIndentedString(season)).append("\n");
-        sb.append("    seasonDbId: ").append(toIndentedString(seasonDbId)).append("\n");
-        sb.append("    seasonName: ").append(toIndentedString(seasonName)).append("\n");
-        sb.append("    year: ").append(toIndentedString(year)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationSingleResponse.java
deleted file mode 100644
index 3cfc2f72..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationSingleResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Observation result = null;
-
-    public ObservationSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationSingleResponse result(Observation result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Observation getResult() {
-        return result;
-    }
-
-    public void setResult(Observation result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationSingleResponse observationSingleResponse = (ObservationSingleResponse) o;
-        return Objects.equals(this._atContext, observationSingleResponse._atContext) &&
-                Objects.equals(this.metadata, observationSingleResponse.metadata) &&
-                Objects.equals(this.result, observationSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationTable.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationTable.java
deleted file mode 100644
index a09644b0..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationTable.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationTable
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationTable {
-    @SerializedName("data")
-    private List<List<String>> data = null;
-
-    /**
-     * valid header fields
-     */
-    @JsonAdapter(HeaderRowEnum.Adapter.class)
-    public enum HeaderRowEnum {
-        OBSERVATIONTIMESTAMP("observationTimeStamp"),
-        OBSERVATIONUNITDBID("observationUnitDbId"),
-        OBSERVATIONUNITNAME("observationUnitName"),
-        STUDYDBID("studyDbId"),
-        STUDYNAME("studyName"),
-        GERMPLASMDBID("germplasmDbId"),
-        GERMPLASMNAME("germplasmName"),
-        POSITIONCOORDINATEX("positionCoordinateX"),
-        POSITIONCOORDINATEY("positionCoordinateY"),
-        YEAR("year"),
-        FIELD("field"),
-        PLOT("plot"),
-        SUB_PLOT("sub-plot"),
-        PLANT("plant"),
-        POT("pot"),
-        BLOCK("block"),
-        ENTRY("entry"),
-        REP("rep");
-
-        private String value;
-
-        HeaderRowEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static HeaderRowEnum fromValue(String input) {
-            for (HeaderRowEnum b : HeaderRowEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<HeaderRowEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final HeaderRowEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public HeaderRowEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return HeaderRowEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("headerRow")
-    private List<HeaderRowEnum> headerRow = null;
-
-    @SerializedName("observationVariables")
-    private List<ObservationTableObservationVariables> observationVariables = null;
-
-    public ObservationTable data(List<List<String>> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ObservationTable addDataItem(List<String> dataItem) {
-        if (this.data == null) {
-            this.data = new ArrayList<List<String>>();
-        }
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The 2D matrix of observation data. ObservationVariables and other metadata are the columns, ObservationUnits are the rows.
-     *
-     * @return data
-     **/
-    @Schema(example = "[[\"2019-09-10T18:13:27.223Z\",\"f3a8a3db\",\"Plant Alpha\",\"0fe3e48b\",\"2017 Plant Study\",\"06307ec0\",\"A0043001\",\"76.50106681\",\"42.44409301\",\"2017\",\"Field_1\",\"Plot_11\",\"SubPlot_111\",\"Plant_1111\",\"Pot_1111\",\"Block_11\",\"Entry_11\",\"Rep_11\",\"25.3\",\"\",\"\",\"\"],[\"2019-09-10T18:14:27.223Z\",\"f3a8a3db\",\"Plant Alpha\",\"0fe3e48b\",\"2017 Plant Study\",\"06307ec0\",\"A0043001\",\"76.50106681\",\"42.44409301\",\"2017\",\"Field_1\",\"Plot_11\",\"SubPlot_111\",\"Plant_1111\",\"Pot_1111\",\"Block_11\",\"Entry_11\",\"Rep_11\",\"\",\"3\",\"\",\"\"],[\"2019-09-10T18:15:54.868Z\",\"05d1b011\",\"Plant Beta\",\"0fe3e48b\",\"2017 Plant Study\",\"59d435cd\",\"A0043002\",\"76.50106683\",\"42.44409301\",\"2017\",\"Field_1\",\"Plot_11\",\"SubPlot_112\",\"Plant_1122\",\"Pot_1122\",\"Block_11\",\"Entry_11\",\"Rep_12\",\"27.9\",\"\",\"\",\"\"],[\"2019-09-10T18:16:54.868Z\",\"05d1b011\",\"Plant Beta\",\"0fe3e48b\",\"2017 Plant Study\",\"59d435cd\",\"A0043002\",\"76.50106683\",\"42.44409301\",\"2017\",\"Field_1\",\"Plot_11\",\"SubPlot_112\",\"Plant_1122\",\"Pot_1122\",\"Block_11\",\"Entry_11\",\"Rep_12\",\"\",\"1\",\"\",\"\"],[\"2019-09-10T18:17:34.433Z\",\"67e2d87c\",\"Plant Gamma\",\"0fe3e48b\",\"2017 Plant Study\",\"06307ec0\",\"A0043001\",\"76.50106681\",\"42.44409356\",\"2017\",\"Field_1\",\"Plot_12\",\"SubPlot_123\",\"Plant_1233\",\"Pot_1233\",\"Block_12\",\"Entry_12\",\"Rep_11\",\"\",\"3\",\"\",\"\"],[\"2019-09-10T18:18:34.433Z\",\"67e2d87c\",\"Plant Gamma\",\"0fe3e48b\",\"2017 Plant Study\",\"06307ec0\",\"A0043001\",\"76.50106681\",\"42.44409356\",\"2017\",\"Field_1\",\"Plot_12\",\"SubPlot_123\",\"Plant_1233\",\"Pot_1233\",\"Block_12\",\"Entry_12\",\"Rep_11\",\"25.5\",\"\",\"\",\"\"],[\"2019-09-10T18:19:15.629Z\",\"d98d0d4c\",\"Plant Epsilon\",\"0fe3e48b\",\"2017 Plant Study\",\"59d435cd\",\"A0043002\",\"76.50106683\",\"42.44409356\",\"2017\",\"Field_1\",\"Plot_12\",\"SubPlot_124\",\"Plant_1244\",\"Pot_1244\",\"Block_12\",\"Entry_12\",\"Rep_12\",\"28.9\",\"\",\"\",\"\"],[\"2019-09-10T18:20:15.629Z\",\"d98d0d4c\",\"Plant Epsilon\",\"0fe3e48b\",\"2017 Plant Study\",\"59d435cd\",\"A0043002\",\"76.50106683\",\"42.44409356\",\"2017\",\"Field_1\",\"Plot_12\",\"SubPlot_124\",\"Plant_1244\",\"Pot_1244\",\"Block_12\",\"Entry_12\",\"Rep_12\",\"\",\"0\",\"\",\"\"]]", description = "The 2D matrix of observation data. ObservationVariables and other metadata are the columns, ObservationUnits are the rows.")
-    public List<List<String>> getData() {
-        return data;
-    }
-
-    public void setData(List<List<String>> data) {
-        this.data = data;
-    }
-
-    public ObservationTable headerRow(List<HeaderRowEnum> headerRow) {
-        this.headerRow = headerRow;
-        return this;
-    }
-
-    public ObservationTable addHeaderRowItem(HeaderRowEnum headerRowItem) {
-        if (this.headerRow == null) {
-            this.headerRow = new ArrayList<HeaderRowEnum>();
-        }
-        this.headerRow.add(headerRowItem);
-        return this;
-    }
-
-    /**
-     * &lt;p&gt;The table is REQUIRED to have the following columns&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitDbId - Each row is related to one Observation Unit&lt;/li&gt;   &lt;li&gt;observationTimeStamp - Each row is has a time stamp for when the observation was taken&lt;/li&gt;   &lt;li&gt;At least one column with an observationVariableDbId&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table may have any or all of the following OPTIONAL columns. Included columns are decided by the server developer&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitName&lt;/li&gt;   &lt;li&gt;studyDbId&lt;/li&gt;   &lt;li&gt;studyName&lt;/li&gt;   &lt;li&gt;germplasmDbId&lt;/li&gt;   &lt;li&gt;germplasmName&lt;/li&gt;   &lt;li&gt;positionCoordinateX&lt;/li&gt;   &lt;li&gt;positionCoordinateY&lt;/li&gt;   &lt;li&gt;year&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table also may have any number of Observation Unit Hierarchy Level columns. For example:&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;field&lt;/li&gt;   &lt;li&gt;plot&lt;/li&gt;   &lt;li&gt;sub-plot&lt;/li&gt;   &lt;li&gt;plant&lt;/li&gt;   &lt;li&gt;pot&lt;/li&gt;   &lt;li&gt;block&lt;/li&gt;   &lt;li&gt;entry&lt;/li&gt;   &lt;li&gt;rep&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The JSON representation provides a pair of extra arrays for defining the headers of the table.  The first array \&quot;headerRow\&quot; will always contain \&quot;observationUnitDbId\&quot; and any or all of the OPTIONAL column header names.  The second array \&quot;observationVariables\&quot; contains the names and DbIds for the Observation Variables represented in the table.  By appending the two arrays, you can construct the complete header row of the table. &lt;/p&gt;
-     *
-     * @return headerRow
-     **/
-    @Schema(example = "[\"observationTimeStamp\",\"observationUnitDbId\",\"observationUnitName\",\"studyDbId\",\"studyName\",\"germplasmDbId\",\"germplasmName\",\"positionCoordinateX\",\"positionCoordinateY\",\"year\",\"field\",\"plot\",\"sub-plot\",\"plant\",\"pot\",\"block\",\"entry\",\"rep\"]", description = "<p>The table is REQUIRED to have the following columns</p> <ul>   <li>observationUnitDbId - Each row is related to one Observation Unit</li>   <li>observationTimeStamp - Each row is has a time stamp for when the observation was taken</li>   <li>At least one column with an observationVariableDbId</li> </ul> <p>The table may have any or all of the following OPTIONAL columns. Included columns are decided by the server developer</p> <ul>   <li>observationUnitName</li>   <li>studyDbId</li>   <li>studyName</li>   <li>germplasmDbId</li>   <li>germplasmName</li>   <li>positionCoordinateX</li>   <li>positionCoordinateY</li>   <li>year</li> </ul> <p>The table also may have any number of Observation Unit Hierarchy Level columns. For example:</p> <ul>   <li>field</li>   <li>plot</li>   <li>sub-plot</li>   <li>plant</li>   <li>pot</li>   <li>block</li>   <li>entry</li>   <li>rep</li> </ul> <p>The JSON representation provides a pair of extra arrays for defining the headers of the table.  The first array \"headerRow\" will always contain \"observationUnitDbId\" and any or all of the OPTIONAL column header names.  The second array \"observationVariables\" contains the names and DbIds for the Observation Variables represented in the table.  By appending the two arrays, you can construct the complete header row of the table. </p>")
-    public List<HeaderRowEnum> getHeaderRow() {
-        return headerRow;
-    }
-
-    public void setHeaderRow(List<HeaderRowEnum> headerRow) {
-        this.headerRow = headerRow;
-    }
-
-    public ObservationTable observationVariables(List<ObservationTableObservationVariables> observationVariables) {
-        this.observationVariables = observationVariables;
-        return this;
-    }
-
-    public ObservationTable addObservationVariablesItem(ObservationTableObservationVariables observationVariablesItem) {
-        if (this.observationVariables == null) {
-            this.observationVariables = new ArrayList<ObservationTableObservationVariables>();
-        }
-        this.observationVariables.add(observationVariablesItem);
-        return this;
-    }
-
-    /**
-     * The list of observation variables which have values recorded for them in the data matrix. Append to the &#x27;headerRow&#x27; for complete header row of the table.
-     *
-     * @return observationVariables
-     **/
-    @Schema(example = "[{\"observationVariableDbId\":\"367aa1a9\",\"observationVariableName\":\"Plant height\"},{\"observationVariableDbId\":\"2acb934c\",\"observationVariableName\":\"Carotenoid\"},{\"observationVariableDbId\":\"85a21ce1\",\"observationVariableName\":\"Root color\"},{\"observationVariableDbId\":\"46f590e5\",\"observationVariableName\":\"Virus severity\"}]", description = "The list of observation variables which have values recorded for them in the data matrix. Append to the 'headerRow' for complete header row of the table.")
-    public List<ObservationTableObservationVariables> getObservationVariables() {
-        return observationVariables;
-    }
-
-    public void setObservationVariables(List<ObservationTableObservationVariables> observationVariables) {
-        this.observationVariables = observationVariables;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationTable observationTable = (ObservationTable) o;
-        return Objects.equals(this.data, observationTable.data) &&
-                Objects.equals(this.headerRow, observationTable.headerRow) &&
-                Objects.equals(this.observationVariables, observationTable.observationVariables);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data, headerRow, observationVariables);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationTable {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("    headerRow: ").append(toIndentedString(headerRow)).append("\n");
-        sb.append("    observationVariables: ").append(toIndentedString(observationVariables)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationTableObservationVariables.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationTableObservationVariables.java
deleted file mode 100644
index d2b2f1b2..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationTableObservationVariables.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationTableObservationVariables
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationTableObservationVariables {
-    @SerializedName("observationVariableDbId")
-    private String observationVariableDbId = null;
-
-    @SerializedName("observationVariableName")
-    private String observationVariableName = null;
-
-    public ObservationTableObservationVariables observationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-        return this;
-    }
-
-    /**
-     * Variable unique identifier
-     *
-     * @return observationVariableDbId
-     **/
-    @Schema(example = "367aa1a9", description = "Variable unique identifier")
-    public String getObservationVariableDbId() {
-        return observationVariableDbId;
-    }
-
-    public void setObservationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-    }
-
-    public ObservationTableObservationVariables observationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-        return this;
-    }
-
-    /**
-     * Variable name (usually a short name)
-     *
-     * @return observationVariableName
-     **/
-    @Schema(example = "Plant height", description = "Variable name (usually a short name)")
-    public String getObservationVariableName() {
-        return observationVariableName;
-    }
-
-    public void setObservationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationTableObservationVariables observationTableObservationVariables = (ObservationTableObservationVariables) o;
-        return Objects.equals(this.observationVariableDbId, observationTableObservationVariables.observationVariableDbId) &&
-                Objects.equals(this.observationVariableName, observationTableObservationVariables.observationVariableName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(observationVariableDbId, observationVariableName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationTableObservationVariables {\n");
-
-        sb.append("    observationVariableDbId: ").append(toIndentedString(observationVariableDbId)).append("\n");
-        sb.append("    observationVariableName: ").append(toIndentedString(observationVariableName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationTableResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationTableResponse.java
deleted file mode 100644
index 288a60d7..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationTableResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationTableResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationTableResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationTable result = null;
-
-    public ObservationTableResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationTableResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationTableResponse result(ObservationTable result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationTable getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationTable result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationTableResponse observationTableResponse = (ObservationTableResponse) o;
-        return Objects.equals(this._atContext, observationTableResponse._atContext) &&
-                Objects.equals(this.metadata, observationTableResponse.metadata) &&
-                Objects.equals(this.result, observationTableResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationTableResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationTreatment.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationTreatment.java
deleted file mode 100644
index 87822cf1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationTreatment.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationTreatment
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationTreatment {
-    @SerializedName("factor")
-    private String factor = null;
-
-    @SerializedName("modality")
-    private String modality = null;
-
-    public ObservationTreatment factor(String factor) {
-        this.factor = factor;
-        return this;
-    }
-
-    /**
-     * The type of treatment/factor. ex. &#x27;fertilizer&#x27;, &#x27;inoculation&#x27;, &#x27;irrigation&#x27;, etc  MIAPPE V1.1 (DM-61) Experimental Factor type - Name/Acronym of the experimental factor.
-     *
-     * @return factor
-     **/
-    @Schema(example = "fertilizer", description = "The type of treatment/factor. ex. 'fertilizer', 'inoculation', 'irrigation', etc  MIAPPE V1.1 (DM-61) Experimental Factor type - Name/Acronym of the experimental factor.")
-    public String getFactor() {
-        return factor;
-    }
-
-    public void setFactor(String factor) {
-        this.factor = factor;
-    }
-
-    public ObservationTreatment modality(String modality) {
-        this.modality = modality;
-        return this;
-    }
-
-    /**
-     * The treatment/factor description. ex. &#x27;low fertilizer&#x27;, &#x27;yellow rust inoculation&#x27;, &#x27;high water&#x27;, etc  MIAPPE V1.1 (DM-62) Experimental Factor description - Free text description of the experimental factor. This includes all relevant treatments planned and protocol planned for all the plants targeted by a given experimental factor.
-     *
-     * @return modality
-     **/
-    @Schema(example = "low fertilizer", description = "The treatment/factor description. ex. 'low fertilizer', 'yellow rust inoculation', 'high water', etc  MIAPPE V1.1 (DM-62) Experimental Factor description - Free text description of the experimental factor. This includes all relevant treatments planned and protocol planned for all the plants targeted by a given experimental factor. ")
-    public String getModality() {
-        return modality;
-    }
-
-    public void setModality(String modality) {
-        this.modality = modality;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationTreatment observationTreatment = (ObservationTreatment) o;
-        return Objects.equals(this.factor, observationTreatment.factor) &&
-                Objects.equals(this.modality, observationTreatment.modality);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(factor, modality);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationTreatment {\n");
-
-        sb.append("    factor: ").append(toIndentedString(factor)).append("\n");
-        sb.append("    modality: ").append(toIndentedString(modality)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnit.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnit.java
deleted file mode 100644
index ed2ed5d1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnit.java
+++ /dev/null
@@ -1,624 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * ObservationUnit
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnit {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("crossDbId")
-    private String crossDbId = null;
-
-    @SerializedName("crossName")
-    private String crossName = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("locationDbId")
-    private String locationDbId = null;
-
-    @SerializedName("locationName")
-    private String locationName = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    @SerializedName("observationUnitName")
-    private String observationUnitName = null;
-
-    @SerializedName("observationUnitPUI")
-    private String observationUnitPUI = null;
-
-    @SerializedName("observationUnitPosition")
-    private ObservationUnitObservationUnitPosition observationUnitPosition = null;
-
-    @SerializedName("observations")
-    private List<ObservationUnitObservations> observations = null;
-
-    @SerializedName("programDbId")
-    private String programDbId = null;
-
-    @SerializedName("programName")
-    private String programName = null;
-
-    @SerializedName("seedLotDbId")
-    private String seedLotDbId = null;
-
-    @SerializedName("seedLotName")
-    private String seedLotName = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("studyName")
-    private String studyName = null;
-
-    @SerializedName("treatments")
-    private List<ObservationUnitTreatments> treatments = null;
-
-    @SerializedName("trialDbId")
-    private String trialDbId = null;
-
-    @SerializedName("trialName")
-    private String trialName = null;
-
-    public ObservationUnit additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationUnit putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationUnit crossDbId(String crossDbId) {
-        this.crossDbId = crossDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for a cross
-     *
-     * @return crossDbId
-     **/
-    @Schema(example = "d105fd6f", description = "the unique identifier for a cross")
-    public String getCrossDbId() {
-        return crossDbId;
-    }
-
-    public void setCrossDbId(String crossDbId) {
-        this.crossDbId = crossDbId;
-    }
-
-    public ObservationUnit crossName(String crossName) {
-        this.crossName = crossName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a cross
-     *
-     * @return crossName
-     **/
-    @Schema(example = "my_Crosses_2018_01", description = "the human readable name for a cross")
-    public String getCrossName() {
-        return crossName;
-    }
-
-    public void setCrossName(String crossName) {
-        this.crossName = crossName;
-    }
-
-    public ObservationUnit externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationUnit addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationUnit germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "e9d9ed57", description = "The ID which uniquely identifies a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public ObservationUnit germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * Name of the germplasm. It can be the preferred name and does not have to be unique.
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000001", description = "Name of the germplasm. It can be the preferred name and does not have to be unique.")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public ObservationUnit locationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a location, associated with this study
-     *
-     * @return locationDbId
-     **/
-    @Schema(example = "0e208b20", description = "The ID which uniquely identifies a location, associated with this study")
-    public String getLocationDbId() {
-        return locationDbId;
-    }
-
-    public void setLocationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-    }
-
-    public ObservationUnit locationName(String locationName) {
-        this.locationName = locationName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a location associated with this study
-     *
-     * @return locationName
-     **/
-    @Schema(example = "Field Station Alpha", description = "The human readable name of a location associated with this study")
-    public String getLocationName() {
-        return locationName;
-    }
-
-    public void setLocationName(String locationName) {
-        this.locationName = locationName;
-    }
-
-    public ObservationUnit observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation unit  MIAPPE V1.1 (DM-70) Observation unit ID - Identifier used to identify the observation unit in data files containing the values observed or measured on that unit. Must be locally unique.
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "8c67503c", description = "The ID which uniquely identifies an observation unit  MIAPPE V1.1 (DM-70) Observation unit ID - Identifier used to identify the observation unit in data files containing the values observed or measured on that unit. Must be locally unique. ")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-    public ObservationUnit observationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-        return this;
-    }
-
-    /**
-     * A human readable name for an observation unit
-     *
-     * @return observationUnitName
-     **/
-    @Schema(example = "Plot 1", description = "A human readable name for an observation unit")
-    public String getObservationUnitName() {
-        return observationUnitName;
-    }
-
-    public void setObservationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-    }
-
-    public ObservationUnit observationUnitPUI(String observationUnitPUI) {
-        this.observationUnitPUI = observationUnitPUI;
-        return this;
-    }
-
-    /**
-     * A Permanent Unique Identifier for an observation unit  MIAPPE V1.1 (DM-72) External ID - Identifier for the observation unit in a persistent repository, comprises the name of the repository and the identifier of the observation unit therein. The EBI Biosamples repository can be used. URI are recommended when possible.
-     *
-     * @return observationUnitPUI
-     **/
-    @Schema(example = "http://pui.per/plot/1a9afc14", description = "A Permanent Unique Identifier for an observation unit  MIAPPE V1.1 (DM-72) External ID - Identifier for the observation unit in a persistent repository, comprises the name of the repository and the identifier of the observation unit therein. The EBI Biosamples repository can be used. URI are recommended when possible.")
-    public String getObservationUnitPUI() {
-        return observationUnitPUI;
-    }
-
-    public void setObservationUnitPUI(String observationUnitPUI) {
-        this.observationUnitPUI = observationUnitPUI;
-    }
-
-    public ObservationUnit observationUnitPosition(ObservationUnitObservationUnitPosition observationUnitPosition) {
-        this.observationUnitPosition = observationUnitPosition;
-        return this;
-    }
-
-    /**
-     * Get observationUnitPosition
-     *
-     * @return observationUnitPosition
-     **/
-    @Schema(description = "")
-    public ObservationUnitObservationUnitPosition getObservationUnitPosition() {
-        return observationUnitPosition;
-    }
-
-    public void setObservationUnitPosition(ObservationUnitObservationUnitPosition observationUnitPosition) {
-        this.observationUnitPosition = observationUnitPosition;
-    }
-
-    public ObservationUnit observations(List<ObservationUnitObservations> observations) {
-        this.observations = observations;
-        return this;
-    }
-
-    public ObservationUnit addObservationsItem(ObservationUnitObservations observationsItem) {
-        if (this.observations == null) {
-            this.observations = new ArrayList<ObservationUnitObservations>();
-        }
-        this.observations.add(observationsItem);
-        return this;
-    }
-
-    /**
-     * All observations attached to this observation unit.   Default for this field is null or omitted. Do NOT include data in this field unless the &#x27;includeObservations&#x27; flag is explicitly set to True.
-     *
-     * @return observations
-     **/
-    @Schema(description = "All observations attached to this observation unit.   Default for this field is null or omitted. Do NOT include data in this field unless the 'includeObservations' flag is explicitly set to True.")
-    public List<ObservationUnitObservations> getObservations() {
-        return observations;
-    }
-
-    public void setObservations(List<ObservationUnitObservations> observations) {
-        this.observations = observations;
-    }
-
-    public ObservationUnit programDbId(String programDbId) {
-        this.programDbId = programDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a program
-     *
-     * @return programDbId
-     **/
-    @Schema(example = "2d763a7a", description = "The ID which uniquely identifies a program")
-    public String getProgramDbId() {
-        return programDbId;
-    }
-
-    public void setProgramDbId(String programDbId) {
-        this.programDbId = programDbId;
-    }
-
-    public ObservationUnit programName(String programName) {
-        this.programName = programName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a program
-     *
-     * @return programName
-     **/
-    @Schema(example = "The Perfect Breeding Program", description = "The human readable name of a program")
-    public String getProgramName() {
-        return programName;
-    }
-
-    public void setProgramName(String programName) {
-        this.programName = programName;
-    }
-
-    public ObservationUnit seedLotDbId(String seedLotDbId) {
-        this.seedLotDbId = seedLotDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for the originating Seed Lot
-     *
-     * @return seedLotDbId
-     **/
-    @Schema(example = "261ecb09", description = "The unique identifier for the originating Seed Lot")
-    public String getSeedLotDbId() {
-        return seedLotDbId;
-    }
-
-    public void setSeedLotDbId(String seedLotDbId) {
-        this.seedLotDbId = seedLotDbId;
-    }
-
-    public ObservationUnit seedLotName(String seedLotName) {
-        this.seedLotName = seedLotName;
-        return this;
-    }
-
-    /**
-     * A human readable name for the originating Seed Lot
-     *
-     * @return seedLotName
-     **/
-    @Schema(example = "Seed Lot Alpha", description = "A human readable name for the originating Seed Lot")
-    public String getSeedLotName() {
-        return seedLotName;
-    }
-
-    public void setSeedLotName(String seedLotName) {
-        this.seedLotName = seedLotName;
-    }
-
-    public ObservationUnit studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a study within the given database server
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "9865addc", description = "The ID which uniquely identifies a study within the given database server")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public ObservationUnit studyName(String studyName) {
-        this.studyName = studyName;
-        return this;
-    }
-
-    /**
-     * The human readable name for a study
-     *
-     * @return studyName
-     **/
-    @Schema(example = "Purple_Tomato_1", description = "The human readable name for a study")
-    public String getStudyName() {
-        return studyName;
-    }
-
-    public void setStudyName(String studyName) {
-        this.studyName = studyName;
-    }
-
-    public ObservationUnit treatments(List<ObservationUnitTreatments> treatments) {
-        this.treatments = treatments;
-        return this;
-    }
-
-    public ObservationUnit addTreatmentsItem(ObservationUnitTreatments treatmentsItem) {
-        if (this.treatments == null) {
-            this.treatments = new ArrayList<ObservationUnitTreatments>();
-        }
-        this.treatments.add(treatmentsItem);
-        return this;
-    }
-
-    /**
-     * List of treatments applied to an observation unit.  MIAPPE V1.1 (DM-74) Observation Unit factor value - List of values for each factor applied to the observation unit.
-     *
-     * @return treatments
-     **/
-    @Schema(description = "List of treatments applied to an observation unit.  MIAPPE V1.1 (DM-74) Observation Unit factor value - List of values for each factor applied to the observation unit.")
-    public List<ObservationUnitTreatments> getTreatments() {
-        return treatments;
-    }
-
-    public void setTreatments(List<ObservationUnitTreatments> treatments) {
-        this.treatments = treatments;
-    }
-
-    public ObservationUnit trialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial
-     *
-     * @return trialDbId
-     **/
-    @Schema(example = "776a609c", description = "The ID which uniquely identifies a trial")
-    public String getTrialDbId() {
-        return trialDbId;
-    }
-
-    public void setTrialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-    }
-
-    public ObservationUnit trialName(String trialName) {
-        this.trialName = trialName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial
-     *
-     * @return trialName
-     **/
-    @Schema(example = "Purple Tomato", description = "The human readable name of a trial")
-    public String getTrialName() {
-        return trialName;
-    }
-
-    public void setTrialName(String trialName) {
-        this.trialName = trialName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnit observationUnit = (ObservationUnit) o;
-        return Objects.equals(this.additionalInfo, observationUnit.additionalInfo) &&
-                Objects.equals(this.crossDbId, observationUnit.crossDbId) &&
-                Objects.equals(this.crossName, observationUnit.crossName) &&
-                Objects.equals(this.externalReferences, observationUnit.externalReferences) &&
-                Objects.equals(this.germplasmDbId, observationUnit.germplasmDbId) &&
-                Objects.equals(this.germplasmName, observationUnit.germplasmName) &&
-                Objects.equals(this.locationDbId, observationUnit.locationDbId) &&
-                Objects.equals(this.locationName, observationUnit.locationName) &&
-                Objects.equals(this.observationUnitDbId, observationUnit.observationUnitDbId) &&
-                Objects.equals(this.observationUnitName, observationUnit.observationUnitName) &&
-                Objects.equals(this.observationUnitPUI, observationUnit.observationUnitPUI) &&
-                Objects.equals(this.observationUnitPosition, observationUnit.observationUnitPosition) &&
-                Objects.equals(this.observations, observationUnit.observations) &&
-                Objects.equals(this.programDbId, observationUnit.programDbId) &&
-                Objects.equals(this.programName, observationUnit.programName) &&
-                Objects.equals(this.seedLotDbId, observationUnit.seedLotDbId) &&
-                Objects.equals(this.seedLotName, observationUnit.seedLotName) &&
-                Objects.equals(this.studyDbId, observationUnit.studyDbId) &&
-                Objects.equals(this.studyName, observationUnit.studyName) &&
-                Objects.equals(this.treatments, observationUnit.treatments) &&
-                Objects.equals(this.trialDbId, observationUnit.trialDbId) &&
-                Objects.equals(this.trialName, observationUnit.trialName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, crossDbId, crossName, externalReferences, germplasmDbId, germplasmName, locationDbId, locationName, observationUnitDbId, observationUnitName, observationUnitPUI, observationUnitPosition, observations, programDbId, programName, seedLotDbId, seedLotName, studyDbId, studyName, treatments, trialDbId, trialName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnit {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    crossDbId: ").append(toIndentedString(crossDbId)).append("\n");
-        sb.append("    crossName: ").append(toIndentedString(crossName)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
-        sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("    observationUnitName: ").append(toIndentedString(observationUnitName)).append("\n");
-        sb.append("    observationUnitPUI: ").append(toIndentedString(observationUnitPUI)).append("\n");
-        sb.append("    observationUnitPosition: ").append(toIndentedString(observationUnitPosition)).append("\n");
-        sb.append("    observations: ").append(toIndentedString(observations)).append("\n");
-        sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-        sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
-        sb.append("    seedLotDbId: ").append(toIndentedString(seedLotDbId)).append("\n");
-        sb.append("    seedLotName: ").append(toIndentedString(seedLotName)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    studyName: ").append(toIndentedString(studyName)).append("\n");
-        sb.append("    treatments: ").append(toIndentedString(treatments)).append("\n");
-        sb.append("    trialDbId: ").append(toIndentedString(trialDbId)).append("\n");
-        sb.append("    trialName: ").append(toIndentedString(trialName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitHierarchyLevel.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitHierarchyLevel.java
deleted file mode 100644
index 11ece7bb..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitHierarchyLevel.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6).   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
- */
-@Schema(description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6).   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ObservationUnitHierarchyLevel {
-    @SerializedName("levelName")
-    private String levelName = null;
-
-    @SerializedName("levelOrder")
-    private Integer levelOrder = null;
-
-    public ObservationUnitHierarchyLevel levelName(String levelName) {
-        this.levelName = levelName;
-        return this;
-    }
-
-    /**
-     * A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelName
-     **/
-    @Schema(example = "plot", description = "A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public ObservationUnitHierarchyLevel levelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-        return this;
-    }
-
-    /**
-     * &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;&#x27;s lower numbers  are at the top of the hierarchy (ie field -&gt; 1) and higher numbers are at the bottom of the hierarchy (ie plant -&gt; 9).   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelOrder
-     **/
-    @Schema(example = "2", description = "`levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`'s lower numbers  are at the top of the hierarchy (ie field -> 1) and higher numbers are at the bottom of the hierarchy (ie plant -> 9).   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public Integer getLevelOrder() {
-        return levelOrder;
-    }
-
-    public void setLevelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitHierarchyLevel observationUnitHierarchyLevel = (ObservationUnitHierarchyLevel) o;
-        return Objects.equals(this.levelName, observationUnitHierarchyLevel.levelName) &&
-                Objects.equals(this.levelOrder, observationUnitHierarchyLevel.levelOrder);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(levelName, levelOrder);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitHierarchyLevel {\n");
-
-        sb.append("    levelName: ").append(toIndentedString(levelName)).append("\n");
-        sb.append("    levelOrder: ").append(toIndentedString(levelOrder)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitHierarchyLevel1.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitHierarchyLevel1.java
deleted file mode 100644
index d93cf311..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitHierarchyLevel1.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6).   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
- */
-@Schema(description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6).   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ObservationUnitHierarchyLevel1 {
-    @SerializedName("levelName")
-    private String levelName = null;
-
-    @SerializedName("levelOrder")
-    private Integer levelOrder = null;
-
-    public ObservationUnitHierarchyLevel1 levelName(String levelName) {
-        this.levelName = levelName;
-        return this;
-    }
-
-    /**
-     * A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelName
-     **/
-    @Schema(example = "plot", description = "A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public ObservationUnitHierarchyLevel1 levelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-        return this;
-    }
-
-    /**
-     * &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;&#x27;s lower numbers  are at the top of the hierarchy (ie field -&gt; 1) and higher numbers are at the bottom of the hierarchy (ie plant -&gt; 9).   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelOrder
-     **/
-    @Schema(example = "2", description = "`levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`'s lower numbers  are at the top of the hierarchy (ie field -> 1) and higher numbers are at the bottom of the hierarchy (ie plant -> 9).   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public Integer getLevelOrder() {
-        return levelOrder;
-    }
-
-    public void setLevelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitHierarchyLevel1 observationUnitHierarchyLevel1 = (ObservationUnitHierarchyLevel1) o;
-        return Objects.equals(this.levelName, observationUnitHierarchyLevel1.levelName) &&
-                Objects.equals(this.levelOrder, observationUnitHierarchyLevel1.levelOrder);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(levelName, levelOrder);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitHierarchyLevel1 {\n");
-
-        sb.append("    levelName: ").append(toIndentedString(levelName)).append("\n");
-        sb.append("    levelOrder: ").append(toIndentedString(levelOrder)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevel.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevel.java
deleted file mode 100644
index a7d51a1a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevel.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6). &#x60;levelCode&#x60; is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**
- */
-@Schema(description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6). `levelCode` is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample** ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitLevel {
-    @SerializedName("levelCode")
-    private String levelCode = null;
-
-    @SerializedName("levelName")
-    private String levelName = null;
-
-    @SerializedName("levelOrder")
-    private Integer levelOrder = null;
-
-    public ObservationUnitLevel levelCode(String levelCode) {
-        this.levelCode = levelCode;
-        return this;
-    }
-
-    /**
-     * An ID code or number to represent a real thing that may or may not be an an observation unit. &lt;br/&gt;For example, if the &#x27;levelName&#x27; is &#x27;plot&#x27;, then the &#x27;levelCode&#x27; would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. &lt;br/&gt;If the &#x27;levelName&#x27; is &#x27;field&#x27;, then the &#x27;levelCode&#x27; might be something like &#x27;3&#x27; or &#x27;F3&#x27; to indicate the third field at a research station.
-     *
-     * @return levelCode
-     **/
-    @Schema(example = "Plot_123", description = "An ID code or number to represent a real thing that may or may not be an an observation unit. <br/>For example, if the 'levelName' is 'plot', then the 'levelCode' would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. <br/>If the 'levelName' is 'field', then the 'levelCode' might be something like '3' or 'F3' to indicate the third field at a research station. ")
-    public String getLevelCode() {
-        return levelCode;
-    }
-
-    public void setLevelCode(String levelCode) {
-        this.levelCode = levelCode;
-    }
-
-    public ObservationUnitLevel levelName(String levelName) {
-        this.levelName = levelName;
-        return this;
-    }
-
-    /**
-     * A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelName
-     **/
-    @Schema(example = "plot", description = "A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public ObservationUnitLevel levelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-        return this;
-    }
-
-    /**
-     * &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;&#x27;s lower numbers  are at the top of the hierarchy (ie field -&gt; 1) and higher numbers are at the bottom of the hierarchy (ie plant -&gt; 9).   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelOrder
-     **/
-    @Schema(example = "2", description = "`levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`'s lower numbers  are at the top of the hierarchy (ie field -> 1) and higher numbers are at the bottom of the hierarchy (ie plant -> 9).   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public Integer getLevelOrder() {
-        return levelOrder;
-    }
-
-    public void setLevelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitLevel observationUnitLevel = (ObservationUnitLevel) o;
-        return Objects.equals(this.levelCode, observationUnitLevel.levelCode) &&
-                Objects.equals(this.levelName, observationUnitLevel.levelName) &&
-                Objects.equals(this.levelOrder, observationUnitLevel.levelOrder);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(levelCode, levelName, levelOrder);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitLevel {\n");
-
-        sb.append("    levelCode: ").append(toIndentedString(levelCode)).append("\n");
-        sb.append("    levelName: ").append(toIndentedString(levelName)).append("\n");
-        sb.append("    levelOrder: ").append(toIndentedString(levelOrder)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevel1.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevel1.java
deleted file mode 100644
index efc5e1e8..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevel1.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6). &#x60;levelCode&#x60; is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**
- */
-@Schema(description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6). `levelCode` is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample** ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitLevel1 {
-    @SerializedName("levelCode")
-    private String levelCode = null;
-
-    @SerializedName("levelName")
-    private String levelName = null;
-
-    @SerializedName("levelOrder")
-    private Integer levelOrder = null;
-
-    public ObservationUnitLevel1 levelCode(String levelCode) {
-        this.levelCode = levelCode;
-        return this;
-    }
-
-    /**
-     * An ID code or number to represent a real thing that may or may not be an an observation unit. &lt;br/&gt;For example, if the &#x27;levelName&#x27; is &#x27;plot&#x27;, then the &#x27;levelCode&#x27; would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. &lt;br/&gt;If the &#x27;levelName&#x27; is &#x27;field&#x27;, then the &#x27;levelCode&#x27; might be something like &#x27;3&#x27; or &#x27;F3&#x27; to indicate the third field at a research station.
-     *
-     * @return levelCode
-     **/
-    @Schema(example = "Plot_123", description = "An ID code or number to represent a real thing that may or may not be an an observation unit. <br/>For example, if the 'levelName' is 'plot', then the 'levelCode' would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. <br/>If the 'levelName' is 'field', then the 'levelCode' might be something like '3' or 'F3' to indicate the third field at a research station. ")
-    public String getLevelCode() {
-        return levelCode;
-    }
-
-    public void setLevelCode(String levelCode) {
-        this.levelCode = levelCode;
-    }
-
-    public ObservationUnitLevel1 levelName(String levelName) {
-        this.levelName = levelName;
-        return this;
-    }
-
-    /**
-     * A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelName
-     **/
-    @Schema(example = "plot", description = "A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public ObservationUnitLevel1 levelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-        return this;
-    }
-
-    /**
-     * &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;&#x27;s lower numbers  are at the top of the hierarchy (ie field -&gt; 1) and higher numbers are at the bottom of the hierarchy (ie plant -&gt; 9).   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelOrder
-     **/
-    @Schema(example = "2", description = "`levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`'s lower numbers  are at the top of the hierarchy (ie field -> 1) and higher numbers are at the bottom of the hierarchy (ie plant -> 9).   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public Integer getLevelOrder() {
-        return levelOrder;
-    }
-
-    public void setLevelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitLevel1 observationUnitLevel1 = (ObservationUnitLevel1) o;
-        return Objects.equals(this.levelCode, observationUnitLevel1.levelCode) &&
-                Objects.equals(this.levelName, observationUnitLevel1.levelName) &&
-                Objects.equals(this.levelOrder, observationUnitLevel1.levelOrder);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(levelCode, levelName, levelOrder);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitLevel1 {\n");
-
-        sb.append("    levelCode: ").append(toIndentedString(levelCode)).append("\n");
-        sb.append("    levelName: ").append(toIndentedString(levelName)).append("\n");
-        sb.append("    levelOrder: ").append(toIndentedString(levelOrder)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevel2.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevel2.java
deleted file mode 100644
index f17b88f7..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevel2.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * The exact level and level code of an observation unit.   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.   MIAPPE V1.1 DM-71 Observation unit type \&quot;Type of observation unit in textual form, usually one of the following: study, block, sub-block, plot, sub-plot, pot, plant. Use of other observation unit types is possible but not recommended.  The observation unit type can not be used to indicate sub-plant levels. However, observations can still be made on the sub-plant level, as long as the details are indicated in the associated observed variable (see observed variables).  Alternatively, it is possible to use samples for more detailed tracing of sub-plant units, attaching the observations to them instead.\&quot;
- */
-@Schema(description = "The exact level and level code of an observation unit.   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>.   MIAPPE V1.1 DM-71 Observation unit type \"Type of observation unit in textual form, usually one of the following: study, block, sub-block, plot, sub-plot, pot, plant. Use of other observation unit types is possible but not recommended.  The observation unit type can not be used to indicate sub-plant levels. However, observations can still be made on the sub-plant level, as long as the details are indicated in the associated observed variable (see observed variables).  Alternatively, it is possible to use samples for more detailed tracing of sub-plant units, attaching the observations to them instead.\" ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitLevel2 {
-    @SerializedName("levelCode")
-    private String levelCode = null;
-
-    @SerializedName("levelName")
-    private String levelName = null;
-
-    @SerializedName("levelOrder")
-    private Integer levelOrder = null;
-
-    public ObservationUnitLevel2 levelCode(String levelCode) {
-        this.levelCode = levelCode;
-        return this;
-    }
-
-    /**
-     * An ID code or number to represent a real thing that may or may not be an an observation unit. &lt;br/&gt;For example, if the &#x27;levelName&#x27; is &#x27;plot&#x27;, then the &#x27;levelCode&#x27; would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. &lt;br/&gt;If the &#x27;levelName&#x27; is &#x27;field&#x27;, then the &#x27;levelCode&#x27; might be something like &#x27;3&#x27; or &#x27;F3&#x27; to indicate the third field at a research station.
-     *
-     * @return levelCode
-     **/
-    @Schema(example = "Plot_123", description = "An ID code or number to represent a real thing that may or may not be an an observation unit. <br/>For example, if the 'levelName' is 'plot', then the 'levelCode' would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. <br/>If the 'levelName' is 'field', then the 'levelCode' might be something like '3' or 'F3' to indicate the third field at a research station. ")
-    public String getLevelCode() {
-        return levelCode;
-    }
-
-    public void setLevelCode(String levelCode) {
-        this.levelCode = levelCode;
-    }
-
-    public ObservationUnitLevel2 levelName(String levelName) {
-        this.levelName = levelName;
-        return this;
-    }
-
-    /**
-     * A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelName
-     **/
-    @Schema(example = "plot", description = "A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public ObservationUnitLevel2 levelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-        return this;
-    }
-
-    /**
-     * &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;&#x27;s lower numbers  are at the top of the hierarchy (ie field -&gt; 1) and higher numbers are at the bottom of the hierarchy (ie plant -&gt; 9).   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelOrder
-     **/
-    @Schema(example = "2", description = "`levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`'s lower numbers  are at the top of the hierarchy (ie field -> 1) and higher numbers are at the bottom of the hierarchy (ie plant -> 9).   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public Integer getLevelOrder() {
-        return levelOrder;
-    }
-
-    public void setLevelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitLevel2 observationUnitLevel2 = (ObservationUnitLevel2) o;
-        return Objects.equals(this.levelCode, observationUnitLevel2.levelCode) &&
-                Objects.equals(this.levelName, observationUnitLevel2.levelName) &&
-                Objects.equals(this.levelOrder, observationUnitLevel2.levelOrder);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(levelCode, levelName, levelOrder);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitLevel2 {\n");
-
-        sb.append("    levelCode: ").append(toIndentedString(levelCode)).append("\n");
-        sb.append("    levelName: ").append(toIndentedString(levelName)).append("\n");
-        sb.append("    levelOrder: ").append(toIndentedString(levelOrder)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevelRelationship.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevelRelationship.java
deleted file mode 100644
index ae151125..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevelRelationship.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6). &#x60;levelCode&#x60; is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**
- */
-@Schema(description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6). `levelCode` is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample** ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitLevelRelationship {
-    @SerializedName("levelCode")
-    private String levelCode = null;
-
-    @SerializedName("levelName")
-    private String levelName = null;
-
-    @SerializedName("levelOrder")
-    private Integer levelOrder = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    public ObservationUnitLevelRelationship levelCode(String levelCode) {
-        this.levelCode = levelCode;
-        return this;
-    }
-
-    /**
-     * An ID code or number to represent a real thing that may or may not be an an observation unit. &lt;br/&gt;For example, if the &#x27;levelName&#x27; is &#x27;plot&#x27;, then the &#x27;levelCode&#x27; would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. &lt;br/&gt;If the &#x27;levelName&#x27; is &#x27;field&#x27;, then the &#x27;levelCode&#x27; might be something like &#x27;3&#x27; or &#x27;F3&#x27; to indicate the third field at a research station.
-     *
-     * @return levelCode
-     **/
-    @Schema(example = "Plot_123", description = "An ID code or number to represent a real thing that may or may not be an an observation unit. <br/>For example, if the 'levelName' is 'plot', then the 'levelCode' would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. <br/>If the 'levelName' is 'field', then the 'levelCode' might be something like '3' or 'F3' to indicate the third field at a research station. ")
-    public String getLevelCode() {
-        return levelCode;
-    }
-
-    public void setLevelCode(String levelCode) {
-        this.levelCode = levelCode;
-    }
-
-    public ObservationUnitLevelRelationship levelName(String levelName) {
-        this.levelName = levelName;
-        return this;
-    }
-
-    /**
-     * A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelName
-     **/
-    @Schema(example = "plot", description = "A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public ObservationUnitLevelRelationship levelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-        return this;
-    }
-
-    /**
-     * &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;&#x27;s lower numbers  are at the top of the hierarchy (ie field -&gt; 1) and higher numbers are at the bottom of the hierarchy (ie plant -&gt; 9).   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelOrder
-     **/
-    @Schema(example = "2", description = "`levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`'s lower numbers  are at the top of the hierarchy (ie field -> 1) and higher numbers are at the bottom of the hierarchy (ie plant -> 9).   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public Integer getLevelOrder() {
-        return levelOrder;
-    }
-
-    public void setLevelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-    }
-
-    public ObservationUnitLevelRelationship observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation unit &lt;br/&gt;If this level has on ObservationUnit associated with it, record the observationUnitDbId here. This is intended to construct a strict hierarchy of observationUnits.  &lt;br/&gt;If there is no ObservationUnit associated with this level, this field can set to NULL or omitted from the response.
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "5ab883e9", description = "The ID which uniquely identifies an observation unit <br/>If this level has on ObservationUnit associated with it, record the observationUnitDbId here. This is intended to construct a strict hierarchy of observationUnits.  <br/>If there is no ObservationUnit associated with this level, this field can set to NULL or omitted from the response.")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitLevelRelationship observationUnitLevelRelationship = (ObservationUnitLevelRelationship) o;
-        return Objects.equals(this.levelCode, observationUnitLevelRelationship.levelCode) &&
-                Objects.equals(this.levelName, observationUnitLevelRelationship.levelName) &&
-                Objects.equals(this.levelOrder, observationUnitLevelRelationship.levelOrder) &&
-                Objects.equals(this.observationUnitDbId, observationUnitLevelRelationship.observationUnitDbId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(levelCode, levelName, levelOrder, observationUnitDbId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitLevelRelationship {\n");
-
-        sb.append("    levelCode: ").append(toIndentedString(levelCode)).append("\n");
-        sb.append("    levelName: ").append(toIndentedString(levelName)).append("\n");
-        sb.append("    levelOrder: ").append(toIndentedString(levelOrder)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevelRelationship1.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevelRelationship1.java
deleted file mode 100644
index 45c7de16..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitLevelRelationship1.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6). &#x60;levelCode&#x60; is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**
- */
-@Schema(description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6). `levelCode` is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample** ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitLevelRelationship1 {
-    @SerializedName("levelCode")
-    private String levelCode = null;
-
-    @SerializedName("levelName")
-    private String levelName = null;
-
-    @SerializedName("levelOrder")
-    private Integer levelOrder = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    public ObservationUnitLevelRelationship1 levelCode(String levelCode) {
-        this.levelCode = levelCode;
-        return this;
-    }
-
-    /**
-     * An ID code or number to represent a real thing that may or may not be an an observation unit. &lt;br/&gt;For example, if the &#x27;levelName&#x27; is &#x27;plot&#x27;, then the &#x27;levelCode&#x27; would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. &lt;br/&gt;If the &#x27;levelName&#x27; is &#x27;field&#x27;, then the &#x27;levelCode&#x27; might be something like &#x27;3&#x27; or &#x27;F3&#x27; to indicate the third field at a research station.
-     *
-     * @return levelCode
-     **/
-    @Schema(example = "Plot_123", description = "An ID code or number to represent a real thing that may or may not be an an observation unit. <br/>For example, if the 'levelName' is 'plot', then the 'levelCode' would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. <br/>If the 'levelName' is 'field', then the 'levelCode' might be something like '3' or 'F3' to indicate the third field at a research station. ")
-    public String getLevelCode() {
-        return levelCode;
-    }
-
-    public void setLevelCode(String levelCode) {
-        this.levelCode = levelCode;
-    }
-
-    public ObservationUnitLevelRelationship1 levelName(String levelName) {
-        this.levelName = levelName;
-        return this;
-    }
-
-    /**
-     * A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelName
-     **/
-    @Schema(example = "plot", description = "A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public ObservationUnitLevelRelationship1 levelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-        return this;
-    }
-
-    /**
-     * &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;&#x27;s lower numbers  are at the top of the hierarchy (ie field -&gt; 1) and higher numbers are at the bottom of the hierarchy (ie plant -&gt; 9).   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelOrder
-     **/
-    @Schema(example = "2", description = "`levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`'s lower numbers  are at the top of the hierarchy (ie field -> 1) and higher numbers are at the bottom of the hierarchy (ie plant -> 9).   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public Integer getLevelOrder() {
-        return levelOrder;
-    }
-
-    public void setLevelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-    }
-
-    public ObservationUnitLevelRelationship1 observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation unit &lt;br/&gt;If this level has on ObservationUnit associated with it, record the observationUnitDbId here. This is intended to construct a strict hierarchy of observationUnits.  &lt;br/&gt;If there is no ObservationUnit associated with this level, this field can set to NULL or omitted from the response.
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "5ab883e9", description = "The ID which uniquely identifies an observation unit <br/>If this level has on ObservationUnit associated with it, record the observationUnitDbId here. This is intended to construct a strict hierarchy of observationUnits.  <br/>If there is no ObservationUnit associated with this level, this field can set to NULL or omitted from the response.")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitLevelRelationship1 observationUnitLevelRelationship1 = (ObservationUnitLevelRelationship1) o;
-        return Objects.equals(this.levelCode, observationUnitLevelRelationship1.levelCode) &&
-                Objects.equals(this.levelName, observationUnitLevelRelationship1.levelName) &&
-                Objects.equals(this.levelOrder, observationUnitLevelRelationship1.levelOrder) &&
-                Objects.equals(this.observationUnitDbId, observationUnitLevelRelationship1.observationUnitDbId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(levelCode, levelName, levelOrder, observationUnitDbId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitLevelRelationship1 {\n");
-
-        sb.append("    levelCode: ").append(toIndentedString(levelCode)).append("\n");
-        sb.append("    levelName: ").append(toIndentedString(levelName)).append("\n");
-        sb.append("    levelOrder: ").append(toIndentedString(levelOrder)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitListResponse.java
deleted file mode 100644
index f0829c44..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationUnitListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationUnitListResponseResult result = null;
-
-    public ObservationUnitListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationUnitListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationUnitListResponse result(ObservationUnitListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationUnitListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationUnitListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitListResponse observationUnitListResponse = (ObservationUnitListResponse) o;
-        return Objects.equals(this._atContext, observationUnitListResponse._atContext) &&
-                Objects.equals(this.metadata, observationUnitListResponse.metadata) &&
-                Objects.equals(this.result, observationUnitListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitListResponseResult.java
deleted file mode 100644
index 4e2a34ce..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationUnitListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitListResponseResult {
-    @SerializedName("data")
-    private List<ObservationUnit> data = new ArrayList<ObservationUnit>();
-
-    public ObservationUnitListResponseResult data(List<ObservationUnit> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ObservationUnitListResponseResult addDataItem(ObservationUnit dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<ObservationUnit> getData() {
-        return data;
-    }
-
-    public void setData(List<ObservationUnit> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitListResponseResult observationUnitListResponseResult = (ObservationUnitListResponseResult) o;
-        return Objects.equals(this.data, observationUnitListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitNewRequest.java
deleted file mode 100644
index 3a850992..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitNewRequest.java
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * ObservationUnitNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("crossDbId")
-    private String crossDbId = null;
-
-    @SerializedName("crossName")
-    private String crossName = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("locationDbId")
-    private String locationDbId = null;
-
-    @SerializedName("locationName")
-    private String locationName = null;
-
-    @SerializedName("observationUnitName")
-    private String observationUnitName = null;
-
-    @SerializedName("observationUnitPUI")
-    private String observationUnitPUI = null;
-
-    @SerializedName("observationUnitPosition")
-    private ObservationUnitObservationUnitPosition observationUnitPosition = null;
-
-    @SerializedName("programDbId")
-    private String programDbId = null;
-
-    @SerializedName("programName")
-    private String programName = null;
-
-    @SerializedName("seedLotDbId")
-    private String seedLotDbId = null;
-
-    @SerializedName("seedLotName")
-    private String seedLotName = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("studyName")
-    private String studyName = null;
-
-    @SerializedName("treatments")
-    private List<ObservationUnitTreatments> treatments = null;
-
-    @SerializedName("trialDbId")
-    private String trialDbId = null;
-
-    @SerializedName("trialName")
-    private String trialName = null;
-
-    public ObservationUnitNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationUnitNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationUnitNewRequest crossDbId(String crossDbId) {
-        this.crossDbId = crossDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for a cross
-     *
-     * @return crossDbId
-     **/
-    @Schema(example = "d105fd6f", description = "the unique identifier for a cross")
-    public String getCrossDbId() {
-        return crossDbId;
-    }
-
-    public void setCrossDbId(String crossDbId) {
-        this.crossDbId = crossDbId;
-    }
-
-    public ObservationUnitNewRequest crossName(String crossName) {
-        this.crossName = crossName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a cross
-     *
-     * @return crossName
-     **/
-    @Schema(example = "my_Crosses_2018_01", description = "the human readable name for a cross")
-    public String getCrossName() {
-        return crossName;
-    }
-
-    public void setCrossName(String crossName) {
-        this.crossName = crossName;
-    }
-
-    public ObservationUnitNewRequest externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationUnitNewRequest addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationUnitNewRequest germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "e9d9ed57", description = "The ID which uniquely identifies a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public ObservationUnitNewRequest germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * Name of the germplasm. It can be the preferred name and does not have to be unique.
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000001", description = "Name of the germplasm. It can be the preferred name and does not have to be unique.")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public ObservationUnitNewRequest locationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a location, associated with this study
-     *
-     * @return locationDbId
-     **/
-    @Schema(example = "0e208b20", description = "The ID which uniquely identifies a location, associated with this study")
-    public String getLocationDbId() {
-        return locationDbId;
-    }
-
-    public void setLocationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-    }
-
-    public ObservationUnitNewRequest locationName(String locationName) {
-        this.locationName = locationName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a location associated with this study
-     *
-     * @return locationName
-     **/
-    @Schema(example = "Field Station Alpha", description = "The human readable name of a location associated with this study")
-    public String getLocationName() {
-        return locationName;
-    }
-
-    public void setLocationName(String locationName) {
-        this.locationName = locationName;
-    }
-
-    public ObservationUnitNewRequest observationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-        return this;
-    }
-
-    /**
-     * A human readable name for an observation unit
-     *
-     * @return observationUnitName
-     **/
-    @Schema(example = "Plot 1", description = "A human readable name for an observation unit")
-    public String getObservationUnitName() {
-        return observationUnitName;
-    }
-
-    public void setObservationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-    }
-
-    public ObservationUnitNewRequest observationUnitPUI(String observationUnitPUI) {
-        this.observationUnitPUI = observationUnitPUI;
-        return this;
-    }
-
-    /**
-     * A Permanent Unique Identifier for an observation unit  MIAPPE V1.1 (DM-72) External ID - Identifier for the observation unit in a persistent repository, comprises the name of the repository and the identifier of the observation unit therein. The EBI Biosamples repository can be used. URI are recommended when possible.
-     *
-     * @return observationUnitPUI
-     **/
-    @Schema(example = "http://pui.per/plot/1a9afc14", description = "A Permanent Unique Identifier for an observation unit  MIAPPE V1.1 (DM-72) External ID - Identifier for the observation unit in a persistent repository, comprises the name of the repository and the identifier of the observation unit therein. The EBI Biosamples repository can be used. URI are recommended when possible.")
-    public String getObservationUnitPUI() {
-        return observationUnitPUI;
-    }
-
-    public void setObservationUnitPUI(String observationUnitPUI) {
-        this.observationUnitPUI = observationUnitPUI;
-    }
-
-    public ObservationUnitNewRequest observationUnitPosition(ObservationUnitObservationUnitPosition observationUnitPosition) {
-        this.observationUnitPosition = observationUnitPosition;
-        return this;
-    }
-
-    /**
-     * Get observationUnitPosition
-     *
-     * @return observationUnitPosition
-     **/
-    @Schema(description = "")
-    public ObservationUnitObservationUnitPosition getObservationUnitPosition() {
-        return observationUnitPosition;
-    }
-
-    public void setObservationUnitPosition(ObservationUnitObservationUnitPosition observationUnitPosition) {
-        this.observationUnitPosition = observationUnitPosition;
-    }
-
-    public ObservationUnitNewRequest programDbId(String programDbId) {
-        this.programDbId = programDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a program
-     *
-     * @return programDbId
-     **/
-    @Schema(example = "2d763a7a", description = "The ID which uniquely identifies a program")
-    public String getProgramDbId() {
-        return programDbId;
-    }
-
-    public void setProgramDbId(String programDbId) {
-        this.programDbId = programDbId;
-    }
-
-    public ObservationUnitNewRequest programName(String programName) {
-        this.programName = programName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a program
-     *
-     * @return programName
-     **/
-    @Schema(example = "The Perfect Breeding Program", description = "The human readable name of a program")
-    public String getProgramName() {
-        return programName;
-    }
-
-    public void setProgramName(String programName) {
-        this.programName = programName;
-    }
-
-    public ObservationUnitNewRequest seedLotDbId(String seedLotDbId) {
-        this.seedLotDbId = seedLotDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for the originating Seed Lot
-     *
-     * @return seedLotDbId
-     **/
-    @Schema(example = "261ecb09", description = "The unique identifier for the originating Seed Lot")
-    public String getSeedLotDbId() {
-        return seedLotDbId;
-    }
-
-    public void setSeedLotDbId(String seedLotDbId) {
-        this.seedLotDbId = seedLotDbId;
-    }
-
-    public ObservationUnitNewRequest seedLotName(String seedLotName) {
-        this.seedLotName = seedLotName;
-        return this;
-    }
-
-    /**
-     * A human readable name for the originating Seed Lot
-     *
-     * @return seedLotName
-     **/
-    @Schema(example = "Seed Lot Alpha", description = "A human readable name for the originating Seed Lot")
-    public String getSeedLotName() {
-        return seedLotName;
-    }
-
-    public void setSeedLotName(String seedLotName) {
-        this.seedLotName = seedLotName;
-    }
-
-    public ObservationUnitNewRequest studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a study within the given database server
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "9865addc", description = "The ID which uniquely identifies a study within the given database server")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public ObservationUnitNewRequest studyName(String studyName) {
-        this.studyName = studyName;
-        return this;
-    }
-
-    /**
-     * The human readable name for a study
-     *
-     * @return studyName
-     **/
-    @Schema(example = "Purple_Tomato_1", description = "The human readable name for a study")
-    public String getStudyName() {
-        return studyName;
-    }
-
-    public void setStudyName(String studyName) {
-        this.studyName = studyName;
-    }
-
-    public ObservationUnitNewRequest treatments(List<ObservationUnitTreatments> treatments) {
-        this.treatments = treatments;
-        return this;
-    }
-
-    public ObservationUnitNewRequest addTreatmentsItem(ObservationUnitTreatments treatmentsItem) {
-        if (this.treatments == null) {
-            this.treatments = new ArrayList<ObservationUnitTreatments>();
-        }
-        this.treatments.add(treatmentsItem);
-        return this;
-    }
-
-    /**
-     * List of treatments applied to an observation unit.  MIAPPE V1.1 (DM-74) Observation Unit factor value - List of values for each factor applied to the observation unit.
-     *
-     * @return treatments
-     **/
-    @Schema(description = "List of treatments applied to an observation unit.  MIAPPE V1.1 (DM-74) Observation Unit factor value - List of values for each factor applied to the observation unit.")
-    public List<ObservationUnitTreatments> getTreatments() {
-        return treatments;
-    }
-
-    public void setTreatments(List<ObservationUnitTreatments> treatments) {
-        this.treatments = treatments;
-    }
-
-    public ObservationUnitNewRequest trialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial
-     *
-     * @return trialDbId
-     **/
-    @Schema(example = "776a609c", description = "The ID which uniquely identifies a trial")
-    public String getTrialDbId() {
-        return trialDbId;
-    }
-
-    public void setTrialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-    }
-
-    public ObservationUnitNewRequest trialName(String trialName) {
-        this.trialName = trialName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial
-     *
-     * @return trialName
-     **/
-    @Schema(example = "Purple Tomato", description = "The human readable name of a trial")
-    public String getTrialName() {
-        return trialName;
-    }
-
-    public void setTrialName(String trialName) {
-        this.trialName = trialName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitNewRequest observationUnitNewRequest = (ObservationUnitNewRequest) o;
-        return Objects.equals(this.additionalInfo, observationUnitNewRequest.additionalInfo) &&
-                Objects.equals(this.crossDbId, observationUnitNewRequest.crossDbId) &&
-                Objects.equals(this.crossName, observationUnitNewRequest.crossName) &&
-                Objects.equals(this.externalReferences, observationUnitNewRequest.externalReferences) &&
-                Objects.equals(this.germplasmDbId, observationUnitNewRequest.germplasmDbId) &&
-                Objects.equals(this.germplasmName, observationUnitNewRequest.germplasmName) &&
-                Objects.equals(this.locationDbId, observationUnitNewRequest.locationDbId) &&
-                Objects.equals(this.locationName, observationUnitNewRequest.locationName) &&
-                Objects.equals(this.observationUnitName, observationUnitNewRequest.observationUnitName) &&
-                Objects.equals(this.observationUnitPUI, observationUnitNewRequest.observationUnitPUI) &&
-                Objects.equals(this.observationUnitPosition, observationUnitNewRequest.observationUnitPosition) &&
-                Objects.equals(this.programDbId, observationUnitNewRequest.programDbId) &&
-                Objects.equals(this.programName, observationUnitNewRequest.programName) &&
-                Objects.equals(this.seedLotDbId, observationUnitNewRequest.seedLotDbId) &&
-                Objects.equals(this.seedLotName, observationUnitNewRequest.seedLotName) &&
-                Objects.equals(this.studyDbId, observationUnitNewRequest.studyDbId) &&
-                Objects.equals(this.studyName, observationUnitNewRequest.studyName) &&
-                Objects.equals(this.treatments, observationUnitNewRequest.treatments) &&
-                Objects.equals(this.trialDbId, observationUnitNewRequest.trialDbId) &&
-                Objects.equals(this.trialName, observationUnitNewRequest.trialName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, crossDbId, crossName, externalReferences, germplasmDbId, germplasmName, locationDbId, locationName, observationUnitName, observationUnitPUI, observationUnitPosition, programDbId, programName, seedLotDbId, seedLotName, studyDbId, studyName, treatments, trialDbId, trialName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    crossDbId: ").append(toIndentedString(crossDbId)).append("\n");
-        sb.append("    crossName: ").append(toIndentedString(crossName)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
-        sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
-        sb.append("    observationUnitName: ").append(toIndentedString(observationUnitName)).append("\n");
-        sb.append("    observationUnitPUI: ").append(toIndentedString(observationUnitPUI)).append("\n");
-        sb.append("    observationUnitPosition: ").append(toIndentedString(observationUnitPosition)).append("\n");
-        sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-        sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
-        sb.append("    seedLotDbId: ").append(toIndentedString(seedLotDbId)).append("\n");
-        sb.append("    seedLotName: ").append(toIndentedString(seedLotName)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    studyName: ").append(toIndentedString(studyName)).append("\n");
-        sb.append("    treatments: ").append(toIndentedString(treatments)).append("\n");
-        sb.append("    trialDbId: ").append(toIndentedString(trialDbId)).append("\n");
-        sb.append("    trialName: ").append(toIndentedString(trialName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitObservationUnitPosition.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitObservationUnitPosition.java
deleted file mode 100644
index 15fbc990..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitObservationUnitPosition.java
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * All positional and layout information related to this Observation Unit   MIAPPE V1.1 (DM-73) Spatial distribution - Type and value of a spatial coordinate (georeference or relative)  or level of observation (plot 45, subblock 7, block 2) provided as a key-value pair of the form type:value.  Levels of observation must be consistent with those listed in the Study section.
- */
-@Schema(description = "All positional and layout information related to this Observation Unit   MIAPPE V1.1 (DM-73) Spatial distribution - Type and value of a spatial coordinate (georeference or relative)  or level of observation (plot 45, subblock 7, block 2) provided as a key-value pair of the form type:value.  Levels of observation must be consistent with those listed in the Study section.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitObservationUnitPosition {
-    /**
-     * The type of entry for this observation unit. ex. \&quot;CHECK\&quot;, \&quot;TEST\&quot;, \&quot;FILLER\&quot;
-     */
-    @JsonAdapter(EntryTypeEnum.Adapter.class)
-    public enum EntryTypeEnum {
-        CHECK("CHECK"),
-        TEST("TEST"),
-        FILLER("FILLER");
-
-        private String value;
-
-        EntryTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static EntryTypeEnum fromValue(String input) {
-            for (EntryTypeEnum b : EntryTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<EntryTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final EntryTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public EntryTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return EntryTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("entryType")
-    private EntryTypeEnum entryType = null;
-
-    @SerializedName("geoCoordinates")
-    private GeoJSON geoCoordinates = null;
-
-    @SerializedName("observationLevel")
-    private ObservationUnitLevel2 observationLevel = null;
-
-    @SerializedName("observationLevelRelationships")
-    private List<ObservationUnitLevelRelationship1> observationLevelRelationships = null;
-
-    @SerializedName("positionCoordinateX")
-    private String positionCoordinateX = null;
-
-    /**
-     * The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   PLANTED_ROW - The physical planted row number   PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column
-     */
-    @JsonAdapter(PositionCoordinateXTypeEnum.Adapter.class)
-    public enum PositionCoordinateXTypeEnum {
-        LONGITUDE("LONGITUDE"),
-        LATITUDE("LATITUDE"),
-        PLANTED_ROW("PLANTED_ROW"),
-        PLANTED_INDIVIDUAL("PLANTED_INDIVIDUAL"),
-        GRID_ROW("GRID_ROW"),
-        GRID_COL("GRID_COL"),
-        MEASURED_ROW("MEASURED_ROW"),
-        MEASURED_COL("MEASURED_COL");
-
-        private String value;
-
-        PositionCoordinateXTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static PositionCoordinateXTypeEnum fromValue(String input) {
-            for (PositionCoordinateXTypeEnum b : PositionCoordinateXTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<PositionCoordinateXTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final PositionCoordinateXTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public PositionCoordinateXTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return PositionCoordinateXTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("positionCoordinateXType")
-    private PositionCoordinateXTypeEnum positionCoordinateXType = null;
-
-    @SerializedName("positionCoordinateY")
-    private String positionCoordinateY = null;
-
-    /**
-     * The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   PLANTED_ROW - The physical planted row number    PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column
-     */
-    @JsonAdapter(PositionCoordinateYTypeEnum.Adapter.class)
-    public enum PositionCoordinateYTypeEnum {
-        LONGITUDE("LONGITUDE"),
-        LATITUDE("LATITUDE"),
-        PLANTED_ROW("PLANTED_ROW"),
-        PLANTED_INDIVIDUAL("PLANTED_INDIVIDUAL"),
-        GRID_ROW("GRID_ROW"),
-        GRID_COL("GRID_COL"),
-        MEASURED_ROW("MEASURED_ROW"),
-        MEASURED_COL("MEASURED_COL");
-
-        private String value;
-
-        PositionCoordinateYTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static PositionCoordinateYTypeEnum fromValue(String input) {
-            for (PositionCoordinateYTypeEnum b : PositionCoordinateYTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<PositionCoordinateYTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final PositionCoordinateYTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public PositionCoordinateYTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return PositionCoordinateYTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("positionCoordinateYType")
-    private PositionCoordinateYTypeEnum positionCoordinateYType = null;
-
-    public ObservationUnitObservationUnitPosition entryType(EntryTypeEnum entryType) {
-        this.entryType = entryType;
-        return this;
-    }
-
-    /**
-     * The type of entry for this observation unit. ex. \&quot;CHECK\&quot;, \&quot;TEST\&quot;, \&quot;FILLER\&quot;
-     *
-     * @return entryType
-     **/
-    @Schema(example = "TEST", description = "The type of entry for this observation unit. ex. \"CHECK\", \"TEST\", \"FILLER\"")
-    public EntryTypeEnum getEntryType() {
-        return entryType;
-    }
-
-    public void setEntryType(EntryTypeEnum entryType) {
-        this.entryType = entryType;
-    }
-
-    public ObservationUnitObservationUnitPosition geoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-        return this;
-    }
-
-    /**
-     * Get geoCoordinates
-     *
-     * @return geoCoordinates
-     **/
-    @Schema(description = "")
-    public GeoJSON getGeoCoordinates() {
-        return geoCoordinates;
-    }
-
-    public void setGeoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-    }
-
-    public ObservationUnitObservationUnitPosition observationLevel(ObservationUnitLevel2 observationLevel) {
-        this.observationLevel = observationLevel;
-        return this;
-    }
-
-    /**
-     * Get observationLevel
-     *
-     * @return observationLevel
-     **/
-    @Schema(description = "")
-    public ObservationUnitLevel2 getObservationLevel() {
-        return observationLevel;
-    }
-
-    public void setObservationLevel(ObservationUnitLevel2 observationLevel) {
-        this.observationLevel = observationLevel;
-    }
-
-    public ObservationUnitObservationUnitPosition observationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-        return this;
-    }
-
-    public ObservationUnitObservationUnitPosition addObservationLevelRelationshipsItem(ObservationUnitLevelRelationship1 observationLevelRelationshipsItem) {
-        if (this.observationLevelRelationships == null) {
-            this.observationLevelRelationships = new ArrayList<ObservationUnitLevelRelationship1>();
-        }
-        this.observationLevelRelationships.add(observationLevelRelationshipsItem);
-        return this;
-    }
-
-    /**
-     * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6). &#x60;levelCode&#x60; is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**
-     *
-     * @return observationLevelRelationships
-     **/
-    @Schema(example = "[{\"levelCode\":\"Field_1\",\"levelName\":\"field\",\"levelOrder\":0},{\"levelCode\":\"Block_12\",\"levelName\":\"block\",\"levelOrder\":1},{\"levelCode\":\"Plot_123\",\"levelName\":\"plot\",\"levelOrder\":2}]", description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6). `levelCode` is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample** ")
-    public List<ObservationUnitLevelRelationship1> getObservationLevelRelationships() {
-        return observationLevelRelationships;
-    }
-
-    public void setObservationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-    }
-
-    public ObservationUnitObservationUnitPosition positionCoordinateX(String positionCoordinateX) {
-        this.positionCoordinateX = positionCoordinateX;
-        return this;
-    }
-
-    /**
-     * The X position coordinate for an observation unit. Different systems may use different coordinate systems.
-     *
-     * @return positionCoordinateX
-     **/
-    @Schema(example = "74", description = "The X position coordinate for an observation unit. Different systems may use different coordinate systems.")
-    public String getPositionCoordinateX() {
-        return positionCoordinateX;
-    }
-
-    public void setPositionCoordinateX(String positionCoordinateX) {
-        this.positionCoordinateX = positionCoordinateX;
-    }
-
-    public ObservationUnitObservationUnitPosition positionCoordinateXType(PositionCoordinateXTypeEnum positionCoordinateXType) {
-        this.positionCoordinateXType = positionCoordinateXType;
-        return this;
-    }
-
-    /**
-     * The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   PLANTED_ROW - The physical planted row number   PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column
-     *
-     * @return positionCoordinateXType
-     **/
-    @Schema(example = "GRID_COL", description = "The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See 'Location Coordinate Encoding' for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See 'Location Coordinate Encoding' for details   PLANTED_ROW - The physical planted row number   PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column ")
-    public PositionCoordinateXTypeEnum getPositionCoordinateXType() {
-        return positionCoordinateXType;
-    }
-
-    public void setPositionCoordinateXType(PositionCoordinateXTypeEnum positionCoordinateXType) {
-        this.positionCoordinateXType = positionCoordinateXType;
-    }
-
-    public ObservationUnitObservationUnitPosition positionCoordinateY(String positionCoordinateY) {
-        this.positionCoordinateY = positionCoordinateY;
-        return this;
-    }
-
-    /**
-     * The Y position coordinate for an observation unit. Different systems may use different coordinate systems.
-     *
-     * @return positionCoordinateY
-     **/
-    @Schema(example = "03", description = "The Y position coordinate for an observation unit. Different systems may use different coordinate systems.")
-    public String getPositionCoordinateY() {
-        return positionCoordinateY;
-    }
-
-    public void setPositionCoordinateY(String positionCoordinateY) {
-        this.positionCoordinateY = positionCoordinateY;
-    }
-
-    public ObservationUnitObservationUnitPosition positionCoordinateYType(PositionCoordinateYTypeEnum positionCoordinateYType) {
-        this.positionCoordinateYType = positionCoordinateYType;
-        return this;
-    }
-
-    /**
-     * The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   PLANTED_ROW - The physical planted row number    PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column
-     *
-     * @return positionCoordinateYType
-     **/
-    @Schema(example = "GRID_ROW", description = "The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See 'Location Coordinate Encoding' for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See 'Location Coordinate Encoding' for details   PLANTED_ROW - The physical planted row number    PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column ")
-    public PositionCoordinateYTypeEnum getPositionCoordinateYType() {
-        return positionCoordinateYType;
-    }
-
-    public void setPositionCoordinateYType(PositionCoordinateYTypeEnum positionCoordinateYType) {
-        this.positionCoordinateYType = positionCoordinateYType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitObservationUnitPosition observationUnitObservationUnitPosition = (ObservationUnitObservationUnitPosition) o;
-        return Objects.equals(this.entryType, observationUnitObservationUnitPosition.entryType) &&
-                Objects.equals(this.geoCoordinates, observationUnitObservationUnitPosition.geoCoordinates) &&
-                Objects.equals(this.observationLevel, observationUnitObservationUnitPosition.observationLevel) &&
-                Objects.equals(this.observationLevelRelationships, observationUnitObservationUnitPosition.observationLevelRelationships) &&
-                Objects.equals(this.positionCoordinateX, observationUnitObservationUnitPosition.positionCoordinateX) &&
-                Objects.equals(this.positionCoordinateXType, observationUnitObservationUnitPosition.positionCoordinateXType) &&
-                Objects.equals(this.positionCoordinateY, observationUnitObservationUnitPosition.positionCoordinateY) &&
-                Objects.equals(this.positionCoordinateYType, observationUnitObservationUnitPosition.positionCoordinateYType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(entryType, geoCoordinates, observationLevel, observationLevelRelationships, positionCoordinateX, positionCoordinateXType, positionCoordinateY, positionCoordinateYType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitObservationUnitPosition {\n");
-
-        sb.append("    entryType: ").append(toIndentedString(entryType)).append("\n");
-        sb.append("    geoCoordinates: ").append(toIndentedString(geoCoordinates)).append("\n");
-        sb.append("    observationLevel: ").append(toIndentedString(observationLevel)).append("\n");
-        sb.append("    observationLevelRelationships: ").append(toIndentedString(observationLevelRelationships)).append("\n");
-        sb.append("    positionCoordinateX: ").append(toIndentedString(positionCoordinateX)).append("\n");
-        sb.append("    positionCoordinateXType: ").append(toIndentedString(positionCoordinateXType)).append("\n");
-        sb.append("    positionCoordinateY: ").append(toIndentedString(positionCoordinateY)).append("\n");
-        sb.append("    positionCoordinateYType: ").append(toIndentedString(positionCoordinateYType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitObservations.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitObservations.java
deleted file mode 100644
index fbbe60ee..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitObservations.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * ObservationUnitObservations
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitObservations {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("collector")
-    private String collector = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("geoCoordinates")
-    private GeoJSON geoCoordinates = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("observationDbId")
-    private String observationDbId = null;
-
-    @SerializedName("observationTimeStamp")
-    private OffsetDateTime observationTimeStamp = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    @SerializedName("observationUnitName")
-    private String observationUnitName = null;
-
-    @SerializedName("observationVariableDbId")
-    private String observationVariableDbId = null;
-
-    @SerializedName("observationVariableName")
-    private String observationVariableName = null;
-
-    @SerializedName("season")
-    private ObservationSeason season = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("uploadedBy")
-    private String uploadedBy = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    public ObservationUnitObservations additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationUnitObservations putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationUnitObservations collector(String collector) {
-        this.collector = collector;
-        return this;
-    }
-
-    /**
-     * The name or identifier of the entity which collected the observation
-     *
-     * @return collector
-     **/
-    @Schema(example = "917d3ae0", description = "The name or identifier of the entity which collected the observation")
-    public String getCollector() {
-        return collector;
-    }
-
-    public void setCollector(String collector) {
-        this.collector = collector;
-    }
-
-    public ObservationUnitObservations externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationUnitObservations addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationUnitObservations geoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-        return this;
-    }
-
-    /**
-     * Get geoCoordinates
-     *
-     * @return geoCoordinates
-     **/
-    @Schema(description = "")
-    public GeoJSON getGeoCoordinates() {
-        return geoCoordinates;
-    }
-
-    public void setGeoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-    }
-
-    public ObservationUnitObservations germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "2408ab11", description = "The ID which uniquely identifies a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public ObservationUnitObservations germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * Name of the germplasm. It can be the preferred name and does not have to be unique.
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000003", description = "Name of the germplasm. It can be the preferred name and does not have to be unique.")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public ObservationUnitObservations observationDbId(String observationDbId) {
-        this.observationDbId = observationDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation
-     *
-     * @return observationDbId
-     **/
-    @Schema(example = "ef24b615", description = "The ID which uniquely identifies an observation")
-    public String getObservationDbId() {
-        return observationDbId;
-    }
-
-    public void setObservationDbId(String observationDbId) {
-        this.observationDbId = observationDbId;
-    }
-
-    public ObservationUnitObservations observationTimeStamp(OffsetDateTime observationTimeStamp) {
-        this.observationTimeStamp = observationTimeStamp;
-        return this;
-    }
-
-    /**
-     * The date and time when this observation was made
-     *
-     * @return observationTimeStamp
-     **/
-    @Schema(description = "The date and time when this observation was made")
-    public OffsetDateTime getObservationTimeStamp() {
-        return observationTimeStamp;
-    }
-
-    public void setObservationTimeStamp(OffsetDateTime observationTimeStamp) {
-        this.observationTimeStamp = observationTimeStamp;
-    }
-
-    public ObservationUnitObservations observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation unit
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "598111d4", description = "The ID which uniquely identifies an observation unit")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-    public ObservationUnitObservations observationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-        return this;
-    }
-
-    /**
-     * A human readable name for an observation unit
-     *
-     * @return observationUnitName
-     **/
-    @Schema(example = "Plot 1", description = "A human readable name for an observation unit")
-    public String getObservationUnitName() {
-        return observationUnitName;
-    }
-
-    public void setObservationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-    }
-
-    public ObservationUnitObservations observationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation variable
-     *
-     * @return observationVariableDbId
-     **/
-    @Schema(example = "c403d107", description = "The ID which uniquely identifies an observation variable")
-    public String getObservationVariableDbId() {
-        return observationVariableDbId;
-    }
-
-    public void setObservationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-    }
-
-    public ObservationUnitObservations observationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-        return this;
-    }
-
-    /**
-     * A human readable name for an observation variable
-     *
-     * @return observationVariableName
-     **/
-    @Schema(example = "Plant Height in meters", description = "A human readable name for an observation variable")
-    public String getObservationVariableName() {
-        return observationVariableName;
-    }
-
-    public void setObservationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-    }
-
-    public ObservationUnitObservations season(ObservationSeason season) {
-        this.season = season;
-        return this;
-    }
-
-    /**
-     * Get season
-     *
-     * @return season
-     **/
-    @Schema(description = "")
-    public ObservationSeason getSeason() {
-        return season;
-    }
-
-    public void setSeason(ObservationSeason season) {
-        this.season = season;
-    }
-
-    public ObservationUnitObservations studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a study within the given database server
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "ef2829db", description = "The ID which uniquely identifies a study within the given database server")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public ObservationUnitObservations uploadedBy(String uploadedBy) {
-        this.uploadedBy = uploadedBy;
-        return this;
-    }
-
-    /**
-     * The name or id of the user who uploaded the observation to the database system
-     *
-     * @return uploadedBy
-     **/
-    @Schema(example = "a2f7f60b", description = "The name or id of the user who uploaded the observation to the database system")
-    public String getUploadedBy() {
-        return uploadedBy;
-    }
-
-    public void setUploadedBy(String uploadedBy) {
-        this.uploadedBy = uploadedBy;
-    }
-
-    public ObservationUnitObservations value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * The value of the data collected as an observation
-     *
-     * @return value
-     **/
-    @Schema(example = "2.3", description = "The value of the data collected as an observation")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitObservations observationUnitObservations = (ObservationUnitObservations) o;
-        return Objects.equals(this.additionalInfo, observationUnitObservations.additionalInfo) &&
-                Objects.equals(this.collector, observationUnitObservations.collector) &&
-                Objects.equals(this.externalReferences, observationUnitObservations.externalReferences) &&
-                Objects.equals(this.geoCoordinates, observationUnitObservations.geoCoordinates) &&
-                Objects.equals(this.germplasmDbId, observationUnitObservations.germplasmDbId) &&
-                Objects.equals(this.germplasmName, observationUnitObservations.germplasmName) &&
-                Objects.equals(this.observationDbId, observationUnitObservations.observationDbId) &&
-                Objects.equals(this.observationTimeStamp, observationUnitObservations.observationTimeStamp) &&
-                Objects.equals(this.observationUnitDbId, observationUnitObservations.observationUnitDbId) &&
-                Objects.equals(this.observationUnitName, observationUnitObservations.observationUnitName) &&
-                Objects.equals(this.observationVariableDbId, observationUnitObservations.observationVariableDbId) &&
-                Objects.equals(this.observationVariableName, observationUnitObservations.observationVariableName) &&
-                Objects.equals(this.season, observationUnitObservations.season) &&
-                Objects.equals(this.studyDbId, observationUnitObservations.studyDbId) &&
-                Objects.equals(this.uploadedBy, observationUnitObservations.uploadedBy) &&
-                Objects.equals(this.value, observationUnitObservations.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, collector, externalReferences, geoCoordinates, germplasmDbId, germplasmName, observationDbId, observationTimeStamp, observationUnitDbId, observationUnitName, observationVariableDbId, observationVariableName, season, studyDbId, uploadedBy, value);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitObservations {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    collector: ").append(toIndentedString(collector)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    geoCoordinates: ").append(toIndentedString(geoCoordinates)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    observationDbId: ").append(toIndentedString(observationDbId)).append("\n");
-        sb.append("    observationTimeStamp: ").append(toIndentedString(observationTimeStamp)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("    observationUnitName: ").append(toIndentedString(observationUnitName)).append("\n");
-        sb.append("    observationVariableDbId: ").append(toIndentedString(observationVariableDbId)).append("\n");
-        sb.append("    observationVariableName: ").append(toIndentedString(observationVariableName)).append("\n");
-        sb.append("    season: ").append(toIndentedString(season)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    uploadedBy: ").append(toIndentedString(uploadedBy)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitPosition.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitPosition.java
deleted file mode 100644
index fef82730..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitPosition.java
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * All positional and layout information related to this Observation Unit   MIAPPE V1.1 (DM-73) Spatial distribution - Type and value of a spatial coordinate (georeference or relative)  or level of observation (plot 45, subblock 7, block 2) provided as a key-value pair of the form type:value.  Levels of observation must be consistent with those listed in the Study section.
- */
-@Schema(description = "All positional and layout information related to this Observation Unit   MIAPPE V1.1 (DM-73) Spatial distribution - Type and value of a spatial coordinate (georeference or relative)  or level of observation (plot 45, subblock 7, block 2) provided as a key-value pair of the form type:value.  Levels of observation must be consistent with those listed in the Study section.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitPosition {
-    /**
-     * The type of entry for this observation unit. ex. \&quot;CHECK\&quot;, \&quot;TEST\&quot;, \&quot;FILLER\&quot;
-     */
-    @JsonAdapter(EntryTypeEnum.Adapter.class)
-    public enum EntryTypeEnum {
-        CHECK("CHECK"),
-        TEST("TEST"),
-        FILLER("FILLER");
-
-        private String value;
-
-        EntryTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static EntryTypeEnum fromValue(String input) {
-            for (EntryTypeEnum b : EntryTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<EntryTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final EntryTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public EntryTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return EntryTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("entryType")
-    private EntryTypeEnum entryType = null;
-
-    @SerializedName("geoCoordinates")
-    private GeoJSON geoCoordinates = null;
-
-    @SerializedName("observationLevel")
-    private ObservationUnitLevel2 observationLevel = null;
-
-    @SerializedName("observationLevelRelationships")
-    private List<ObservationUnitLevelRelationship1> observationLevelRelationships = null;
-
-    @SerializedName("positionCoordinateX")
-    private String positionCoordinateX = null;
-
-    /**
-     * The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   PLANTED_ROW - The physical planted row number   PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column
-     */
-    @JsonAdapter(PositionCoordinateXTypeEnum.Adapter.class)
-    public enum PositionCoordinateXTypeEnum {
-        LONGITUDE("LONGITUDE"),
-        LATITUDE("LATITUDE"),
-        PLANTED_ROW("PLANTED_ROW"),
-        PLANTED_INDIVIDUAL("PLANTED_INDIVIDUAL"),
-        GRID_ROW("GRID_ROW"),
-        GRID_COL("GRID_COL"),
-        MEASURED_ROW("MEASURED_ROW"),
-        MEASURED_COL("MEASURED_COL");
-
-        private String value;
-
-        PositionCoordinateXTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static PositionCoordinateXTypeEnum fromValue(String input) {
-            for (PositionCoordinateXTypeEnum b : PositionCoordinateXTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<PositionCoordinateXTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final PositionCoordinateXTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public PositionCoordinateXTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return PositionCoordinateXTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("positionCoordinateXType")
-    private PositionCoordinateXTypeEnum positionCoordinateXType = null;
-
-    @SerializedName("positionCoordinateY")
-    private String positionCoordinateY = null;
-
-    /**
-     * The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   PLANTED_ROW - The physical planted row number    PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column
-     */
-    @JsonAdapter(PositionCoordinateYTypeEnum.Adapter.class)
-    public enum PositionCoordinateYTypeEnum {
-        LONGITUDE("LONGITUDE"),
-        LATITUDE("LATITUDE"),
-        PLANTED_ROW("PLANTED_ROW"),
-        PLANTED_INDIVIDUAL("PLANTED_INDIVIDUAL"),
-        GRID_ROW("GRID_ROW"),
-        GRID_COL("GRID_COL"),
-        MEASURED_ROW("MEASURED_ROW"),
-        MEASURED_COL("MEASURED_COL");
-
-        private String value;
-
-        PositionCoordinateYTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static PositionCoordinateYTypeEnum fromValue(String input) {
-            for (PositionCoordinateYTypeEnum b : PositionCoordinateYTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<PositionCoordinateYTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final PositionCoordinateYTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public PositionCoordinateYTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return PositionCoordinateYTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("positionCoordinateYType")
-    private PositionCoordinateYTypeEnum positionCoordinateYType = null;
-
-    public ObservationUnitPosition entryType(EntryTypeEnum entryType) {
-        this.entryType = entryType;
-        return this;
-    }
-
-    /**
-     * The type of entry for this observation unit. ex. \&quot;CHECK\&quot;, \&quot;TEST\&quot;, \&quot;FILLER\&quot;
-     *
-     * @return entryType
-     **/
-    @Schema(example = "TEST", description = "The type of entry for this observation unit. ex. \"CHECK\", \"TEST\", \"FILLER\"")
-    public EntryTypeEnum getEntryType() {
-        return entryType;
-    }
-
-    public void setEntryType(EntryTypeEnum entryType) {
-        this.entryType = entryType;
-    }
-
-    public ObservationUnitPosition geoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-        return this;
-    }
-
-    /**
-     * Get geoCoordinates
-     *
-     * @return geoCoordinates
-     **/
-    @Schema(description = "")
-    public GeoJSON getGeoCoordinates() {
-        return geoCoordinates;
-    }
-
-    public void setGeoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-    }
-
-    public ObservationUnitPosition observationLevel(ObservationUnitLevel2 observationLevel) {
-        this.observationLevel = observationLevel;
-        return this;
-    }
-
-    /**
-     * Get observationLevel
-     *
-     * @return observationLevel
-     **/
-    @Schema(description = "")
-    public ObservationUnitLevel2 getObservationLevel() {
-        return observationLevel;
-    }
-
-    public void setObservationLevel(ObservationUnitLevel2 observationLevel) {
-        this.observationLevel = observationLevel;
-    }
-
-    public ObservationUnitPosition observationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-        return this;
-    }
-
-    public ObservationUnitPosition addObservationLevelRelationshipsItem(ObservationUnitLevelRelationship1 observationLevelRelationshipsItem) {
-        if (this.observationLevelRelationships == null) {
-            this.observationLevelRelationships = new ArrayList<ObservationUnitLevelRelationship1>();
-        }
-        this.observationLevelRelationships.add(observationLevelRelationshipsItem);
-        return this;
-    }
-
-    /**
-     * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6). &#x60;levelCode&#x60; is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**
-     *
-     * @return observationLevelRelationships
-     **/
-    @Schema(example = "[{\"levelCode\":\"Field_1\",\"levelName\":\"field\",\"levelOrder\":0},{\"levelCode\":\"Block_12\",\"levelName\":\"block\",\"levelOrder\":1},{\"levelCode\":\"Plot_123\",\"levelName\":\"plot\",\"levelOrder\":2}]", description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6). `levelCode` is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample** ")
-    public List<ObservationUnitLevelRelationship1> getObservationLevelRelationships() {
-        return observationLevelRelationships;
-    }
-
-    public void setObservationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-    }
-
-    public ObservationUnitPosition positionCoordinateX(String positionCoordinateX) {
-        this.positionCoordinateX = positionCoordinateX;
-        return this;
-    }
-
-    /**
-     * The X position coordinate for an observation unit. Different systems may use different coordinate systems.
-     *
-     * @return positionCoordinateX
-     **/
-    @Schema(example = "74", description = "The X position coordinate for an observation unit. Different systems may use different coordinate systems.")
-    public String getPositionCoordinateX() {
-        return positionCoordinateX;
-    }
-
-    public void setPositionCoordinateX(String positionCoordinateX) {
-        this.positionCoordinateX = positionCoordinateX;
-    }
-
-    public ObservationUnitPosition positionCoordinateXType(PositionCoordinateXTypeEnum positionCoordinateXType) {
-        this.positionCoordinateXType = positionCoordinateXType;
-        return this;
-    }
-
-    /**
-     * The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   PLANTED_ROW - The physical planted row number   PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column
-     *
-     * @return positionCoordinateXType
-     **/
-    @Schema(example = "GRID_COL", description = "The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See 'Location Coordinate Encoding' for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See 'Location Coordinate Encoding' for details   PLANTED_ROW - The physical planted row number   PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column ")
-    public PositionCoordinateXTypeEnum getPositionCoordinateXType() {
-        return positionCoordinateXType;
-    }
-
-    public void setPositionCoordinateXType(PositionCoordinateXTypeEnum positionCoordinateXType) {
-        this.positionCoordinateXType = positionCoordinateXType;
-    }
-
-    public ObservationUnitPosition positionCoordinateY(String positionCoordinateY) {
-        this.positionCoordinateY = positionCoordinateY;
-        return this;
-    }
-
-    /**
-     * The Y position coordinate for an observation unit. Different systems may use different coordinate systems.
-     *
-     * @return positionCoordinateY
-     **/
-    @Schema(example = "03", description = "The Y position coordinate for an observation unit. Different systems may use different coordinate systems.")
-    public String getPositionCoordinateY() {
-        return positionCoordinateY;
-    }
-
-    public void setPositionCoordinateY(String positionCoordinateY) {
-        this.positionCoordinateY = positionCoordinateY;
-    }
-
-    public ObservationUnitPosition positionCoordinateYType(PositionCoordinateYTypeEnum positionCoordinateYType) {
-        this.positionCoordinateYType = positionCoordinateYType;
-        return this;
-    }
-
-    /**
-     * The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   PLANTED_ROW - The physical planted row number    PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column
-     *
-     * @return positionCoordinateYType
-     **/
-    @Schema(example = "GRID_ROW", description = "The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See 'Location Coordinate Encoding' for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See 'Location Coordinate Encoding' for details   PLANTED_ROW - The physical planted row number    PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column ")
-    public PositionCoordinateYTypeEnum getPositionCoordinateYType() {
-        return positionCoordinateYType;
-    }
-
-    public void setPositionCoordinateYType(PositionCoordinateYTypeEnum positionCoordinateYType) {
-        this.positionCoordinateYType = positionCoordinateYType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitPosition observationUnitPosition = (ObservationUnitPosition) o;
-        return Objects.equals(this.entryType, observationUnitPosition.entryType) &&
-                Objects.equals(this.geoCoordinates, observationUnitPosition.geoCoordinates) &&
-                Objects.equals(this.observationLevel, observationUnitPosition.observationLevel) &&
-                Objects.equals(this.observationLevelRelationships, observationUnitPosition.observationLevelRelationships) &&
-                Objects.equals(this.positionCoordinateX, observationUnitPosition.positionCoordinateX) &&
-                Objects.equals(this.positionCoordinateXType, observationUnitPosition.positionCoordinateXType) &&
-                Objects.equals(this.positionCoordinateY, observationUnitPosition.positionCoordinateY) &&
-                Objects.equals(this.positionCoordinateYType, observationUnitPosition.positionCoordinateYType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(entryType, geoCoordinates, observationLevel, observationLevelRelationships, positionCoordinateX, positionCoordinateXType, positionCoordinateY, positionCoordinateYType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitPosition {\n");
-
-        sb.append("    entryType: ").append(toIndentedString(entryType)).append("\n");
-        sb.append("    geoCoordinates: ").append(toIndentedString(geoCoordinates)).append("\n");
-        sb.append("    observationLevel: ").append(toIndentedString(observationLevel)).append("\n");
-        sb.append("    observationLevelRelationships: ").append(toIndentedString(observationLevelRelationships)).append("\n");
-        sb.append("    positionCoordinateX: ").append(toIndentedString(positionCoordinateX)).append("\n");
-        sb.append("    positionCoordinateXType: ").append(toIndentedString(positionCoordinateXType)).append("\n");
-        sb.append("    positionCoordinateY: ").append(toIndentedString(positionCoordinateY)).append("\n");
-        sb.append("    positionCoordinateYType: ").append(toIndentedString(positionCoordinateYType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitSearchRequest.java
deleted file mode 100644
index 64b3fdeb..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitSearchRequest.java
+++ /dev/null
@@ -1,842 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationUnitSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitSearchRequest {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("includeObservations")
-    private Boolean includeObservations = null;
-
-    @SerializedName("locationDbIds")
-    private List<String> locationDbIds = null;
-
-    @SerializedName("locationNames")
-    private List<String> locationNames = null;
-
-    @SerializedName("observationLevelRelationships")
-    private List<ObservationUnitLevelRelationship1> observationLevelRelationships = null;
-
-    @SerializedName("observationLevels")
-    private List<ObservationUnitLevel1> observationLevels = null;
-
-    @SerializedName("observationUnitDbIds")
-    private List<String> observationUnitDbIds = null;
-
-    @SerializedName("observationUnitNames")
-    private List<String> observationUnitNames = null;
-
-    @SerializedName("observationVariableDbIds")
-    private List<String> observationVariableDbIds = null;
-
-    @SerializedName("observationVariableNames")
-    private List<String> observationVariableNames = null;
-
-    @SerializedName("observationVariablePUIs")
-    private List<String> observationVariablePUIs = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("seasonDbIds")
-    private List<String> seasonDbIds = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public ObservationUnitSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public ObservationUnitSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public ObservationUnitSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public ObservationUnitSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public ObservationUnitSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public ObservationUnitSearchRequest germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public ObservationUnitSearchRequest includeObservations(Boolean includeObservations) {
-        this.includeObservations = includeObservations;
-        return this;
-    }
-
-    /**
-     * Use this parameter to include a list of observations embedded in each ObservationUnit object.   CAUTION - Use this parameter at your own risk. It may return large, unpaginated lists of observation data. Only set this value to True if you are sure you need to.
-     *
-     * @return includeObservations
-     **/
-    @Schema(example = "false", description = "Use this parameter to include a list of observations embedded in each ObservationUnit object.   CAUTION - Use this parameter at your own risk. It may return large, unpaginated lists of observation data. Only set this value to True if you are sure you need to.")
-    public Boolean isIncludeObservations() {
-        return includeObservations;
-    }
-
-    public void setIncludeObservations(Boolean includeObservations) {
-        this.includeObservations = includeObservations;
-    }
-
-    public ObservationUnitSearchRequest locationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addLocationDbIdsItem(String locationDbIdsItem) {
-        if (this.locationDbIds == null) {
-            this.locationDbIds = new ArrayList<String>();
-        }
-        this.locationDbIds.add(locationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The location ids to search for
-     *
-     * @return locationDbIds
-     **/
-    @Schema(example = "[\"b28911cf\",\"5071d1e4\"]", description = "The location ids to search for")
-    public List<String> getLocationDbIds() {
-        return locationDbIds;
-    }
-
-    public void setLocationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-    }
-
-    public ObservationUnitSearchRequest locationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addLocationNamesItem(String locationNamesItem) {
-        if (this.locationNames == null) {
-            this.locationNames = new ArrayList<String>();
-        }
-        this.locationNames.add(locationNamesItem);
-        return this;
-    }
-
-    /**
-     * A human readable names to search for
-     *
-     * @return locationNames
-     **/
-    @Schema(example = "[\"Location Alpha\",\"The Large Hadron Collider\"]", description = "A human readable names to search for")
-    public List<String> getLocationNames() {
-        return locationNames;
-    }
-
-    public void setLocationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-    }
-
-    public ObservationUnitSearchRequest observationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addObservationLevelRelationshipsItem(ObservationUnitLevelRelationship1 observationLevelRelationshipsItem) {
-        if (this.observationLevelRelationships == null) {
-            this.observationLevelRelationships = new ArrayList<ObservationUnitLevelRelationship1>();
-        }
-        this.observationLevelRelationships.add(observationLevelRelationshipsItem);
-        return this;
-    }
-
-    /**
-     * Searches for values in ObservationUnit-&gt;observationUnitPosition-&gt;observationLevelRelationships
-     *
-     * @return observationLevelRelationships
-     **/
-    @Schema(example = "[{\"levelCode\":\"Field_1\",\"levelName\":\"field\"}]", description = "Searches for values in ObservationUnit->observationUnitPosition->observationLevelRelationships")
-    public List<ObservationUnitLevelRelationship1> getObservationLevelRelationships() {
-        return observationLevelRelationships;
-    }
-
-    public void setObservationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-    }
-
-    public ObservationUnitSearchRequest observationLevels(List<ObservationUnitLevel1> observationLevels) {
-        this.observationLevels = observationLevels;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addObservationLevelsItem(ObservationUnitLevel1 observationLevelsItem) {
-        if (this.observationLevels == null) {
-            this.observationLevels = new ArrayList<ObservationUnitLevel1>();
-        }
-        this.observationLevels.add(observationLevelsItem);
-        return this;
-    }
-
-    /**
-     * Searches for values in ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel
-     *
-     * @return observationLevels
-     **/
-    @Schema(example = "[{\"levelCode\":\"Plot_123\",\"levelName\":\"plot\"},{\"levelCode\":\"Plot_456\",\"levelName\":\"plot\"},{\"levelCode\":\"Plot_789\",\"levelName\":\"plot\"}]", description = "Searches for values in ObservationUnit->observationUnitPosition->observationLevel")
-    public List<ObservationUnitLevel1> getObservationLevels() {
-        return observationLevels;
-    }
-
-    public void setObservationLevels(List<ObservationUnitLevel1> observationLevels) {
-        this.observationLevels = observationLevels;
-    }
-
-    public ObservationUnitSearchRequest observationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-        if (this.observationUnitDbIds == null) {
-            this.observationUnitDbIds = new ArrayList<String>();
-        }
-        this.observationUnitDbIds.add(observationUnitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique id of an observation unit
-     *
-     * @return observationUnitDbIds
-     **/
-    @Schema(example = "[\"66bab7e3\",\"0e5e7f99\"]", description = "The unique id of an observation unit")
-    public List<String> getObservationUnitDbIds() {
-        return observationUnitDbIds;
-    }
-
-    public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-    }
-
-    public ObservationUnitSearchRequest observationUnitNames(List<String> observationUnitNames) {
-        this.observationUnitNames = observationUnitNames;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addObservationUnitNamesItem(String observationUnitNamesItem) {
-        if (this.observationUnitNames == null) {
-            this.observationUnitNames = new ArrayList<String>();
-        }
-        this.observationUnitNames.add(observationUnitNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable identifier for an Observation Unit
-     *
-     * @return observationUnitNames
-     **/
-    @Schema(example = "[\"FieldA_PlotB\",\"SpecialPlantName\"]", description = "The human readable identifier for an Observation Unit")
-    public List<String> getObservationUnitNames() {
-        return observationUnitNames;
-    }
-
-    public void setObservationUnitNames(List<String> observationUnitNames) {
-        this.observationUnitNames = observationUnitNames;
-    }
-
-    public ObservationUnitSearchRequest observationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-        if (this.observationVariableDbIds == null) {
-            this.observationVariableDbIds = new ArrayList<String>();
-        }
-        this.observationVariableDbIds.add(observationVariableDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The DbIds of Variables to search for
-     *
-     * @return observationVariableDbIds
-     **/
-    @Schema(example = "[\"a646187d\",\"6d23513b\"]", description = "The DbIds of Variables to search for")
-    public List<String> getObservationVariableDbIds() {
-        return observationVariableDbIds;
-    }
-
-    public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-    }
-
-    public ObservationUnitSearchRequest observationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addObservationVariableNamesItem(String observationVariableNamesItem) {
-        if (this.observationVariableNames == null) {
-            this.observationVariableNames = new ArrayList<String>();
-        }
-        this.observationVariableNames.add(observationVariableNamesItem);
-        return this;
-    }
-
-    /**
-     * The names of Variables to search for
-     *
-     * @return observationVariableNames
-     **/
-    @Schema(example = "[\"Plant Height in meters\",\"Wheat rust score 1-5\"]", description = "The names of Variables to search for")
-    public List<String> getObservationVariableNames() {
-        return observationVariableNames;
-    }
-
-    public void setObservationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-    }
-
-    public ObservationUnitSearchRequest observationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addObservationVariablePUIsItem(String observationVariablePUIsItem) {
-        if (this.observationVariablePUIs == null) {
-            this.observationVariablePUIs = new ArrayList<String>();
-        }
-        this.observationVariablePUIs.add(observationVariablePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI
-     *
-     * @return observationVariablePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008012\",\"http://my-traits.com/trait/CO_123:0007261\"]", description = "The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI")
-    public List<String> getObservationVariablePUIs() {
-        return observationVariablePUIs;
-    }
-
-    public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-    }
-
-    public ObservationUnitSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public ObservationUnitSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public ObservationUnitSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public ObservationUnitSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public ObservationUnitSearchRequest seasonDbIds(List<String> seasonDbIds) {
-        this.seasonDbIds = seasonDbIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addSeasonDbIdsItem(String seasonDbIdsItem) {
-        if (this.seasonDbIds == null) {
-            this.seasonDbIds = new ArrayList<String>();
-        }
-        this.seasonDbIds.add(seasonDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The year or Phenotyping campaign of a multi-annual study (trees, grape, ...)
-     *
-     * @return seasonDbIds
-     **/
-    @Schema(example = "[\"Spring 2018\",\"Season A\"]", description = "The year or Phenotyping campaign of a multi-annual study (trees, grape, ...)")
-    public List<String> getSeasonDbIds() {
-        return seasonDbIds;
-    }
-
-    public void setSeasonDbIds(List<String> seasonDbIds) {
-        this.seasonDbIds = seasonDbIds;
-    }
-
-    public ObservationUnitSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public ObservationUnitSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public ObservationUnitSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public ObservationUnitSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitSearchRequest observationUnitSearchRequest = (ObservationUnitSearchRequest) o;
-        return Objects.equals(this.commonCropNames, observationUnitSearchRequest.commonCropNames) &&
-                Objects.equals(this.externalReferenceIDs, observationUnitSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, observationUnitSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, observationUnitSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.germplasmDbIds, observationUnitSearchRequest.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, observationUnitSearchRequest.germplasmNames) &&
-                Objects.equals(this.includeObservations, observationUnitSearchRequest.includeObservations) &&
-                Objects.equals(this.locationDbIds, observationUnitSearchRequest.locationDbIds) &&
-                Objects.equals(this.locationNames, observationUnitSearchRequest.locationNames) &&
-                Objects.equals(this.observationLevelRelationships, observationUnitSearchRequest.observationLevelRelationships) &&
-                Objects.equals(this.observationLevels, observationUnitSearchRequest.observationLevels) &&
-                Objects.equals(this.observationUnitDbIds, observationUnitSearchRequest.observationUnitDbIds) &&
-                Objects.equals(this.observationUnitNames, observationUnitSearchRequest.observationUnitNames) &&
-                Objects.equals(this.observationVariableDbIds, observationUnitSearchRequest.observationVariableDbIds) &&
-                Objects.equals(this.observationVariableNames, observationUnitSearchRequest.observationVariableNames) &&
-                Objects.equals(this.observationVariablePUIs, observationUnitSearchRequest.observationVariablePUIs) &&
-                Objects.equals(this.page, observationUnitSearchRequest.page) &&
-                Objects.equals(this.pageSize, observationUnitSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, observationUnitSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, observationUnitSearchRequest.programNames) &&
-                Objects.equals(this.seasonDbIds, observationUnitSearchRequest.seasonDbIds) &&
-                Objects.equals(this.studyDbIds, observationUnitSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, observationUnitSearchRequest.studyNames) &&
-                Objects.equals(this.trialDbIds, observationUnitSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, observationUnitSearchRequest.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds, germplasmNames, includeObservations, locationDbIds, locationNames, observationLevelRelationships, observationLevels, observationUnitDbIds, observationUnitNames, observationVariableDbIds, observationVariableNames, observationVariablePUIs, page, pageSize, programDbIds, programNames, seasonDbIds, studyDbIds, studyNames, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitSearchRequest {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    includeObservations: ").append(toIndentedString(includeObservations)).append("\n");
-        sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-        sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-        sb.append("    observationLevelRelationships: ").append(toIndentedString(observationLevelRelationships)).append("\n");
-        sb.append("    observationLevels: ").append(toIndentedString(observationLevels)).append("\n");
-        sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-        sb.append("    observationUnitNames: ").append(toIndentedString(observationUnitNames)).append("\n");
-        sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-        sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
-        sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    seasonDbIds: ").append(toIndentedString(seasonDbIds)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitSingleResponse.java
deleted file mode 100644
index 329a71ad..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitSingleResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationUnitSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationUnit result = null;
-
-    public ObservationUnitSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationUnitSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationUnitSingleResponse result(ObservationUnit result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationUnit getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationUnit result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitSingleResponse observationUnitSingleResponse = (ObservationUnitSingleResponse) o;
-        return Objects.equals(this._atContext, observationUnitSingleResponse._atContext) &&
-                Objects.equals(this.metadata, observationUnitSingleResponse.metadata) &&
-                Objects.equals(this.result, observationUnitSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitTable.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitTable.java
deleted file mode 100644
index 4ad2e082..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitTable.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationUnitTable
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitTable {
-    @SerializedName("data")
-    private List<List<String>> data = null;
-
-    /**
-     * valid header fields
-     */
-    @JsonAdapter(HeaderRowEnum.Adapter.class)
-    public enum HeaderRowEnum {
-        OBSERVATIONUNITDBID("observationUnitDbId"),
-        OBSERVATIONUNITNAME("observationUnitName"),
-        STUDYDBID("studyDbId"),
-        STUDYNAME("studyName"),
-        GERMPLASMDBID("germplasmDbId"),
-        GERMPLASMNAME("germplasmName"),
-        POSITIONCOORDINATEX("positionCoordinateX"),
-        POSITIONCOORDINATEY("positionCoordinateY"),
-        YEAR("year"),
-        FIELD("field"),
-        PLOT("plot"),
-        SUB_PLOT("sub-plot"),
-        PLANT("plant"),
-        POT("pot"),
-        BLOCK("block"),
-        ENTRY("entry"),
-        REP("rep");
-
-        private String value;
-
-        HeaderRowEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static HeaderRowEnum fromValue(String input) {
-            for (HeaderRowEnum b : HeaderRowEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<HeaderRowEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final HeaderRowEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public HeaderRowEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return HeaderRowEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("headerRow")
-    private List<HeaderRowEnum> headerRow = null;
-
-    @SerializedName("observationVariables")
-    private List<ObservationTableObservationVariables> observationVariables = null;
-
-    public ObservationUnitTable data(List<List<String>> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ObservationUnitTable addDataItem(List<String> dataItem) {
-        if (this.data == null) {
-            this.data = new ArrayList<List<String>>();
-        }
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The 2D matrix of observation data. ObservationVariables and other metadata are the columns, ObservationUnits are the rows.
-     *
-     * @return data
-     **/
-    @Schema(example = "[[\"f3a8a3db\",\"Plant Alpha\",\"0fe3e48b\",\"2017 Plant Study\",\"06307ec0\",\"A0043001\",\"76.50106681\",\"42.44409301\",\"2017\",\"Field_1\",\"Plot_11\",\"SubPlot_111\",\"Plant_1111\",\"Pot_1111\",\"Block_11\",\"Entry_11\",\"Rep_11\",\"25.3\",\"3\",\"50.75\"],[\"05d1b011\",\"Plant Beta\",\"0fe3e48b\",\"2017 Plant Study\",\"59d435cd\",\"A0043002\",\"76.50106683\",\"42.44409301\",\"2017\",\"Field_1\",\"Plot_11\",\"SubPlot_112\",\"Plant_1122\",\"Pot_1122\",\"Block_11\",\"Entry_11\",\"Rep_12\",\"27.9\",\"1\",\"45.345\"],[\"67e2d87c\",\"Plant Gamma\",\"0fe3e48b\",\"2017 Plant Study\",\"06307ec0\",\"A0043001\",\"76.50106681\",\"42.44409356\",\"2017\",\"Field_1\",\"Plot_12\",\"SubPlot_123\",\"Plant_1233\",\"Pot_1233\",\"Block_12\",\"Entry_12\",\"Rep_11\",\"25.5\",\"3\",\"50.76\"],[\"d98d0d4c\",\"Plant Epsilon\",\"0fe3e48b\",\"2017 Plant Study\",\"59d435cd\",\"A0043002\",\"76.50106683\",\"42.44409356\",\"2017\",\"Field_1\",\"Plot_12\",\"SubPlot_124\",\"Plant_1244\",\"Pot_1244\",\"Block_12\",\"Entry_12\",\"Rep_12\",\"28.9\",\"0\",\"46.5\"]]", description = "The 2D matrix of observation data. ObservationVariables and other metadata are the columns, ObservationUnits are the rows.")
-    public List<List<String>> getData() {
-        return data;
-    }
-
-    public void setData(List<List<String>> data) {
-        this.data = data;
-    }
-
-    public ObservationUnitTable headerRow(List<HeaderRowEnum> headerRow) {
-        this.headerRow = headerRow;
-        return this;
-    }
-
-    public ObservationUnitTable addHeaderRowItem(HeaderRowEnum headerRowItem) {
-        if (this.headerRow == null) {
-            this.headerRow = new ArrayList<HeaderRowEnum>();
-        }
-        this.headerRow.add(headerRowItem);
-        return this;
-    }
-
-    /**
-     * &lt;p&gt;The table is REQUIRED to have the following columns&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitDbId - Each row is related to one Observation Unit&lt;/li&gt;   &lt;li&gt;At least one column with an observationVariableDbId&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table may have any or all of the following OPTIONAL columns. Included columns are decided by the server developer&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitName&lt;/li&gt;   &lt;li&gt;studyDbId&lt;/li&gt;   &lt;li&gt;studyName&lt;/li&gt;   &lt;li&gt;germplasmDbId&lt;/li&gt;   &lt;li&gt;germplasmName&lt;/li&gt;   &lt;li&gt;positionCoordinateX&lt;/li&gt;   &lt;li&gt;positionCoordinateY&lt;/li&gt;   &lt;li&gt;year&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table also may have any number of Observation Unit Hierarchy Level columns. For example:&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;field&lt;/li&gt;   &lt;li&gt;plot&lt;/li&gt;   &lt;li&gt;sub-plot&lt;/li&gt;   &lt;li&gt;plant&lt;/li&gt;   &lt;li&gt;pot&lt;/li&gt;   &lt;li&gt;block&lt;/li&gt;   &lt;li&gt;entry&lt;/li&gt;   &lt;li&gt;rep&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The JSON representation provides a pair of extra arrays for defining the headers of the table.  The first array \&quot;headerRow\&quot; will always contain \&quot;observationUnitDbId\&quot; and any or all of the OPTIONAL column header names.  The second array \&quot;observationVariables\&quot; contains the names and DbIds for the Observation Variables represented in the table.  By appending the two arrays, you can construct the complete header row of the table. &lt;/p&gt;
-     *
-     * @return headerRow
-     **/
-    @Schema(example = "[\"observationUnitDbId\",\"observationUnitName\",\"studyDbId\",\"studyName\",\"germplasmDbId\",\"germplasmName\",\"positionCoordinateX\",\"positionCoordinateY\",\"year\",\"field\",\"plot\",\"sub-plot\",\"plant\",\"pot\",\"block\",\"entry\",\"rep\"]", description = "<p>The table is REQUIRED to have the following columns</p> <ul>   <li>observationUnitDbId - Each row is related to one Observation Unit</li>   <li>At least one column with an observationVariableDbId</li> </ul> <p>The table may have any or all of the following OPTIONAL columns. Included columns are decided by the server developer</p> <ul>   <li>observationUnitName</li>   <li>studyDbId</li>   <li>studyName</li>   <li>germplasmDbId</li>   <li>germplasmName</li>   <li>positionCoordinateX</li>   <li>positionCoordinateY</li>   <li>year</li> </ul> <p>The table also may have any number of Observation Unit Hierarchy Level columns. For example:</p> <ul>   <li>field</li>   <li>plot</li>   <li>sub-plot</li>   <li>plant</li>   <li>pot</li>   <li>block</li>   <li>entry</li>   <li>rep</li> </ul> <p>The JSON representation provides a pair of extra arrays for defining the headers of the table.  The first array \"headerRow\" will always contain \"observationUnitDbId\" and any or all of the OPTIONAL column header names.  The second array \"observationVariables\" contains the names and DbIds for the Observation Variables represented in the table.  By appending the two arrays, you can construct the complete header row of the table. </p>")
-    public List<HeaderRowEnum> getHeaderRow() {
-        return headerRow;
-    }
-
-    public void setHeaderRow(List<HeaderRowEnum> headerRow) {
-        this.headerRow = headerRow;
-    }
-
-    public ObservationUnitTable observationVariables(List<ObservationTableObservationVariables> observationVariables) {
-        this.observationVariables = observationVariables;
-        return this;
-    }
-
-    public ObservationUnitTable addObservationVariablesItem(ObservationTableObservationVariables observationVariablesItem) {
-        if (this.observationVariables == null) {
-            this.observationVariables = new ArrayList<ObservationTableObservationVariables>();
-        }
-        this.observationVariables.add(observationVariablesItem);
-        return this;
-    }
-
-    /**
-     * The list of observation variables which have values recorded for them in the data matrix. Append to the &#x27;headerRow&#x27; for complete header row of the table.
-     *
-     * @return observationVariables
-     **/
-    @Schema(example = "[{\"observationVariableDbId\":\"367aa1a9\",\"observationVariableName\":\"Plant height\"},{\"observationVariableDbId\":\"2acb934c\",\"observationVariableName\":\"Carotenoid\"},{\"observationVariableDbId\":\"85a21ce1\",\"observationVariableName\":\"Root color\"},{\"observationVariableDbId\":\"46f590e5\",\"observationVariableName\":\"Virus severity\"}]", description = "The list of observation variables which have values recorded for them in the data matrix. Append to the 'headerRow' for complete header row of the table.")
-    public List<ObservationTableObservationVariables> getObservationVariables() {
-        return observationVariables;
-    }
-
-    public void setObservationVariables(List<ObservationTableObservationVariables> observationVariables) {
-        this.observationVariables = observationVariables;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitTable observationUnitTable = (ObservationUnitTable) o;
-        return Objects.equals(this.data, observationUnitTable.data) &&
-                Objects.equals(this.headerRow, observationUnitTable.headerRow) &&
-                Objects.equals(this.observationVariables, observationUnitTable.observationVariables);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data, headerRow, observationVariables);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitTable {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("    headerRow: ").append(toIndentedString(headerRow)).append("\n");
-        sb.append("    observationVariables: ").append(toIndentedString(observationVariables)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitTableResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitTableResponse.java
deleted file mode 100644
index 1d733701..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitTableResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationUnitTableResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitTableResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationUnitTable result = null;
-
-    public ObservationUnitTableResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationUnitTableResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationUnitTableResponse result(ObservationUnitTable result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationUnitTable getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationUnitTable result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitTableResponse observationUnitTableResponse = (ObservationUnitTableResponse) o;
-        return Objects.equals(this._atContext, observationUnitTableResponse._atContext) &&
-                Objects.equals(this.metadata, observationUnitTableResponse.metadata) &&
-                Objects.equals(this.result, observationUnitTableResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitTableResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitTreatments.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitTreatments.java
deleted file mode 100644
index 3af34b90..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationUnitTreatments.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationUnitTreatments
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitTreatments {
-    @SerializedName("factor")
-    private String factor = null;
-
-    @SerializedName("modality")
-    private String modality = null;
-
-    public ObservationUnitTreatments factor(String factor) {
-        this.factor = factor;
-        return this;
-    }
-
-    /**
-     * The type of treatment/factor. ex. &#x27;fertilizer&#x27;, &#x27;inoculation&#x27;, &#x27;irrigation&#x27;, etc  MIAPPE V1.1 (DM-61) Experimental Factor type - Name/Acronym of the experimental factor.
-     *
-     * @return factor
-     **/
-    @Schema(example = "fertilizer", description = "The type of treatment/factor. ex. 'fertilizer', 'inoculation', 'irrigation', etc  MIAPPE V1.1 (DM-61) Experimental Factor type - Name/Acronym of the experimental factor.")
-    public String getFactor() {
-        return factor;
-    }
-
-    public void setFactor(String factor) {
-        this.factor = factor;
-    }
-
-    public ObservationUnitTreatments modality(String modality) {
-        this.modality = modality;
-        return this;
-    }
-
-    /**
-     * The treatment/factor description. ex. &#x27;low fertilizer&#x27;, &#x27;yellow rust inoculation&#x27;, &#x27;high water&#x27;, etc  MIAPPE V1.1 (DM-62) Experimental Factor description - Free text description of the experimental factor. This includes all relevant treatments planned and protocol planned for all the plants targeted by a given experimental factor.
-     *
-     * @return modality
-     **/
-    @Schema(example = "low fertilizer", description = "The treatment/factor description. ex. 'low fertilizer', 'yellow rust inoculation', 'high water', etc  MIAPPE V1.1 (DM-62) Experimental Factor description - Free text description of the experimental factor. This includes all relevant treatments planned and protocol planned for all the plants targeted by a given experimental factor. ")
-    public String getModality() {
-        return modality;
-    }
-
-    public void setModality(String modality) {
-        this.modality = modality;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitTreatments observationUnitTreatments = (ObservationUnitTreatments) o;
-        return Objects.equals(this.factor, observationUnitTreatments.factor) &&
-                Objects.equals(this.modality, observationUnitTreatments.modality);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(factor, modality);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitTreatments {\n");
-
-        sb.append("    factor: ").append(toIndentedString(factor)).append("\n");
-        sb.append("    modality: ").append(toIndentedString(modality)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariable.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariable.java
deleted file mode 100644
index 704a028d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariable.java
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * ObservationVariable
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariable {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("contextOfUse")
-    private List<String> contextOfUse = null;
-
-    @SerializedName("defaultValue")
-    private String defaultValue = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("growthStage")
-    private String growthStage = null;
-
-    @SerializedName("institution")
-    private String institution = null;
-
-    @SerializedName("language")
-    private String language = null;
-
-    @SerializedName("method")
-    private ObservationVariableMethod method = null;
-
-    @SerializedName("observationVariableDbId")
-    private String observationVariableDbId = null;
-
-    @SerializedName("observationVariableName")
-    private String observationVariableName = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    @SerializedName("scale")
-    private ObservationVariableScale scale = null;
-
-    @SerializedName("scientist")
-    private String scientist = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("submissionTimestamp")
-    private OffsetDateTime submissionTimestamp = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("trait")
-    private ObservationVariableTrait trait = null;
-
-    public ObservationVariable additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationVariable putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationVariable commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Crop name (examples: \&quot;Maize\&quot;, \&quot;Wheat\&quot;)
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Maize", description = "Crop name (examples: \"Maize\", \"Wheat\")")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public ObservationVariable contextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-        return this;
-    }
-
-    public ObservationVariable addContextOfUseItem(String contextOfUseItem) {
-        if (this.contextOfUse == null) {
-            this.contextOfUse = new ArrayList<String>();
-        }
-        this.contextOfUse.add(contextOfUseItem);
-        return this;
-    }
-
-    /**
-     * Indication of how trait is routinely used. (examples: [\&quot;Trial evaluation\&quot;, \&quot;Nursery evaluation\&quot;])
-     *
-     * @return contextOfUse
-     **/
-    @Schema(example = "[\"Trial evaluation\",\"Nursery evaluation\"]", description = "Indication of how trait is routinely used. (examples: [\"Trial evaluation\", \"Nursery evaluation\"])")
-    public List<String> getContextOfUse() {
-        return contextOfUse;
-    }
-
-    public void setContextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-    }
-
-    public ObservationVariable defaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-        return this;
-    }
-
-    /**
-     * Variable default value. (examples: \&quot;red\&quot;, \&quot;2.3\&quot;, etc.)
-     *
-     * @return defaultValue
-     **/
-    @Schema(example = "2.0", description = "Variable default value. (examples: \"red\", \"2.3\", etc.)")
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    public void setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    public ObservationVariable documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/documentation.html", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public ObservationVariable externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationVariable addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationVariable growthStage(String growthStage) {
-        this.growthStage = growthStage;
-        return this;
-    }
-
-    /**
-     * Growth stage at which measurement is made (examples: \&quot;flowering\&quot;)
-     *
-     * @return growthStage
-     **/
-    @Schema(example = "flowering", description = "Growth stage at which measurement is made (examples: \"flowering\")")
-    public String getGrowthStage() {
-        return growthStage;
-    }
-
-    public void setGrowthStage(String growthStage) {
-        this.growthStage = growthStage;
-    }
-
-    public ObservationVariable institution(String institution) {
-        this.institution = institution;
-        return this;
-    }
-
-    /**
-     * Name of institution submitting the variable
-     *
-     * @return institution
-     **/
-    @Schema(example = "The BrAPI Institute", description = "Name of institution submitting the variable")
-    public String getInstitution() {
-        return institution;
-    }
-
-    public void setInstitution(String institution) {
-        this.institution = institution;
-    }
-
-    public ObservationVariable language(String language) {
-        this.language = language;
-        return this;
-    }
-
-    /**
-     * 2 letter ISO 639-1 code for the language of submission of the variable.
-     *
-     * @return language
-     **/
-    @Schema(example = "en", description = "2 letter ISO 639-1 code for the language of submission of the variable.")
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public ObservationVariable method(ObservationVariableMethod method) {
-        this.method = method;
-        return this;
-    }
-
-    /**
-     * Get method
-     *
-     * @return method
-     **/
-    @Schema(description = "")
-    public ObservationVariableMethod getMethod() {
-        return method;
-    }
-
-    public void setMethod(ObservationVariableMethod method) {
-        this.method = method;
-    }
-
-    public ObservationVariable observationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-        return this;
-    }
-
-    /**
-     * Variable unique identifier  MIAPPE V1.1 (DM-83) Variable ID - Code used to identify the variable in the data file. We recommend using a variable definition from the Crop Ontology where possible. Otherwise, the Crop Ontology naming convention is recommended: &lt;trait abbreviation&gt;_&lt;method abbreviation&gt;_&lt;scale abbreviation&gt;). A variable ID must be unique within a given investigation.
-     *
-     * @return observationVariableDbId
-     **/
-    @Schema(example = "b9b7edd1", description = "Variable unique identifier  MIAPPE V1.1 (DM-83) Variable ID - Code used to identify the variable in the data file. We recommend using a variable definition from the Crop Ontology where possible. Otherwise, the Crop Ontology naming convention is recommended: <trait abbreviation>_<method abbreviation>_<scale abbreviation>). A variable ID must be unique within a given investigation.")
-    public String getObservationVariableDbId() {
-        return observationVariableDbId;
-    }
-
-    public void setObservationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-    }
-
-    public ObservationVariable observationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-        return this;
-    }
-
-    /**
-     * Variable name (usually a short name)  MIAPPE V1.1 (DM-84) Variable name - Name of the variable.
-     *
-     * @return observationVariableName
-     **/
-    @Schema(example = "Variable Name", description = "Variable name (usually a short name)  MIAPPE V1.1 (DM-84) Variable name - Name of the variable.")
-    public String getObservationVariableName() {
-        return observationVariableName;
-    }
-
-    public void setObservationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-    }
-
-    public ObservationVariable ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public ObservationVariable scale(ObservationVariableScale scale) {
-        this.scale = scale;
-        return this;
-    }
-
-    /**
-     * Get scale
-     *
-     * @return scale
-     **/
-    @Schema(description = "")
-    public ObservationVariableScale getScale() {
-        return scale;
-    }
-
-    public void setScale(ObservationVariableScale scale) {
-        this.scale = scale;
-    }
-
-    public ObservationVariable scientist(String scientist) {
-        this.scientist = scientist;
-        return this;
-    }
-
-    /**
-     * Name of scientist submitting the variable.
-     *
-     * @return scientist
-     **/
-    @Schema(example = "Dr. Bob Robertson", description = "Name of scientist submitting the variable.")
-    public String getScientist() {
-        return scientist;
-    }
-
-    public void setScientist(String scientist) {
-        this.scientist = scientist;
-    }
-
-    public ObservationVariable status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Variable status. (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Variable status. (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public ObservationVariable submissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-        return this;
-    }
-
-    /**
-     * Timestamp when the Variable was added (ISO 8601)
-     *
-     * @return submissionTimestamp
-     **/
-    @Schema(description = "Timestamp when the Variable was added (ISO 8601)")
-    public OffsetDateTime getSubmissionTimestamp() {
-        return submissionTimestamp;
-    }
-
-    public void setSubmissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-    }
-
-    public ObservationVariable synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public ObservationVariable addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other variable names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Maize Height\",\"Stalk Height\",\"Corn Height\"]", description = "Other variable names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public ObservationVariable trait(ObservationVariableTrait trait) {
-        this.trait = trait;
-        return this;
-    }
-
-    /**
-     * Get trait
-     *
-     * @return trait
-     **/
-    @Schema(description = "")
-    public ObservationVariableTrait getTrait() {
-        return trait;
-    }
-
-    public void setTrait(ObservationVariableTrait trait) {
-        this.trait = trait;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariable observationVariable = (ObservationVariable) o;
-        return Objects.equals(this.additionalInfo, observationVariable.additionalInfo) &&
-                Objects.equals(this.commonCropName, observationVariable.commonCropName) &&
-                Objects.equals(this.contextOfUse, observationVariable.contextOfUse) &&
-                Objects.equals(this.defaultValue, observationVariable.defaultValue) &&
-                Objects.equals(this.documentationURL, observationVariable.documentationURL) &&
-                Objects.equals(this.externalReferences, observationVariable.externalReferences) &&
-                Objects.equals(this.growthStage, observationVariable.growthStage) &&
-                Objects.equals(this.institution, observationVariable.institution) &&
-                Objects.equals(this.language, observationVariable.language) &&
-                Objects.equals(this.method, observationVariable.method) &&
-                Objects.equals(this.observationVariableDbId, observationVariable.observationVariableDbId) &&
-                Objects.equals(this.observationVariableName, observationVariable.observationVariableName) &&
-                Objects.equals(this.ontologyReference, observationVariable.ontologyReference) &&
-                Objects.equals(this.scale, observationVariable.scale) &&
-                Objects.equals(this.scientist, observationVariable.scientist) &&
-                Objects.equals(this.status, observationVariable.status) &&
-                Objects.equals(this.submissionTimestamp, observationVariable.submissionTimestamp) &&
-                Objects.equals(this.synonyms, observationVariable.synonyms) &&
-                Objects.equals(this.trait, observationVariable.trait);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, commonCropName, contextOfUse, defaultValue, documentationURL, externalReferences, growthStage, institution, language, method, observationVariableDbId, observationVariableName, ontologyReference, scale, scientist, status, submissionTimestamp, synonyms, trait);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariable {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    contextOfUse: ").append(toIndentedString(contextOfUse)).append("\n");
-        sb.append("    defaultValue: ").append(toIndentedString(defaultValue)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    growthStage: ").append(toIndentedString(growthStage)).append("\n");
-        sb.append("    institution: ").append(toIndentedString(institution)).append("\n");
-        sb.append("    language: ").append(toIndentedString(language)).append("\n");
-        sb.append("    method: ").append(toIndentedString(method)).append("\n");
-        sb.append("    observationVariableDbId: ").append(toIndentedString(observationVariableDbId)).append("\n");
-        sb.append("    observationVariableName: ").append(toIndentedString(observationVariableName)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scale: ").append(toIndentedString(scale)).append("\n");
-        sb.append("    scientist: ").append(toIndentedString(scientist)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    submissionTimestamp: ").append(toIndentedString(submissionTimestamp)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    trait: ").append(toIndentedString(trait)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableListResponse.java
deleted file mode 100644
index 75baa64e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationVariableListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationVariableListResponseResult result = null;
-
-    public ObservationVariableListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationVariableListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationVariableListResponse result(ObservationVariableListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationVariableListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationVariableListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableListResponse observationVariableListResponse = (ObservationVariableListResponse) o;
-        return Objects.equals(this._atContext, observationVariableListResponse._atContext) &&
-                Objects.equals(this.metadata, observationVariableListResponse.metadata) &&
-                Objects.equals(this.result, observationVariableListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableListResponseResult.java
deleted file mode 100644
index ac2f6eb9..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationVariableListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableListResponseResult {
-    @SerializedName("data")
-    private List<ObservationVariable> data = new ArrayList<ObservationVariable>();
-
-    public ObservationVariableListResponseResult data(List<ObservationVariable> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ObservationVariableListResponseResult addDataItem(ObservationVariable dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<ObservationVariable> getData() {
-        return data;
-    }
-
-    public void setData(List<ObservationVariable> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableListResponseResult observationVariableListResponseResult = (ObservationVariableListResponseResult) o;
-        return Objects.equals(this.data, observationVariableListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableMethod.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableMethod.java
deleted file mode 100644
index c19dd2a8..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableMethod.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A description of the way an Observation should be collected.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Method \&quot;estimation\&quot; or \&quot;drone image processing\&quot;.
- */
-@Schema(description = "A description of the way an Observation should be collected.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Method \"estimation\" or \"drone image processing\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableMethod {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("bibliographicalReference")
-    private String bibliographicalReference = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("formula")
-    private String formula = null;
-
-    @SerializedName("methodClass")
-    private String methodClass = null;
-
-    @SerializedName("methodDbId")
-    private String methodDbId = null;
-
-    @SerializedName("methodName")
-    private String methodName = null;
-
-    @SerializedName("methodPUI")
-    private String methodPUI = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    public ObservationVariableMethod additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationVariableMethod putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationVariableMethod bibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-        return this;
-    }
-
-    /**
-     * Bibliographical reference describing the method. &lt;br/&gt;MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.
-     *
-     * @return bibliographicalReference
-     **/
-    @Schema(example = "Smith, 1893, Really Cool Paper, Popular Journal", description = "Bibliographical reference describing the method. <br/>MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.")
-    public String getBibliographicalReference() {
-        return bibliographicalReference;
-    }
-
-    public void setBibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-    }
-
-    public ObservationVariableMethod description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Method description &lt;br/&gt;MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)
-     *
-     * @return description
-     **/
-    @Schema(example = "A measuring tape was used", description = "Method description <br/>MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public ObservationVariableMethod externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationVariableMethod addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationVariableMethod formula(String formula) {
-        this.formula = formula;
-        return this;
-    }
-
-    /**
-     * For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation
-     *
-     * @return formula
-     **/
-    @Schema(example = "a^2 + b^2 = c^2", description = "For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation")
-    public String getFormula() {
-        return formula;
-    }
-
-    public void setFormula(String formula) {
-        this.formula = formula;
-    }
-
-    public ObservationVariableMethod methodClass(String methodClass) {
-        this.methodClass = methodClass;
-        return this;
-    }
-
-    /**
-     * Method class (examples: \&quot;Measurement\&quot;, \&quot;Counting\&quot;, \&quot;Estimation\&quot;, \&quot;Computation\&quot;, etc.)
-     *
-     * @return methodClass
-     **/
-    @Schema(example = "Measurement", description = "Method class (examples: \"Measurement\", \"Counting\", \"Estimation\", \"Computation\", etc.)")
-    public String getMethodClass() {
-        return methodClass;
-    }
-
-    public void setMethodClass(String methodClass) {
-        this.methodClass = methodClass;
-    }
-
-    public ObservationVariableMethod methodDbId(String methodDbId) {
-        this.methodDbId = methodDbId;
-        return this;
-    }
-
-    /**
-     * Method unique identifier
-     *
-     * @return methodDbId
-     **/
-    @Schema(example = "0adb2764", description = "Method unique identifier")
-    public String getMethodDbId() {
-        return methodDbId;
-    }
-
-    public void setMethodDbId(String methodDbId) {
-        this.methodDbId = methodDbId;
-    }
-
-    public ObservationVariableMethod methodName(String methodName) {
-        this.methodName = methodName;
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodName
-     **/
-    @Schema(example = "Measuring Tape", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public String getMethodName() {
-        return methodName;
-    }
-
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
-    public ObservationVariableMethod methodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000212", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public String getMethodPUI() {
-        return methodPUI;
-    }
-
-    public void setMethodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-    }
-
-    public ObservationVariableMethod ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableMethod observationVariableMethod = (ObservationVariableMethod) o;
-        return Objects.equals(this.additionalInfo, observationVariableMethod.additionalInfo) &&
-                Objects.equals(this.bibliographicalReference, observationVariableMethod.bibliographicalReference) &&
-                Objects.equals(this.description, observationVariableMethod.description) &&
-                Objects.equals(this.externalReferences, observationVariableMethod.externalReferences) &&
-                Objects.equals(this.formula, observationVariableMethod.formula) &&
-                Objects.equals(this.methodClass, observationVariableMethod.methodClass) &&
-                Objects.equals(this.methodDbId, observationVariableMethod.methodDbId) &&
-                Objects.equals(this.methodName, observationVariableMethod.methodName) &&
-                Objects.equals(this.methodPUI, observationVariableMethod.methodPUI) &&
-                Objects.equals(this.ontologyReference, observationVariableMethod.ontologyReference);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, bibliographicalReference, description, externalReferences, formula, methodClass, methodDbId, methodName, methodPUI, ontologyReference);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableMethod {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    bibliographicalReference: ").append(toIndentedString(bibliographicalReference)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    formula: ").append(toIndentedString(formula)).append("\n");
-        sb.append("    methodClass: ").append(toIndentedString(methodClass)).append("\n");
-        sb.append("    methodDbId: ").append(toIndentedString(methodDbId)).append("\n");
-        sb.append("    methodName: ").append(toIndentedString(methodName)).append("\n");
-        sb.append("    methodPUI: ").append(toIndentedString(methodPUI)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableNewRequest.java
deleted file mode 100644
index 84aee874..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableNewRequest.java
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * ObservationVariableNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("contextOfUse")
-    private List<String> contextOfUse = null;
-
-    @SerializedName("defaultValue")
-    private String defaultValue = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("growthStage")
-    private String growthStage = null;
-
-    @SerializedName("institution")
-    private String institution = null;
-
-    @SerializedName("language")
-    private String language = null;
-
-    @SerializedName("method")
-    private ObservationVariableMethod method = null;
-
-    @SerializedName("observationVariableName")
-    private String observationVariableName = null;
-
-    @SerializedName("observationVariablePUI")
-    private String observationVariablePUI = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    @SerializedName("scale")
-    private ObservationVariableScale scale = null;
-
-    @SerializedName("scientist")
-    private String scientist = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("submissionTimestamp")
-    private OffsetDateTime submissionTimestamp = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("trait")
-    private ObservationVariableTrait trait = null;
-
-    public ObservationVariableNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationVariableNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationVariableNewRequest commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Crop name (examples: \&quot;Maize\&quot;, \&quot;Wheat\&quot;)
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Maize", description = "Crop name (examples: \"Maize\", \"Wheat\")")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public ObservationVariableNewRequest contextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-        return this;
-    }
-
-    public ObservationVariableNewRequest addContextOfUseItem(String contextOfUseItem) {
-        if (this.contextOfUse == null) {
-            this.contextOfUse = new ArrayList<String>();
-        }
-        this.contextOfUse.add(contextOfUseItem);
-        return this;
-    }
-
-    /**
-     * Indication of how trait is routinely used. (examples: [\&quot;Trial evaluation\&quot;, \&quot;Nursery evaluation\&quot;])
-     *
-     * @return contextOfUse
-     **/
-    @Schema(example = "[\"Trial evaluation\",\"Nursery evaluation\"]", description = "Indication of how trait is routinely used. (examples: [\"Trial evaluation\", \"Nursery evaluation\"])")
-    public List<String> getContextOfUse() {
-        return contextOfUse;
-    }
-
-    public void setContextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-    }
-
-    public ObservationVariableNewRequest defaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-        return this;
-    }
-
-    /**
-     * Variable default value. (examples: \&quot;red\&quot;, \&quot;2.3\&quot;, etc.)
-     *
-     * @return defaultValue
-     **/
-    @Schema(example = "2.0", description = "Variable default value. (examples: \"red\", \"2.3\", etc.)")
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    public void setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    public ObservationVariableNewRequest documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/documentation.html", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public ObservationVariableNewRequest externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationVariableNewRequest addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationVariableNewRequest growthStage(String growthStage) {
-        this.growthStage = growthStage;
-        return this;
-    }
-
-    /**
-     * Growth stage at which measurement is made (examples: \&quot;flowering\&quot;)
-     *
-     * @return growthStage
-     **/
-    @Schema(example = "flowering", description = "Growth stage at which measurement is made (examples: \"flowering\")")
-    public String getGrowthStage() {
-        return growthStage;
-    }
-
-    public void setGrowthStage(String growthStage) {
-        this.growthStage = growthStage;
-    }
-
-    public ObservationVariableNewRequest institution(String institution) {
-        this.institution = institution;
-        return this;
-    }
-
-    /**
-     * Name of institution submitting the variable
-     *
-     * @return institution
-     **/
-    @Schema(example = "The BrAPI Institute", description = "Name of institution submitting the variable")
-    public String getInstitution() {
-        return institution;
-    }
-
-    public void setInstitution(String institution) {
-        this.institution = institution;
-    }
-
-    public ObservationVariableNewRequest language(String language) {
-        this.language = language;
-        return this;
-    }
-
-    /**
-     * 2 letter ISO 639-1 code for the language of submission of the variable.
-     *
-     * @return language
-     **/
-    @Schema(example = "en", description = "2 letter ISO 639-1 code for the language of submission of the variable.")
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public ObservationVariableNewRequest method(ObservationVariableMethod method) {
-        this.method = method;
-        return this;
-    }
-
-    /**
-     * Get method
-     *
-     * @return method
-     **/
-    @Schema(description = "")
-    public ObservationVariableMethod getMethod() {
-        return method;
-    }
-
-    public void setMethod(ObservationVariableMethod method) {
-        this.method = method;
-    }
-
-    public ObservationVariableNewRequest observationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-        return this;
-    }
-
-    /**
-     * Human readable name of an Observation Variable
-     *
-     * @return observationVariableName
-     **/
-    @Schema(example = "Variable Name", description = "Human readable name of an Observation Variable")
-    public String getObservationVariableName() {
-        return observationVariableName;
-    }
-
-    public void setObservationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-    }
-
-    public ObservationVariableNewRequest observationVariablePUI(String observationVariablePUI) {
-        this.observationVariablePUI = observationVariablePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Observation Variable, usually in the form of a URI
-     *
-     * @return observationVariablePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0009012", description = "The Permanent Unique Identifier of a Observation Variable, usually in the form of a URI")
-    public String getObservationVariablePUI() {
-        return observationVariablePUI;
-    }
-
-    public void setObservationVariablePUI(String observationVariablePUI) {
-        this.observationVariablePUI = observationVariablePUI;
-    }
-
-    public ObservationVariableNewRequest ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public ObservationVariableNewRequest scale(ObservationVariableScale scale) {
-        this.scale = scale;
-        return this;
-    }
-
-    /**
-     * Get scale
-     *
-     * @return scale
-     **/
-    @Schema(description = "")
-    public ObservationVariableScale getScale() {
-        return scale;
-    }
-
-    public void setScale(ObservationVariableScale scale) {
-        this.scale = scale;
-    }
-
-    public ObservationVariableNewRequest scientist(String scientist) {
-        this.scientist = scientist;
-        return this;
-    }
-
-    /**
-     * Name of scientist submitting the variable.
-     *
-     * @return scientist
-     **/
-    @Schema(example = "Dr. Bob Robertson", description = "Name of scientist submitting the variable.")
-    public String getScientist() {
-        return scientist;
-    }
-
-    public void setScientist(String scientist) {
-        this.scientist = scientist;
-    }
-
-    public ObservationVariableNewRequest status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Variable status. (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Variable status. (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public ObservationVariableNewRequest submissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-        return this;
-    }
-
-    /**
-     * Timestamp when the Variable was added (ISO 8601)
-     *
-     * @return submissionTimestamp
-     **/
-    @Schema(description = "Timestamp when the Variable was added (ISO 8601)")
-    public OffsetDateTime getSubmissionTimestamp() {
-        return submissionTimestamp;
-    }
-
-    public void setSubmissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-    }
-
-    public ObservationVariableNewRequest synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public ObservationVariableNewRequest addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other variable names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Maize Height\",\"Stalk Height\",\"Corn Height\"]", description = "Other variable names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public ObservationVariableNewRequest trait(ObservationVariableTrait trait) {
-        this.trait = trait;
-        return this;
-    }
-
-    /**
-     * Get trait
-     *
-     * @return trait
-     **/
-    @Schema(description = "")
-    public ObservationVariableTrait getTrait() {
-        return trait;
-    }
-
-    public void setTrait(ObservationVariableTrait trait) {
-        this.trait = trait;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableNewRequest observationVariableNewRequest = (ObservationVariableNewRequest) o;
-        return Objects.equals(this.additionalInfo, observationVariableNewRequest.additionalInfo) &&
-                Objects.equals(this.commonCropName, observationVariableNewRequest.commonCropName) &&
-                Objects.equals(this.contextOfUse, observationVariableNewRequest.contextOfUse) &&
-                Objects.equals(this.defaultValue, observationVariableNewRequest.defaultValue) &&
-                Objects.equals(this.documentationURL, observationVariableNewRequest.documentationURL) &&
-                Objects.equals(this.externalReferences, observationVariableNewRequest.externalReferences) &&
-                Objects.equals(this.growthStage, observationVariableNewRequest.growthStage) &&
-                Objects.equals(this.institution, observationVariableNewRequest.institution) &&
-                Objects.equals(this.language, observationVariableNewRequest.language) &&
-                Objects.equals(this.method, observationVariableNewRequest.method) &&
-                Objects.equals(this.observationVariableName, observationVariableNewRequest.observationVariableName) &&
-                Objects.equals(this.observationVariablePUI, observationVariableNewRequest.observationVariablePUI) &&
-                Objects.equals(this.ontologyReference, observationVariableNewRequest.ontologyReference) &&
-                Objects.equals(this.scale, observationVariableNewRequest.scale) &&
-                Objects.equals(this.scientist, observationVariableNewRequest.scientist) &&
-                Objects.equals(this.status, observationVariableNewRequest.status) &&
-                Objects.equals(this.submissionTimestamp, observationVariableNewRequest.submissionTimestamp) &&
-                Objects.equals(this.synonyms, observationVariableNewRequest.synonyms) &&
-                Objects.equals(this.trait, observationVariableNewRequest.trait);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, commonCropName, contextOfUse, defaultValue, documentationURL, externalReferences, growthStage, institution, language, method, observationVariableName, observationVariablePUI, ontologyReference, scale, scientist, status, submissionTimestamp, synonyms, trait);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    contextOfUse: ").append(toIndentedString(contextOfUse)).append("\n");
-        sb.append("    defaultValue: ").append(toIndentedString(defaultValue)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    growthStage: ").append(toIndentedString(growthStage)).append("\n");
-        sb.append("    institution: ").append(toIndentedString(institution)).append("\n");
-        sb.append("    language: ").append(toIndentedString(language)).append("\n");
-        sb.append("    method: ").append(toIndentedString(method)).append("\n");
-        sb.append("    observationVariableName: ").append(toIndentedString(observationVariableName)).append("\n");
-        sb.append("    observationVariablePUI: ").append(toIndentedString(observationVariablePUI)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scale: ").append(toIndentedString(scale)).append("\n");
-        sb.append("    scientist: ").append(toIndentedString(scientist)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    submissionTimestamp: ").append(toIndentedString(submissionTimestamp)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    trait: ").append(toIndentedString(trait)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableScale.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableScale.java
deleted file mode 100644
index 4353a932..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableScale.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * A Scale describes the units and acceptable values for an ObservationVariable.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Scale \&quot;inches\&quot; or \&quot;pixels\&quot;.
- */
-@Schema(description = "A Scale describes the units and acceptable values for an ObservationVariable.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Scale \"inches\" or \"pixels\".")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableScale {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypeEnum.Adapter.class)
-    public enum DataTypeEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypeEnum fromValue(String input) {
-            for (DataTypeEnum b : DataTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataType")
-    private DataTypeEnum dataType = null;
-
-    @SerializedName("decimalPlaces")
-    private Integer decimalPlaces = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    @SerializedName("scaleDbId")
-    private String scaleDbId = null;
-
-    @SerializedName("scaleName")
-    private String scaleName = null;
-
-    @SerializedName("scalePUI")
-    private String scalePUI = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    @SerializedName("validValues")
-    private ObservationVariableScaleValidValues validValues = null;
-
-    public ObservationVariableScale additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationVariableScale putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationVariableScale dataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-        return this;
-    }
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     *
-     * @return dataType
-     **/
-    @Schema(example = "Numerical", description = "<p>Class of the scale, entries can be</p> <p>\"Code\" -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \"75VD\" means \"75 %\" of the plant is infected and the plant is very delayed.</p> <p>\"Date\" - The date class is for events expressed in a time format, See ISO 8601</p> <p>\"Duration\" - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months</p> <p>\"Nominal\" - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories</p> <p>\"Numerical\" - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches</p> <p>\"Ordinal\" - Ordinal scales are scales composed of ordered categories</p> <p>\"Text\" - A free text is used to express the trait.</p>")
-    public DataTypeEnum getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-    }
-
-    public ObservationVariableScale decimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-        return this;
-    }
-
-    /**
-     * For numerical, number of decimal places to be reported
-     *
-     * @return decimalPlaces
-     **/
-    @Schema(example = "2", description = "For numerical, number of decimal places to be reported")
-    public Integer getDecimalPlaces() {
-        return decimalPlaces;
-    }
-
-    public void setDecimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-    }
-
-    public ObservationVariableScale externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationVariableScale addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationVariableScale ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public ObservationVariableScale scaleDbId(String scaleDbId) {
-        this.scaleDbId = scaleDbId;
-        return this;
-    }
-
-    /**
-     * Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.
-     *
-     * @return scaleDbId
-     **/
-    @Schema(example = "af730171", description = "Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.")
-    public String getScaleDbId() {
-        return scaleDbId;
-    }
-
-    public void setScaleDbId(String scaleDbId) {
-        this.scaleDbId = scaleDbId;
-    }
-
-    public ObservationVariableScale scaleName(String scaleName) {
-        this.scaleName = scaleName;
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleName
-     **/
-    @Schema(example = "Meters", description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public String getScaleName() {
-        return scaleName;
-    }
-
-    public void setScaleName(String scaleName) {
-        this.scaleName = scaleName;
-    }
-
-    public ObservationVariableScale scalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000112", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public String getScalePUI() {
-        return scalePUI;
-    }
-
-    public void setScalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-    }
-
-    public ObservationVariableScale units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when &#x60;dataType&#x60; is Numeric, but could also be included for other dataTypes when applicable.
-     *
-     * @return units
-     **/
-    @Schema(example = "m", description = "This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when `dataType` is Numeric, but could also be included for other dataTypes when applicable.")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    public ObservationVariableScale validValues(ObservationVariableScaleValidValues validValues) {
-        this.validValues = validValues;
-        return this;
-    }
-
-    /**
-     * Get validValues
-     *
-     * @return validValues
-     **/
-    @Schema(description = "")
-    public ObservationVariableScaleValidValues getValidValues() {
-        return validValues;
-    }
-
-    public void setValidValues(ObservationVariableScaleValidValues validValues) {
-        this.validValues = validValues;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableScale observationVariableScale = (ObservationVariableScale) o;
-        return Objects.equals(this.additionalInfo, observationVariableScale.additionalInfo) &&
-                Objects.equals(this.dataType, observationVariableScale.dataType) &&
-                Objects.equals(this.decimalPlaces, observationVariableScale.decimalPlaces) &&
-                Objects.equals(this.externalReferences, observationVariableScale.externalReferences) &&
-                Objects.equals(this.ontologyReference, observationVariableScale.ontologyReference) &&
-                Objects.equals(this.scaleDbId, observationVariableScale.scaleDbId) &&
-                Objects.equals(this.scaleName, observationVariableScale.scaleName) &&
-                Objects.equals(this.scalePUI, observationVariableScale.scalePUI) &&
-                Objects.equals(this.units, observationVariableScale.units) &&
-                Objects.equals(this.validValues, observationVariableScale.validValues);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, dataType, decimalPlaces, externalReferences, ontologyReference, scaleDbId, scaleName, scalePUI, units, validValues);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableScale {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
-        sb.append("    decimalPlaces: ").append(toIndentedString(decimalPlaces)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scaleDbId: ").append(toIndentedString(scaleDbId)).append("\n");
-        sb.append("    scaleName: ").append(toIndentedString(scaleName)).append("\n");
-        sb.append("    scalePUI: ").append(toIndentedString(scalePUI)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("    validValues: ").append(toIndentedString(validValues)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableScaleValidValues.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableScaleValidValues.java
deleted file mode 100644
index 5bcc761c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableScaleValidValues.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationVariableScaleValidValues
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableScaleValidValues {
-    @SerializedName("categories")
-    private List<ObservationVariableScaleValidValuesCategories> categories = null;
-
-    @SerializedName("max")
-    private Integer max = null;
-
-    @SerializedName("maximumValue")
-    private String maximumValue = null;
-
-    @SerializedName("min")
-    private Integer min = null;
-
-    @SerializedName("minimumValue")
-    private String minimumValue = null;
-
-    public ObservationVariableScaleValidValues categories(List<ObservationVariableScaleValidValuesCategories> categories) {
-        this.categories = categories;
-        return this;
-    }
-
-    public ObservationVariableScaleValidValues addCategoriesItem(ObservationVariableScaleValidValuesCategories categoriesItem) {
-        if (this.categories == null) {
-            this.categories = new ArrayList<ObservationVariableScaleValidValuesCategories>();
-        }
-        this.categories.add(categoriesItem);
-        return this;
-    }
-
-    /**
-     * List of possible values with optional labels
-     *
-     * @return categories
-     **/
-    @Schema(example = "[{\"label\":\"low\",\"value\":\"0\"},{\"label\":\"medium\",\"value\":\"5\"},{\"label\":\"high\",\"value\":\"10\"}]", description = "List of possible values with optional labels")
-    public List<ObservationVariableScaleValidValuesCategories> getCategories() {
-        return categories;
-    }
-
-    public void setCategories(List<ObservationVariableScaleValidValuesCategories> categories) {
-        this.categories = categories;
-    }
-
-    public ObservationVariableScaleValidValues max(Integer max) {
-        this.max = max;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;maximumValue&#x60;. Github issue number #450  &lt;br&gt;Maximum value for numerical scales. Typically used for data capture control and QC.
-     *
-     * @return max
-     **/
-    @Schema(example = "9999", description = "**Deprecated in v2.1** Please use `maximumValue`. Github issue number #450  <br>Maximum value for numerical scales. Typically used for data capture control and QC.")
-    public Integer getMax() {
-        return max;
-    }
-
-    public void setMax(Integer max) {
-        this.max = max;
-    }
-
-    public ObservationVariableScaleValidValues maximumValue(String maximumValue) {
-        this.maximumValue = maximumValue;
-        return this;
-    }
-
-    /**
-     * Maximum value for numerical, date, and time scales. Typically used for data capture control and QC.
-     *
-     * @return maximumValue
-     **/
-    @Schema(example = "9999", description = "Maximum value for numerical, date, and time scales. Typically used for data capture control and QC.")
-    public String getMaximumValue() {
-        return maximumValue;
-    }
-
-    public void setMaximumValue(String maximumValue) {
-        this.maximumValue = maximumValue;
-    }
-
-    public ObservationVariableScaleValidValues min(Integer min) {
-        this.min = min;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;minimumValue&#x60;. Github issue number #450  &lt;br&gt;Minimum value for numerical scales. Typically used for data capture control and QC.
-     *
-     * @return min
-     **/
-    @Schema(example = "2", description = "**Deprecated in v2.1** Please use `minimumValue`. Github issue number #450  <br>Minimum value for numerical scales. Typically used for data capture control and QC.")
-    public Integer getMin() {
-        return min;
-    }
-
-    public void setMin(Integer min) {
-        this.min = min;
-    }
-
-    public ObservationVariableScaleValidValues minimumValue(String minimumValue) {
-        this.minimumValue = minimumValue;
-        return this;
-    }
-
-    /**
-     * Minimum value for numerical, date, and time scales. Typically used for data capture control and QC.
-     *
-     * @return minimumValue
-     **/
-    @Schema(example = "2", description = "Minimum value for numerical, date, and time scales. Typically used for data capture control and QC.")
-    public String getMinimumValue() {
-        return minimumValue;
-    }
-
-    public void setMinimumValue(String minimumValue) {
-        this.minimumValue = minimumValue;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableScaleValidValues observationVariableScaleValidValues = (ObservationVariableScaleValidValues) o;
-        return Objects.equals(this.categories, observationVariableScaleValidValues.categories) &&
-                Objects.equals(this.max, observationVariableScaleValidValues.max) &&
-                Objects.equals(this.maximumValue, observationVariableScaleValidValues.maximumValue) &&
-                Objects.equals(this.min, observationVariableScaleValidValues.min) &&
-                Objects.equals(this.minimumValue, observationVariableScaleValidValues.minimumValue);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(categories, max, maximumValue, min, minimumValue);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableScaleValidValues {\n");
-
-        sb.append("    categories: ").append(toIndentedString(categories)).append("\n");
-        sb.append("    max: ").append(toIndentedString(max)).append("\n");
-        sb.append("    maximumValue: ").append(toIndentedString(maximumValue)).append("\n");
-        sb.append("    min: ").append(toIndentedString(min)).append("\n");
-        sb.append("    minimumValue: ").append(toIndentedString(minimumValue)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableScaleValidValuesCategories.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableScaleValidValuesCategories.java
deleted file mode 100644
index 732fc2d1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableScaleValidValuesCategories.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationVariableScaleValidValuesCategories
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableScaleValidValuesCategories {
-    @SerializedName("label")
-    private String label = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    public ObservationVariableScaleValidValuesCategories label(String label) {
-        this.label = label;
-        return this;
-    }
-
-    /**
-     * A text label for a category
-     *
-     * @return label
-     **/
-    @Schema(description = "A text label for a category")
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    public ObservationVariableScaleValidValuesCategories value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * The actual value for a category
-     *
-     * @return value
-     **/
-    @Schema(description = "The actual value for a category")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableScaleValidValuesCategories observationVariableScaleValidValuesCategories = (ObservationVariableScaleValidValuesCategories) o;
-        return Objects.equals(this.label, observationVariableScaleValidValuesCategories.label) &&
-                Objects.equals(this.value, observationVariableScaleValidValuesCategories.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(label, value);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableScaleValidValuesCategories {\n");
-
-        sb.append("    label: ").append(toIndentedString(label)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableSearchRequest.java
deleted file mode 100644
index 489ead80..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableSearchRequest.java
+++ /dev/null
@@ -1,1130 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationVariableSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableSearchRequest {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypesEnum.Adapter.class)
-    public enum DataTypesEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypesEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypesEnum fromValue(String input) {
-            for (DataTypesEnum b : DataTypesEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypesEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypesEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypesEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypesEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataTypes")
-    private List<DataTypesEnum> dataTypes = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("methodDbIds")
-    private List<String> methodDbIds = null;
-
-    @SerializedName("methodNames")
-    private List<String> methodNames = null;
-
-    @SerializedName("methodPUIs")
-    private List<String> methodPUIs = null;
-
-    @SerializedName("observationVariableDbIds")
-    private List<String> observationVariableDbIds = null;
-
-    @SerializedName("observationVariableNames")
-    private List<String> observationVariableNames = null;
-
-    @SerializedName("observationVariablePUIs")
-    private List<String> observationVariablePUIs = null;
-
-    @SerializedName("ontologyDbIds")
-    private List<String> ontologyDbIds = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("scaleDbIds")
-    private List<String> scaleDbIds = null;
-
-    @SerializedName("scaleNames")
-    private List<String> scaleNames = null;
-
-    @SerializedName("scalePUIs")
-    private List<String> scalePUIs = null;
-
-    @SerializedName("studyDbId")
-    private List<String> studyDbId = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("traitAttributePUIs")
-    private List<String> traitAttributePUIs = null;
-
-    @SerializedName("traitAttributes")
-    private List<String> traitAttributes = null;
-
-    @SerializedName("traitClasses")
-    private List<String> traitClasses = null;
-
-    @SerializedName("traitDbIds")
-    private List<String> traitDbIds = null;
-
-    @SerializedName("traitEntities")
-    private List<String> traitEntities = null;
-
-    @SerializedName("traitEntityPUIs")
-    private List<String> traitEntityPUIs = null;
-
-    @SerializedName("traitNames")
-    private List<String> traitNames = null;
-
-    @SerializedName("traitPUIs")
-    private List<String> traitPUIs = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public ObservationVariableSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public ObservationVariableSearchRequest dataTypes(List<DataTypesEnum> dataTypes) {
-        this.dataTypes = dataTypes;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addDataTypesItem(DataTypesEnum dataTypesItem) {
-        if (this.dataTypes == null) {
-            this.dataTypes = new ArrayList<DataTypesEnum>();
-        }
-        this.dataTypes.add(dataTypesItem);
-        return this;
-    }
-
-    /**
-     * List of scale data types to filter search results
-     *
-     * @return dataTypes
-     **/
-    @Schema(example = "[\"Numerical\",\"Ordinal\",\"Text\"]", description = "List of scale data types to filter search results")
-    public List<DataTypesEnum> getDataTypes() {
-        return dataTypes;
-    }
-
-    public void setDataTypes(List<DataTypesEnum> dataTypes) {
-        this.dataTypes = dataTypes;
-    }
-
-    public ObservationVariableSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public ObservationVariableSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public ObservationVariableSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public ObservationVariableSearchRequest methodDbIds(List<String> methodDbIds) {
-        this.methodDbIds = methodDbIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addMethodDbIdsItem(String methodDbIdsItem) {
-        if (this.methodDbIds == null) {
-            this.methodDbIds = new ArrayList<String>();
-        }
-        this.methodDbIds.add(methodDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of methods to filter search results
-     *
-     * @return methodDbIds
-     **/
-    @Schema(example = "[\"07e34f83\",\"d3d5517a\"]", description = "List of methods to filter search results")
-    public List<String> getMethodDbIds() {
-        return methodDbIds;
-    }
-
-    public void setMethodDbIds(List<String> methodDbIds) {
-        this.methodDbIds = methodDbIds;
-    }
-
-    public ObservationVariableSearchRequest methodNames(List<String> methodNames) {
-        this.methodNames = methodNames;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addMethodNamesItem(String methodNamesItem) {
-        if (this.methodNames == null) {
-            this.methodNames = new ArrayList<String>();
-        }
-        this.methodNames.add(methodNamesItem);
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodNames
-     **/
-    @Schema(example = "[\"Measuring Tape\",\"Spectrometer\"]", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public List<String> getMethodNames() {
-        return methodNames;
-    }
-
-    public void setMethodNames(List<String> methodNames) {
-        this.methodNames = methodNames;
-    }
-
-    public ObservationVariableSearchRequest methodPUIs(List<String> methodPUIs) {
-        this.methodPUIs = methodPUIs;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addMethodPUIsItem(String methodPUIsItem) {
-        if (this.methodPUIs == null) {
-            this.methodPUIs = new ArrayList<String>();
-        }
-        this.methodPUIs.add(methodPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000212\",\"http://my-traits.com/trait/CO_123:0003557\"]", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public List<String> getMethodPUIs() {
-        return methodPUIs;
-    }
-
-    public void setMethodPUIs(List<String> methodPUIs) {
-        this.methodPUIs = methodPUIs;
-    }
-
-    public ObservationVariableSearchRequest observationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-        if (this.observationVariableDbIds == null) {
-            this.observationVariableDbIds = new ArrayList<String>();
-        }
-        this.observationVariableDbIds.add(observationVariableDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The DbIds of Variables to search for
-     *
-     * @return observationVariableDbIds
-     **/
-    @Schema(example = "[\"a646187d\",\"6d23513b\"]", description = "The DbIds of Variables to search for")
-    public List<String> getObservationVariableDbIds() {
-        return observationVariableDbIds;
-    }
-
-    public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-    }
-
-    public ObservationVariableSearchRequest observationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addObservationVariableNamesItem(String observationVariableNamesItem) {
-        if (this.observationVariableNames == null) {
-            this.observationVariableNames = new ArrayList<String>();
-        }
-        this.observationVariableNames.add(observationVariableNamesItem);
-        return this;
-    }
-
-    /**
-     * The names of Variables to search for
-     *
-     * @return observationVariableNames
-     **/
-    @Schema(example = "[\"Plant Height in meters\",\"Wheat rust score 1-5\"]", description = "The names of Variables to search for")
-    public List<String> getObservationVariableNames() {
-        return observationVariableNames;
-    }
-
-    public void setObservationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-    }
-
-    public ObservationVariableSearchRequest observationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addObservationVariablePUIsItem(String observationVariablePUIsItem) {
-        if (this.observationVariablePUIs == null) {
-            this.observationVariablePUIs = new ArrayList<String>();
-        }
-        this.observationVariablePUIs.add(observationVariablePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI
-     *
-     * @return observationVariablePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008012\",\"http://my-traits.com/trait/CO_123:0007261\"]", description = "The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI")
-    public List<String> getObservationVariablePUIs() {
-        return observationVariablePUIs;
-    }
-
-    public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-    }
-
-    public ObservationVariableSearchRequest ontologyDbIds(List<String> ontologyDbIds) {
-        this.ontologyDbIds = ontologyDbIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addOntologyDbIdsItem(String ontologyDbIdsItem) {
-        if (this.ontologyDbIds == null) {
-            this.ontologyDbIds = new ArrayList<String>();
-        }
-        this.ontologyDbIds.add(ontologyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of ontology IDs to search for
-     *
-     * @return ontologyDbIds
-     **/
-    @Schema(example = "[\"f44f7b23\",\"a26b576e\"]", description = "List of ontology IDs to search for")
-    public List<String> getOntologyDbIds() {
-        return ontologyDbIds;
-    }
-
-    public void setOntologyDbIds(List<String> ontologyDbIds) {
-        this.ontologyDbIds = ontologyDbIds;
-    }
-
-    public ObservationVariableSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public ObservationVariableSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public ObservationVariableSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public ObservationVariableSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public ObservationVariableSearchRequest scaleDbIds(List<String> scaleDbIds) {
-        this.scaleDbIds = scaleDbIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addScaleDbIdsItem(String scaleDbIdsItem) {
-        if (this.scaleDbIds == null) {
-            this.scaleDbIds = new ArrayList<String>();
-        }
-        this.scaleDbIds.add(scaleDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Scale
-     *
-     * @return scaleDbIds
-     **/
-    @Schema(example = "[\"a13ecffa\",\"7e1afe4f\"]", description = "The unique identifier for a Scale")
-    public List<String> getScaleDbIds() {
-        return scaleDbIds;
-    }
-
-    public void setScaleDbIds(List<String> scaleDbIds) {
-        this.scaleDbIds = scaleDbIds;
-    }
-
-    public ObservationVariableSearchRequest scaleNames(List<String> scaleNames) {
-        this.scaleNames = scaleNames;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addScaleNamesItem(String scaleNamesItem) {
-        if (this.scaleNames == null) {
-            this.scaleNames = new ArrayList<String>();
-        }
-        this.scaleNames.add(scaleNamesItem);
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleNames
-     **/
-    @Schema(example = "[\"Meters\",\"Liters\"]", description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public List<String> getScaleNames() {
-        return scaleNames;
-    }
-
-    public void setScaleNames(List<String> scaleNames) {
-        this.scaleNames = scaleNames;
-    }
-
-    public ObservationVariableSearchRequest scalePUIs(List<String> scalePUIs) {
-        this.scalePUIs = scalePUIs;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addScalePUIsItem(String scalePUIsItem) {
-        if (this.scalePUIs == null) {
-            this.scalePUIs = new ArrayList<String>();
-        }
-        this.scalePUIs.add(scalePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000336\",\"http://my-traits.com/trait/CO_123:0000560\"]", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public List<String> getScalePUIs() {
-        return scalePUIs;
-    }
-
-    public void setScalePUIs(List<String> scalePUIs) {
-        this.scalePUIs = scalePUIs;
-    }
-
-    public ObservationVariableSearchRequest studyDbId(List<String> studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addStudyDbIdItem(String studyDbIdItem) {
-        if (this.studyDbId == null) {
-            this.studyDbId = new ArrayList<String>();
-        }
-        this.studyDbId.add(studyDbIdItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;studyDbIds&#x60;. Github issue number #483  &lt;br&gt;The unique ID of a studies to filter on
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "[\"5bcac0ae\",\"7f48e22d\"]", description = "**Deprecated in v2.1** Please use `studyDbIds`. Github issue number #483  <br>The unique ID of a studies to filter on")
-    public List<String> getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(List<String> studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public ObservationVariableSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public ObservationVariableSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public ObservationVariableSearchRequest traitAttributePUIs(List<String> traitAttributePUIs) {
-        this.traitAttributePUIs = traitAttributePUIs;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTraitAttributePUIsItem(String traitAttributePUIsItem) {
-        if (this.traitAttributePUIs == null) {
-            this.traitAttributePUIs = new ArrayList<String>();
-        }
-        this.traitAttributePUIs.add(traitAttributePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return traitAttributePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008336\",\"http://my-traits.com/trait/CO_123:0001092\"]", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public List<String> getTraitAttributePUIs() {
-        return traitAttributePUIs;
-    }
-
-    public void setTraitAttributePUIs(List<String> traitAttributePUIs) {
-        this.traitAttributePUIs = traitAttributePUIs;
-    }
-
-    public ObservationVariableSearchRequest traitAttributes(List<String> traitAttributes) {
-        this.traitAttributes = traitAttributes;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTraitAttributesItem(String traitAttributesItem) {
-        if (this.traitAttributes == null) {
-            this.traitAttributes = new ArrayList<String>();
-        }
-        this.traitAttributes.add(traitAttributesItem);
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return traitAttributes
-     **/
-    @Schema(example = "[\"Height\",\"Color\"]", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public List<String> getTraitAttributes() {
-        return traitAttributes;
-    }
-
-    public void setTraitAttributes(List<String> traitAttributes) {
-        this.traitAttributes = traitAttributes;
-    }
-
-    public ObservationVariableSearchRequest traitClasses(List<String> traitClasses) {
-        this.traitClasses = traitClasses;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTraitClassesItem(String traitClassesItem) {
-        if (this.traitClasses == null) {
-            this.traitClasses = new ArrayList<String>();
-        }
-        this.traitClasses.add(traitClassesItem);
-        return this;
-    }
-
-    /**
-     * List of trait classes to filter search results
-     *
-     * @return traitClasses
-     **/
-    @Schema(example = "[\"morphological\",\"phenological\",\"agronomical\"]", description = "List of trait classes to filter search results")
-    public List<String> getTraitClasses() {
-        return traitClasses;
-    }
-
-    public void setTraitClasses(List<String> traitClasses) {
-        this.traitClasses = traitClasses;
-    }
-
-    public ObservationVariableSearchRequest traitDbIds(List<String> traitDbIds) {
-        this.traitDbIds = traitDbIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTraitDbIdsItem(String traitDbIdsItem) {
-        if (this.traitDbIds == null) {
-            this.traitDbIds = new ArrayList<String>();
-        }
-        this.traitDbIds.add(traitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Trait
-     *
-     * @return traitDbIds
-     **/
-    @Schema(example = "[\"ef81147b\",\"78d82fad\"]", description = "The unique identifier for a Trait")
-    public List<String> getTraitDbIds() {
-        return traitDbIds;
-    }
-
-    public void setTraitDbIds(List<String> traitDbIds) {
-        this.traitDbIds = traitDbIds;
-    }
-
-    public ObservationVariableSearchRequest traitEntities(List<String> traitEntities) {
-        this.traitEntities = traitEntities;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTraitEntitiesItem(String traitEntitiesItem) {
-        if (this.traitEntities == null) {
-            this.traitEntities = new ArrayList<String>();
-        }
-        this.traitEntities.add(traitEntitiesItem);
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return traitEntities
-     **/
-    @Schema(example = "[\"Stalk\",\"Root\"]", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public List<String> getTraitEntities() {
-        return traitEntities;
-    }
-
-    public void setTraitEntities(List<String> traitEntities) {
-        this.traitEntities = traitEntities;
-    }
-
-    public ObservationVariableSearchRequest traitEntityPUIs(List<String> traitEntityPUIs) {
-        this.traitEntityPUIs = traitEntityPUIs;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTraitEntityPUIsItem(String traitEntityPUIsItem) {
-        if (this.traitEntityPUIs == null) {
-            this.traitEntityPUIs = new ArrayList<String>();
-        }
-        this.traitEntityPUIs.add(traitEntityPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return traitEntityPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0004098\",\"http://my-traits.com/trait/CO_123:0002366\"]", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public List<String> getTraitEntityPUIs() {
-        return traitEntityPUIs;
-    }
-
-    public void setTraitEntityPUIs(List<String> traitEntityPUIs) {
-        this.traitEntityPUIs = traitEntityPUIs;
-    }
-
-    public ObservationVariableSearchRequest traitNames(List<String> traitNames) {
-        this.traitNames = traitNames;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTraitNamesItem(String traitNamesItem) {
-        if (this.traitNames == null) {
-            this.traitNames = new ArrayList<String>();
-        }
-        this.traitNames.add(traitNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitNames
-     **/
-    @Schema(example = "[\"Stalk Height\",\"Root Color\"]", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public List<String> getTraitNames() {
-        return traitNames;
-    }
-
-    public void setTraitNames(List<String> traitNames) {
-        this.traitNames = traitNames;
-    }
-
-    public ObservationVariableSearchRequest traitPUIs(List<String> traitPUIs) {
-        this.traitPUIs = traitPUIs;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTraitPUIsItem(String traitPUIsItem) {
-        if (this.traitPUIs == null) {
-            this.traitPUIs = new ArrayList<String>();
-        }
-        this.traitPUIs.add(traitPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000456\",\"http://my-traits.com/trait/CO_123:0000820\"]", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public List<String> getTraitPUIs() {
-        return traitPUIs;
-    }
-
-    public void setTraitPUIs(List<String> traitPUIs) {
-        this.traitPUIs = traitPUIs;
-    }
-
-    public ObservationVariableSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public ObservationVariableSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableSearchRequest observationVariableSearchRequest = (ObservationVariableSearchRequest) o;
-        return Objects.equals(this.commonCropNames, observationVariableSearchRequest.commonCropNames) &&
-                Objects.equals(this.dataTypes, observationVariableSearchRequest.dataTypes) &&
-                Objects.equals(this.externalReferenceIDs, observationVariableSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, observationVariableSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, observationVariableSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.methodDbIds, observationVariableSearchRequest.methodDbIds) &&
-                Objects.equals(this.methodNames, observationVariableSearchRequest.methodNames) &&
-                Objects.equals(this.methodPUIs, observationVariableSearchRequest.methodPUIs) &&
-                Objects.equals(this.observationVariableDbIds, observationVariableSearchRequest.observationVariableDbIds) &&
-                Objects.equals(this.observationVariableNames, observationVariableSearchRequest.observationVariableNames) &&
-                Objects.equals(this.observationVariablePUIs, observationVariableSearchRequest.observationVariablePUIs) &&
-                Objects.equals(this.ontologyDbIds, observationVariableSearchRequest.ontologyDbIds) &&
-                Objects.equals(this.page, observationVariableSearchRequest.page) &&
-                Objects.equals(this.pageSize, observationVariableSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, observationVariableSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, observationVariableSearchRequest.programNames) &&
-                Objects.equals(this.scaleDbIds, observationVariableSearchRequest.scaleDbIds) &&
-                Objects.equals(this.scaleNames, observationVariableSearchRequest.scaleNames) &&
-                Objects.equals(this.scalePUIs, observationVariableSearchRequest.scalePUIs) &&
-                Objects.equals(this.studyDbId, observationVariableSearchRequest.studyDbId) &&
-                Objects.equals(this.studyDbIds, observationVariableSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, observationVariableSearchRequest.studyNames) &&
-                Objects.equals(this.traitAttributePUIs, observationVariableSearchRequest.traitAttributePUIs) &&
-                Objects.equals(this.traitAttributes, observationVariableSearchRequest.traitAttributes) &&
-                Objects.equals(this.traitClasses, observationVariableSearchRequest.traitClasses) &&
-                Objects.equals(this.traitDbIds, observationVariableSearchRequest.traitDbIds) &&
-                Objects.equals(this.traitEntities, observationVariableSearchRequest.traitEntities) &&
-                Objects.equals(this.traitEntityPUIs, observationVariableSearchRequest.traitEntityPUIs) &&
-                Objects.equals(this.traitNames, observationVariableSearchRequest.traitNames) &&
-                Objects.equals(this.traitPUIs, observationVariableSearchRequest.traitPUIs) &&
-                Objects.equals(this.trialDbIds, observationVariableSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, observationVariableSearchRequest.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, dataTypes, externalReferenceIDs, externalReferenceIds, externalReferenceSources, methodDbIds, methodNames, methodPUIs, observationVariableDbIds, observationVariableNames, observationVariablePUIs, ontologyDbIds, page, pageSize, programDbIds, programNames, scaleDbIds, scaleNames, scalePUIs, studyDbId, studyDbIds, studyNames, traitAttributePUIs, traitAttributes, traitClasses, traitDbIds, traitEntities, traitEntityPUIs, traitNames, traitPUIs, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableSearchRequest {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    dataTypes: ").append(toIndentedString(dataTypes)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    methodDbIds: ").append(toIndentedString(methodDbIds)).append("\n");
-        sb.append("    methodNames: ").append(toIndentedString(methodNames)).append("\n");
-        sb.append("    methodPUIs: ").append(toIndentedString(methodPUIs)).append("\n");
-        sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-        sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
-        sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
-        sb.append("    ontologyDbIds: ").append(toIndentedString(ontologyDbIds)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    scaleDbIds: ").append(toIndentedString(scaleDbIds)).append("\n");
-        sb.append("    scaleNames: ").append(toIndentedString(scaleNames)).append("\n");
-        sb.append("    scalePUIs: ").append(toIndentedString(scalePUIs)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    traitAttributePUIs: ").append(toIndentedString(traitAttributePUIs)).append("\n");
-        sb.append("    traitAttributes: ").append(toIndentedString(traitAttributes)).append("\n");
-        sb.append("    traitClasses: ").append(toIndentedString(traitClasses)).append("\n");
-        sb.append("    traitDbIds: ").append(toIndentedString(traitDbIds)).append("\n");
-        sb.append("    traitEntities: ").append(toIndentedString(traitEntities)).append("\n");
-        sb.append("    traitEntityPUIs: ").append(toIndentedString(traitEntityPUIs)).append("\n");
-        sb.append("    traitNames: ").append(toIndentedString(traitNames)).append("\n");
-        sb.append("    traitPUIs: ").append(toIndentedString(traitPUIs)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableSingleResponse.java
deleted file mode 100644
index 0e4c4fe1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableSingleResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationVariableSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationVariable result = null;
-
-    public ObservationVariableSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationVariableSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationVariableSingleResponse result(ObservationVariable result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationVariable getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationVariable result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableSingleResponse observationVariableSingleResponse = (ObservationVariableSingleResponse) o;
-        return Objects.equals(this._atContext, observationVariableSingleResponse._atContext) &&
-                Objects.equals(this.metadata, observationVariableSingleResponse.metadata) &&
-                Objects.equals(this.result, observationVariableSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableTrait.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableTrait.java
deleted file mode 100644
index d9d8202b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ObservationVariableTrait.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A Trait describes what property is being observed.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Trait \&quot;Leaf length\&quot; or \&quot;Flower height\&quot;.
- */
-@Schema(description = "A Trait describes what property is being observed.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Trait \"Leaf length\" or \"Flower height\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableTrait {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("alternativeAbbreviations")
-    private List<String> alternativeAbbreviations = null;
-
-    @SerializedName("attribute")
-    private String attribute = null;
-
-    @SerializedName("attributePUI")
-    private String attributePUI = null;
-
-    @SerializedName("entity")
-    private String entity = null;
-
-    @SerializedName("entityPUI")
-    private String entityPUI = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("mainAbbreviation")
-    private String mainAbbreviation = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("traitClass")
-    private String traitClass = null;
-
-    @SerializedName("traitDbId")
-    private String traitDbId = null;
-
-    @SerializedName("traitDescription")
-    private String traitDescription = null;
-
-    @SerializedName("traitName")
-    private String traitName = null;
-
-    @SerializedName("traitPUI")
-    private String traitPUI = null;
-
-    public ObservationVariableTrait additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationVariableTrait putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationVariableTrait alternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-        return this;
-    }
-
-    public ObservationVariableTrait addAlternativeAbbreviationsItem(String alternativeAbbreviationsItem) {
-        if (this.alternativeAbbreviations == null) {
-            this.alternativeAbbreviations = new ArrayList<String>();
-        }
-        this.alternativeAbbreviations.add(alternativeAbbreviationsItem);
-        return this;
-    }
-
-    /**
-     * A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.
-     *
-     * @return alternativeAbbreviations
-     **/
-    @Schema(example = "[\"H\",\"PH\",\"H1\"]", description = "A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.")
-    public List<String> getAlternativeAbbreviations() {
-        return alternativeAbbreviations;
-    }
-
-    public void setAlternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-    }
-
-    public ObservationVariableTrait attribute(String attribute) {
-        this.attribute = attribute;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attribute
-     **/
-    @Schema(example = "height", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    public ObservationVariableTrait attributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attributePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PO:00012345", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttributePUI() {
-        return attributePUI;
-    }
-
-    public void setAttributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-    }
-
-    public ObservationVariableTrait entity(String entity) {
-        this.entity = entity;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entity
-     **/
-    @Schema(example = "Stalk", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public String getEntity() {
-        return entity;
-    }
-
-    public void setEntity(String entity) {
-        this.entity = entity;
-    }
-
-    public ObservationVariableTrait entityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A Trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the Entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entityPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PATO:00098765", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A Trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the Entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public String getEntityPUI() {
-        return entityPUI;
-    }
-
-    public void setEntityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-    }
-
-    public ObservationVariableTrait externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationVariableTrait addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationVariableTrait mainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Trait
-     *
-     * @return mainAbbreviation
-     **/
-    @Schema(example = "PH", description = "A shortened version of the human readable name for a Trait")
-    public String getMainAbbreviation() {
-        return mainAbbreviation;
-    }
-
-    public void setMainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-    }
-
-    public ObservationVariableTrait ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public ObservationVariableTrait status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Trait status (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Trait status (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public ObservationVariableTrait synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public ObservationVariableTrait addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other trait names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Height\",\"Plant Height\",\"Stalk Height\",\"Canopy Height\"]", description = "Other trait names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public ObservationVariableTrait traitClass(String traitClass) {
-        this.traitClass = traitClass;
-        return this;
-    }
-
-    /**
-     * A classification to describe the type of trait and the context it should be considered in. &lt;br/&gt; examples- \&quot;morphological\&quot;, \&quot;phenological\&quot;, \&quot;agronomical\&quot;, \&quot;physiological\&quot;, \&quot;abiotic stress\&quot;, \&quot;biotic stress\&quot;, \&quot;biochemical\&quot;, \&quot;quality traits\&quot;, \&quot;fertility\&quot;, etc.
-     *
-     * @return traitClass
-     **/
-    @Schema(example = "phenological", description = "A classification to describe the type of trait and the context it should be considered in. <br/> examples- \"morphological\", \"phenological\", \"agronomical\", \"physiological\", \"abiotic stress\", \"biotic stress\", \"biochemical\", \"quality traits\", \"fertility\", etc.")
-    public String getTraitClass() {
-        return traitClass;
-    }
-
-    public void setTraitClass(String traitClass) {
-        this.traitClass = traitClass;
-    }
-
-    public ObservationVariableTrait traitDbId(String traitDbId) {
-        this.traitDbId = traitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trait
-     *
-     * @return traitDbId
-     **/
-    @Schema(example = "9b2e34f5", description = "The ID which uniquely identifies a trait")
-    public String getTraitDbId() {
-        return traitDbId;
-    }
-
-    public void setTraitDbId(String traitDbId) {
-        this.traitDbId = traitDbId;
-    }
-
-    public ObservationVariableTrait traitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-        return this;
-    }
-
-    /**
-     * The description of a trait
-     *
-     * @return traitDescription
-     **/
-    @Schema(example = "The height of the plant", description = "The description of a trait")
-    public String getTraitDescription() {
-        return traitDescription;
-    }
-
-    public void setTraitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-    }
-
-    public ObservationVariableTrait traitName(String traitName) {
-        this.traitName = traitName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitName
-     **/
-    @Schema(example = "Height", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public String getTraitName() {
-        return traitName;
-    }
-
-    public void setTraitName(String traitName) {
-        this.traitName = traitName;
-    }
-
-    public ObservationVariableTrait traitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000012", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public String getTraitPUI() {
-        return traitPUI;
-    }
-
-    public void setTraitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableTrait observationVariableTrait = (ObservationVariableTrait) o;
-        return Objects.equals(this.additionalInfo, observationVariableTrait.additionalInfo) &&
-                Objects.equals(this.alternativeAbbreviations, observationVariableTrait.alternativeAbbreviations) &&
-                Objects.equals(this.attribute, observationVariableTrait.attribute) &&
-                Objects.equals(this.attributePUI, observationVariableTrait.attributePUI) &&
-                Objects.equals(this.entity, observationVariableTrait.entity) &&
-                Objects.equals(this.entityPUI, observationVariableTrait.entityPUI) &&
-                Objects.equals(this.externalReferences, observationVariableTrait.externalReferences) &&
-                Objects.equals(this.mainAbbreviation, observationVariableTrait.mainAbbreviation) &&
-                Objects.equals(this.ontologyReference, observationVariableTrait.ontologyReference) &&
-                Objects.equals(this.status, observationVariableTrait.status) &&
-                Objects.equals(this.synonyms, observationVariableTrait.synonyms) &&
-                Objects.equals(this.traitClass, observationVariableTrait.traitClass) &&
-                Objects.equals(this.traitDbId, observationVariableTrait.traitDbId) &&
-                Objects.equals(this.traitDescription, observationVariableTrait.traitDescription) &&
-                Objects.equals(this.traitName, observationVariableTrait.traitName) &&
-                Objects.equals(this.traitPUI, observationVariableTrait.traitPUI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, alternativeAbbreviations, attribute, attributePUI, entity, entityPUI, externalReferences, mainAbbreviation, ontologyReference, status, synonyms, traitClass, traitDbId, traitDescription, traitName, traitPUI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableTrait {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    alternativeAbbreviations: ").append(toIndentedString(alternativeAbbreviations)).append("\n");
-        sb.append("    attribute: ").append(toIndentedString(attribute)).append("\n");
-        sb.append("    attributePUI: ").append(toIndentedString(attributePUI)).append("\n");
-        sb.append("    entity: ").append(toIndentedString(entity)).append("\n");
-        sb.append("    entityPUI: ").append(toIndentedString(entityPUI)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    mainAbbreviation: ").append(toIndentedString(mainAbbreviation)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    traitClass: ").append(toIndentedString(traitClass)).append("\n");
-        sb.append("    traitDbId: ").append(toIndentedString(traitDbId)).append("\n");
-        sb.append("    traitDescription: ").append(toIndentedString(traitDescription)).append("\n");
-        sb.append("    traitName: ").append(toIndentedString(traitName)).append("\n");
-        sb.append("    traitPUI: ").append(toIndentedString(traitPUI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OneOfGeoJSONGeometry.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OneOfGeoJSONGeometry.java
deleted file mode 100644
index 10f2ab29..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OneOfGeoJSONGeometry.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-/**
- * OneOfGeoJSONGeometry
- */
-public interface OneOfGeoJSONGeometry {
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OneOfGeoJSONSearchAreaGeometry.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OneOfGeoJSONSearchAreaGeometry.java
deleted file mode 100644
index 8ea8f1af..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OneOfGeoJSONSearchAreaGeometry.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-/**
- * OneOfGeoJSONSearchAreaGeometry
- */
-public interface OneOfGeoJSONSearchAreaGeometry {
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Ontology.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Ontology.java
deleted file mode 100644
index bf6c29df..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Ontology.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Ontology
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Ontology {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("authors")
-    private String authors = null;
-
-    @SerializedName("copyright")
-    private String copyright = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("licence")
-    private String licence = null;
-
-    @SerializedName("ontologyDbId")
-    private String ontologyDbId = null;
-
-    @SerializedName("ontologyName")
-    private String ontologyName = null;
-
-    @SerializedName("version")
-    private String version = null;
-
-    public Ontology additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Ontology putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Ontology authors(String authors) {
-        this.authors = authors;
-        return this;
-    }
-
-    /**
-     * Ontology&#x27;s list of authors (no specific format)
-     *
-     * @return authors
-     **/
-    @Schema(example = "Bob Robertson, Rob Robertson", description = "Ontology's list of authors (no specific format)")
-    public String getAuthors() {
-        return authors;
-    }
-
-    public void setAuthors(String authors) {
-        this.authors = authors;
-    }
-
-    public Ontology copyright(String copyright) {
-        this.copyright = copyright;
-        return this;
-    }
-
-    /**
-     * Ontology copyright
-     *
-     * @return copyright
-     **/
-    @Schema(example = "Copyright 1987, Bob Robertson", description = "Ontology copyright")
-    public String getCopyright() {
-        return copyright;
-    }
-
-    public void setCopyright(String copyright) {
-        this.copyright = copyright;
-    }
-
-    public Ontology description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Human readable description of Ontology
-     *
-     * @return description
-     **/
-    @Schema(example = "This is an example ontology that does not exist", description = "Human readable description of Ontology")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Ontology documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/ontology", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public Ontology licence(String licence) {
-        this.licence = licence;
-        return this;
-    }
-
-    /**
-     * Ontology licence
-     *
-     * @return licence
-     **/
-    @Schema(example = "MIT Open source licence", description = "Ontology licence")
-    public String getLicence() {
-        return licence;
-    }
-
-    public void setLicence(String licence) {
-        this.licence = licence;
-    }
-
-    public Ontology ontologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-        return this;
-    }
-
-    /**
-     * Ontology database unique identifier
-     *
-     * @return ontologyDbId
-     **/
-    @Schema(example = "18e186cd", description = "Ontology database unique identifier")
-    public String getOntologyDbId() {
-        return ontologyDbId;
-    }
-
-    public void setOntologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-    }
-
-    public Ontology ontologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-        return this;
-    }
-
-    /**
-     * Ontology name
-     *
-     * @return ontologyName
-     **/
-    @Schema(example = "The Official Ontology", description = "Ontology name")
-    public String getOntologyName() {
-        return ontologyName;
-    }
-
-    public void setOntologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-    }
-
-    public Ontology version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    /**
-     * Ontology version (no specific format)
-     *
-     * @return version
-     **/
-    @Schema(example = "V1.3.2", description = "Ontology version (no specific format)")
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Ontology ontology = (Ontology) o;
-        return Objects.equals(this.additionalInfo, ontology.additionalInfo) &&
-                Objects.equals(this.authors, ontology.authors) &&
-                Objects.equals(this.copyright, ontology.copyright) &&
-                Objects.equals(this.description, ontology.description) &&
-                Objects.equals(this.documentationURL, ontology.documentationURL) &&
-                Objects.equals(this.licence, ontology.licence) &&
-                Objects.equals(this.ontologyDbId, ontology.ontologyDbId) &&
-                Objects.equals(this.ontologyName, ontology.ontologyName) &&
-                Objects.equals(this.version, ontology.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, authors, copyright, description, documentationURL, licence, ontologyDbId, ontologyName, version);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Ontology {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    authors: ").append(toIndentedString(authors)).append("\n");
-        sb.append("    copyright: ").append(toIndentedString(copyright)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    licence: ").append(toIndentedString(licence)).append("\n");
-        sb.append("    ontologyDbId: ").append(toIndentedString(ontologyDbId)).append("\n");
-        sb.append("    ontologyName: ").append(toIndentedString(ontologyName)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologyListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologyListResponse.java
deleted file mode 100644
index 2c03fad5..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologyListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * OntologyListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class OntologyListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private OntologyListResponseResult result = null;
-
-    public OntologyListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public OntologyListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public OntologyListResponse result(OntologyListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public OntologyListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(OntologyListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OntologyListResponse ontologyListResponse = (OntologyListResponse) o;
-        return Objects.equals(this._atContext, ontologyListResponse._atContext) &&
-                Objects.equals(this.metadata, ontologyListResponse.metadata) &&
-                Objects.equals(this.result, ontologyListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class OntologyListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologyListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologyListResponseResult.java
deleted file mode 100644
index ba7269a1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologyListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * OntologyListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class OntologyListResponseResult {
-    @SerializedName("data")
-    private List<Ontology> data = new ArrayList<Ontology>();
-
-    public OntologyListResponseResult data(List<Ontology> data) {
-        this.data = data;
-        return this;
-    }
-
-    public OntologyListResponseResult addDataItem(Ontology dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Ontology> getData() {
-        return data;
-    }
-
-    public void setData(List<Ontology> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OntologyListResponseResult ontologyListResponseResult = (OntologyListResponseResult) o;
-        return Objects.equals(this.data, ontologyListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class OntologyListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologyNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologyNewRequest.java
deleted file mode 100644
index 2306d3f2..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologyNewRequest.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * OntologyNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class OntologyNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("authors")
-    private String authors = null;
-
-    @SerializedName("copyright")
-    private String copyright = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("licence")
-    private String licence = null;
-
-    @SerializedName("ontologyName")
-    private String ontologyName = null;
-
-    @SerializedName("version")
-    private String version = null;
-
-    public OntologyNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public OntologyNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public OntologyNewRequest authors(String authors) {
-        this.authors = authors;
-        return this;
-    }
-
-    /**
-     * Ontology&#x27;s list of authors (no specific format)
-     *
-     * @return authors
-     **/
-    @Schema(example = "Bob Robertson, Rob Robertson", description = "Ontology's list of authors (no specific format)")
-    public String getAuthors() {
-        return authors;
-    }
-
-    public void setAuthors(String authors) {
-        this.authors = authors;
-    }
-
-    public OntologyNewRequest copyright(String copyright) {
-        this.copyright = copyright;
-        return this;
-    }
-
-    /**
-     * Ontology copyright
-     *
-     * @return copyright
-     **/
-    @Schema(example = "Copyright 1987, Bob Robertson", description = "Ontology copyright")
-    public String getCopyright() {
-        return copyright;
-    }
-
-    public void setCopyright(String copyright) {
-        this.copyright = copyright;
-    }
-
-    public OntologyNewRequest description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Human readable description of Ontology
-     *
-     * @return description
-     **/
-    @Schema(example = "This is an example ontology that does not exist", description = "Human readable description of Ontology")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public OntologyNewRequest documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/ontology", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public OntologyNewRequest licence(String licence) {
-        this.licence = licence;
-        return this;
-    }
-
-    /**
-     * Ontology licence
-     *
-     * @return licence
-     **/
-    @Schema(example = "MIT Open source licence", description = "Ontology licence")
-    public String getLicence() {
-        return licence;
-    }
-
-    public void setLicence(String licence) {
-        this.licence = licence;
-    }
-
-    public OntologyNewRequest ontologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-        return this;
-    }
-
-    /**
-     * Ontology name
-     *
-     * @return ontologyName
-     **/
-    @Schema(example = "The Official Ontology", description = "Ontology name")
-    public String getOntologyName() {
-        return ontologyName;
-    }
-
-    public void setOntologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-    }
-
-    public OntologyNewRequest version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    /**
-     * Ontology version (no specific format)
-     *
-     * @return version
-     **/
-    @Schema(example = "V1.3.2", description = "Ontology version (no specific format)")
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OntologyNewRequest ontologyNewRequest = (OntologyNewRequest) o;
-        return Objects.equals(this.additionalInfo, ontologyNewRequest.additionalInfo) &&
-                Objects.equals(this.authors, ontologyNewRequest.authors) &&
-                Objects.equals(this.copyright, ontologyNewRequest.copyright) &&
-                Objects.equals(this.description, ontologyNewRequest.description) &&
-                Objects.equals(this.documentationURL, ontologyNewRequest.documentationURL) &&
-                Objects.equals(this.licence, ontologyNewRequest.licence) &&
-                Objects.equals(this.ontologyName, ontologyNewRequest.ontologyName) &&
-                Objects.equals(this.version, ontologyNewRequest.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, authors, copyright, description, documentationURL, licence, ontologyName, version);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class OntologyNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    authors: ").append(toIndentedString(authors)).append("\n");
-        sb.append("    copyright: ").append(toIndentedString(copyright)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    licence: ").append(toIndentedString(licence)).append("\n");
-        sb.append("    ontologyName: ").append(toIndentedString(ontologyName)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologyReference.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologyReference.java
deleted file mode 100644
index e7b8c65c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologyReference.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).
- */
-@Schema(description = "MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class OntologyReference {
-    @SerializedName("documentationLinks")
-    private List<MethodBaseClassOntologyReferenceDocumentationLinks> documentationLinks = null;
-
-    @SerializedName("ontologyDbId")
-    private String ontologyDbId = null;
-
-    @SerializedName("ontologyName")
-    private String ontologyName = null;
-
-    @SerializedName("version")
-    private String version = null;
-
-    public OntologyReference documentationLinks(List<MethodBaseClassOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-        return this;
-    }
-
-    public OntologyReference addDocumentationLinksItem(MethodBaseClassOntologyReferenceDocumentationLinks documentationLinksItem) {
-        if (this.documentationLinks == null) {
-            this.documentationLinks = new ArrayList<MethodBaseClassOntologyReferenceDocumentationLinks>();
-        }
-        this.documentationLinks.add(documentationLinksItem);
-        return this;
-    }
-
-    /**
-     * links to various ontology documentation
-     *
-     * @return documentationLinks
-     **/
-    @Schema(description = "links to various ontology documentation")
-    public List<MethodBaseClassOntologyReferenceDocumentationLinks> getDocumentationLinks() {
-        return documentationLinks;
-    }
-
-    public void setDocumentationLinks(List<MethodBaseClassOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-    }
-
-    public OntologyReference ontologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-        return this;
-    }
-
-    /**
-     * Ontology database unique identifier
-     *
-     * @return ontologyDbId
-     **/
-    @Schema(example = "6b071868", required = true, description = "Ontology database unique identifier")
-    public String getOntologyDbId() {
-        return ontologyDbId;
-    }
-
-    public void setOntologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-    }
-
-    public OntologyReference ontologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-        return this;
-    }
-
-    /**
-     * Ontology name
-     *
-     * @return ontologyName
-     **/
-    @Schema(example = "The Crop Ontology", required = true, description = "Ontology name")
-    public String getOntologyName() {
-        return ontologyName;
-    }
-
-    public void setOntologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-    }
-
-    public OntologyReference version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    /**
-     * Ontology version (no specific format)
-     *
-     * @return version
-     **/
-    @Schema(example = "7.2.3", description = "Ontology version (no specific format)")
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OntologyReference ontologyReference = (OntologyReference) o;
-        return Objects.equals(this.documentationLinks, ontologyReference.documentationLinks) &&
-                Objects.equals(this.ontologyDbId, ontologyReference.ontologyDbId) &&
-                Objects.equals(this.ontologyName, ontologyReference.ontologyName) &&
-                Objects.equals(this.version, ontologyReference.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(documentationLinks, ontologyDbId, ontologyName, version);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class OntologyReference {\n");
-
-        sb.append("    documentationLinks: ").append(toIndentedString(documentationLinks)).append("\n");
-        sb.append("    ontologyDbId: ").append(toIndentedString(ontologyDbId)).append("\n");
-        sb.append("    ontologyName: ").append(toIndentedString(ontologyName)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologySingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologySingleResponse.java
deleted file mode 100644
index 3f42b2d3..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/OntologySingleResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * OntologySingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class OntologySingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Ontology result = null;
-
-    public OntologySingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public OntologySingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public OntologySingleResponse result(Ontology result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Ontology getResult() {
-        return result;
-    }
-
-    public void setResult(Ontology result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OntologySingleResponse ontologySingleResponse = (OntologySingleResponse) o;
-        return Objects.equals(this._atContext, ontologySingleResponse._atContext) &&
-                Objects.equals(this.metadata, ontologySingleResponse.metadata) &&
-                Objects.equals(this.result, ontologySingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class OntologySingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Person.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Person.java
deleted file mode 100644
index 7f4898cd..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Person.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * Person
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class Person {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("emailAddress")
-    private String emailAddress = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("firstName")
-    private String firstName = null;
-
-    @SerializedName("lastName")
-    private String lastName = null;
-
-    @SerializedName("mailingAddress")
-    private String mailingAddress = null;
-
-    @SerializedName("middleName")
-    private String middleName = null;
-
-    @SerializedName("personDbId")
-    private String personDbId = null;
-
-    @SerializedName("phoneNumber")
-    private String phoneNumber = null;
-
-    @SerializedName("userID")
-    private String userID = null;
-
-    public Person additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Person putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Person description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * description of this person
-     *
-     * @return description
-     **/
-    @Schema(example = "Bob likes pina coladas and getting caught in the rain.", description = "description of this person")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Person emailAddress(String emailAddress) {
-        this.emailAddress = emailAddress;
-        return this;
-    }
-
-    /**
-     * email address for this person
-     *
-     * @return emailAddress
-     **/
-    @Schema(example = "bob@bob.com", description = "email address for this person")
-    public String getEmailAddress() {
-        return emailAddress;
-    }
-
-    public void setEmailAddress(String emailAddress) {
-        this.emailAddress = emailAddress;
-    }
-
-    public Person externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Person addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Person firstName(String firstName) {
-        this.firstName = firstName;
-        return this;
-    }
-
-    /**
-     * Persons first name
-     *
-     * @return firstName
-     **/
-    @Schema(example = "Bob", description = "Persons first name")
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public Person lastName(String lastName) {
-        this.lastName = lastName;
-        return this;
-    }
-
-    /**
-     * Persons last name
-     *
-     * @return lastName
-     **/
-    @Schema(example = "Robertson", description = "Persons last name")
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public Person mailingAddress(String mailingAddress) {
-        this.mailingAddress = mailingAddress;
-        return this;
-    }
-
-    /**
-     * physical address of this person
-     *
-     * @return mailingAddress
-     **/
-    @Schema(example = "123 Street Ave, City, State, Country", description = "physical address of this person")
-    public String getMailingAddress() {
-        return mailingAddress;
-    }
-
-    public void setMailingAddress(String mailingAddress) {
-        this.mailingAddress = mailingAddress;
-    }
-
-    public Person middleName(String middleName) {
-        this.middleName = middleName;
-        return this;
-    }
-
-    /**
-     * Persons middle name
-     *
-     * @return middleName
-     **/
-    @Schema(example = "Danger", description = "Persons middle name")
-    public String getMiddleName() {
-        return middleName;
-    }
-
-    public void setMiddleName(String middleName) {
-        this.middleName = middleName;
-    }
-
-    public Person personDbId(String personDbId) {
-        this.personDbId = personDbId;
-        return this;
-    }
-
-    /**
-     * Unique ID for a person
-     *
-     * @return personDbId
-     **/
-    @Schema(example = "14340a54", description = "Unique ID for a person")
-    public String getPersonDbId() {
-        return personDbId;
-    }
-
-    public void setPersonDbId(String personDbId) {
-        this.personDbId = personDbId;
-    }
-
-    public Person phoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-        return this;
-    }
-
-    /**
-     * phone number of this person
-     *
-     * @return phoneNumber
-     **/
-    @Schema(example = "+1-555-555-5555", description = "phone number of this person")
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-
-    public Person userID(String userID) {
-        this.userID = userID;
-        return this;
-    }
-
-    /**
-     * A systems user ID associated with this person. Different from personDbId because you could have a person who is not a user of the system.
-     *
-     * @return userID
-     **/
-    @Schema(example = "bob-23", description = "A systems user ID associated with this person. Different from personDbId because you could have a person who is not a user of the system.")
-    public String getUserID() {
-        return userID;
-    }
-
-    public void setUserID(String userID) {
-        this.userID = userID;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Person person = (Person) o;
-        return Objects.equals(this.additionalInfo, person.additionalInfo) &&
-                Objects.equals(this.description, person.description) &&
-                Objects.equals(this.emailAddress, person.emailAddress) &&
-                Objects.equals(this.externalReferences, person.externalReferences) &&
-                Objects.equals(this.firstName, person.firstName) &&
-                Objects.equals(this.lastName, person.lastName) &&
-                Objects.equals(this.mailingAddress, person.mailingAddress) &&
-                Objects.equals(this.middleName, person.middleName) &&
-                Objects.equals(this.personDbId, person.personDbId) &&
-                Objects.equals(this.phoneNumber, person.phoneNumber) &&
-                Objects.equals(this.userID, person.userID);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, description, emailAddress, externalReferences, firstName, lastName, mailingAddress, middleName, personDbId, phoneNumber, userID);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Person {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    emailAddress: ").append(toIndentedString(emailAddress)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
-        sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
-        sb.append("    mailingAddress: ").append(toIndentedString(mailingAddress)).append("\n");
-        sb.append("    middleName: ").append(toIndentedString(middleName)).append("\n");
-        sb.append("    personDbId: ").append(toIndentedString(personDbId)).append("\n");
-        sb.append("    phoneNumber: ").append(toIndentedString(phoneNumber)).append("\n");
-        sb.append("    userID: ").append(toIndentedString(userID)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonListResponse.java
deleted file mode 100644
index a0d3d192..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * PersonListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class PersonListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private PersonListResponseResult result = null;
-
-    public PersonListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public PersonListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public PersonListResponse result(PersonListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public PersonListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(PersonListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PersonListResponse personListResponse = (PersonListResponse) o;
-        return Objects.equals(this._atContext, personListResponse._atContext) &&
-                Objects.equals(this.metadata, personListResponse.metadata) &&
-                Objects.equals(this.result, personListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PersonListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonListResponseResult.java
deleted file mode 100644
index 66339cc4..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * PersonListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class PersonListResponseResult {
-    @SerializedName("data")
-    private List<Person> data = new ArrayList<Person>();
-
-    public PersonListResponseResult data(List<Person> data) {
-        this.data = data;
-        return this;
-    }
-
-    public PersonListResponseResult addDataItem(Person dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Person> getData() {
-        return data;
-    }
-
-    public void setData(List<Person> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PersonListResponseResult personListResponseResult = (PersonListResponseResult) o;
-        return Objects.equals(this.data, personListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PersonListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonNewRequest.java
deleted file mode 100644
index 6281bbb9..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonNewRequest.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * PersonNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class PersonNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("emailAddress")
-    private String emailAddress = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("firstName")
-    private String firstName = null;
-
-    @SerializedName("lastName")
-    private String lastName = null;
-
-    @SerializedName("mailingAddress")
-    private String mailingAddress = null;
-
-    @SerializedName("middleName")
-    private String middleName = null;
-
-    @SerializedName("phoneNumber")
-    private String phoneNumber = null;
-
-    @SerializedName("userID")
-    private String userID = null;
-
-    public PersonNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public PersonNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public PersonNewRequest description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * description of this person
-     *
-     * @return description
-     **/
-    @Schema(example = "Bob likes pina coladas and getting caught in the rain.", description = "description of this person")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public PersonNewRequest emailAddress(String emailAddress) {
-        this.emailAddress = emailAddress;
-        return this;
-    }
-
-    /**
-     * email address for this person
-     *
-     * @return emailAddress
-     **/
-    @Schema(example = "bob@bob.com", description = "email address for this person")
-    public String getEmailAddress() {
-        return emailAddress;
-    }
-
-    public void setEmailAddress(String emailAddress) {
-        this.emailAddress = emailAddress;
-    }
-
-    public PersonNewRequest externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public PersonNewRequest addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public PersonNewRequest firstName(String firstName) {
-        this.firstName = firstName;
-        return this;
-    }
-
-    /**
-     * Persons first name
-     *
-     * @return firstName
-     **/
-    @Schema(example = "Bob", description = "Persons first name")
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public PersonNewRequest lastName(String lastName) {
-        this.lastName = lastName;
-        return this;
-    }
-
-    /**
-     * Persons last name
-     *
-     * @return lastName
-     **/
-    @Schema(example = "Robertson", description = "Persons last name")
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public PersonNewRequest mailingAddress(String mailingAddress) {
-        this.mailingAddress = mailingAddress;
-        return this;
-    }
-
-    /**
-     * physical address of this person
-     *
-     * @return mailingAddress
-     **/
-    @Schema(example = "123 Street Ave, City, State, Country", description = "physical address of this person")
-    public String getMailingAddress() {
-        return mailingAddress;
-    }
-
-    public void setMailingAddress(String mailingAddress) {
-        this.mailingAddress = mailingAddress;
-    }
-
-    public PersonNewRequest middleName(String middleName) {
-        this.middleName = middleName;
-        return this;
-    }
-
-    /**
-     * Persons middle name
-     *
-     * @return middleName
-     **/
-    @Schema(example = "Danger", description = "Persons middle name")
-    public String getMiddleName() {
-        return middleName;
-    }
-
-    public void setMiddleName(String middleName) {
-        this.middleName = middleName;
-    }
-
-    public PersonNewRequest phoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-        return this;
-    }
-
-    /**
-     * phone number of this person
-     *
-     * @return phoneNumber
-     **/
-    @Schema(example = "+1-555-555-5555", description = "phone number of this person")
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-
-    public PersonNewRequest userID(String userID) {
-        this.userID = userID;
-        return this;
-    }
-
-    /**
-     * A systems user ID associated with this person. Different from personDbId because you could have a person who is not a user of the system.
-     *
-     * @return userID
-     **/
-    @Schema(example = "bob-23", description = "A systems user ID associated with this person. Different from personDbId because you could have a person who is not a user of the system.")
-    public String getUserID() {
-        return userID;
-    }
-
-    public void setUserID(String userID) {
-        this.userID = userID;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PersonNewRequest personNewRequest = (PersonNewRequest) o;
-        return Objects.equals(this.additionalInfo, personNewRequest.additionalInfo) &&
-                Objects.equals(this.description, personNewRequest.description) &&
-                Objects.equals(this.emailAddress, personNewRequest.emailAddress) &&
-                Objects.equals(this.externalReferences, personNewRequest.externalReferences) &&
-                Objects.equals(this.firstName, personNewRequest.firstName) &&
-                Objects.equals(this.lastName, personNewRequest.lastName) &&
-                Objects.equals(this.mailingAddress, personNewRequest.mailingAddress) &&
-                Objects.equals(this.middleName, personNewRequest.middleName) &&
-                Objects.equals(this.phoneNumber, personNewRequest.phoneNumber) &&
-                Objects.equals(this.userID, personNewRequest.userID);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, description, emailAddress, externalReferences, firstName, lastName, mailingAddress, middleName, phoneNumber, userID);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PersonNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    emailAddress: ").append(toIndentedString(emailAddress)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
-        sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
-        sb.append("    mailingAddress: ").append(toIndentedString(mailingAddress)).append("\n");
-        sb.append("    middleName: ").append(toIndentedString(middleName)).append("\n");
-        sb.append("    phoneNumber: ").append(toIndentedString(phoneNumber)).append("\n");
-        sb.append("    userID: ").append(toIndentedString(userID)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonSearchRequest.java
deleted file mode 100644
index fb56d465..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonSearchRequest.java
+++ /dev/null
@@ -1,562 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * PersonSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class PersonSearchRequest {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("emailAddresses")
-    private List<String> emailAddresses = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("firstNames")
-    private List<String> firstNames = null;
-
-    @SerializedName("lastNames")
-    private List<String> lastNames = null;
-
-    @SerializedName("mailingAddresses")
-    private List<String> mailingAddresses = null;
-
-    @SerializedName("middleNames")
-    private List<String> middleNames = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("personDbIds")
-    private List<String> personDbIds = null;
-
-    @SerializedName("phoneNumbers")
-    private List<String> phoneNumbers = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("userIDs")
-    private List<String> userIDs = null;
-
-    public PersonSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public PersonSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public PersonSearchRequest emailAddresses(List<String> emailAddresses) {
-        this.emailAddresses = emailAddresses;
-        return this;
-    }
-
-    public PersonSearchRequest addEmailAddressesItem(String emailAddressesItem) {
-        if (this.emailAddresses == null) {
-            this.emailAddresses = new ArrayList<String>();
-        }
-        this.emailAddresses.add(emailAddressesItem);
-        return this;
-    }
-
-    /**
-     * email address for this person
-     *
-     * @return emailAddresses
-     **/
-    @Schema(example = "[\"bob@bob.com\",\"rob@bob.com\"]", description = "email address for this person")
-    public List<String> getEmailAddresses() {
-        return emailAddresses;
-    }
-
-    public void setEmailAddresses(List<String> emailAddresses) {
-        this.emailAddresses = emailAddresses;
-    }
-
-    public PersonSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public PersonSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public PersonSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public PersonSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public PersonSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public PersonSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public PersonSearchRequest firstNames(List<String> firstNames) {
-        this.firstNames = firstNames;
-        return this;
-    }
-
-    public PersonSearchRequest addFirstNamesItem(String firstNamesItem) {
-        if (this.firstNames == null) {
-            this.firstNames = new ArrayList<String>();
-        }
-        this.firstNames.add(firstNamesItem);
-        return this;
-    }
-
-    /**
-     * Persons first name
-     *
-     * @return firstNames
-     **/
-    @Schema(example = "[\"Bob\",\"Rob\"]", description = "Persons first name")
-    public List<String> getFirstNames() {
-        return firstNames;
-    }
-
-    public void setFirstNames(List<String> firstNames) {
-        this.firstNames = firstNames;
-    }
-
-    public PersonSearchRequest lastNames(List<String> lastNames) {
-        this.lastNames = lastNames;
-        return this;
-    }
-
-    public PersonSearchRequest addLastNamesItem(String lastNamesItem) {
-        if (this.lastNames == null) {
-            this.lastNames = new ArrayList<String>();
-        }
-        this.lastNames.add(lastNamesItem);
-        return this;
-    }
-
-    /**
-     * Persons last name
-     *
-     * @return lastNames
-     **/
-    @Schema(example = "[\"Robertson\",\"Smith\"]", description = "Persons last name")
-    public List<String> getLastNames() {
-        return lastNames;
-    }
-
-    public void setLastNames(List<String> lastNames) {
-        this.lastNames = lastNames;
-    }
-
-    public PersonSearchRequest mailingAddresses(List<String> mailingAddresses) {
-        this.mailingAddresses = mailingAddresses;
-        return this;
-    }
-
-    public PersonSearchRequest addMailingAddressesItem(String mailingAddressesItem) {
-        if (this.mailingAddresses == null) {
-            this.mailingAddresses = new ArrayList<String>();
-        }
-        this.mailingAddresses.add(mailingAddressesItem);
-        return this;
-    }
-
-    /**
-     * physical address of this person
-     *
-     * @return mailingAddresses
-     **/
-    @Schema(example = "[\"123 Main Street\",\"456 Side Street\"]", description = "physical address of this person")
-    public List<String> getMailingAddresses() {
-        return mailingAddresses;
-    }
-
-    public void setMailingAddresses(List<String> mailingAddresses) {
-        this.mailingAddresses = mailingAddresses;
-    }
-
-    public PersonSearchRequest middleNames(List<String> middleNames) {
-        this.middleNames = middleNames;
-        return this;
-    }
-
-    public PersonSearchRequest addMiddleNamesItem(String middleNamesItem) {
-        if (this.middleNames == null) {
-            this.middleNames = new ArrayList<String>();
-        }
-        this.middleNames.add(middleNamesItem);
-        return this;
-    }
-
-    /**
-     * Persons middle name
-     *
-     * @return middleNames
-     **/
-    @Schema(example = "[\"Danger\",\"Fight\"]", description = "Persons middle name")
-    public List<String> getMiddleNames() {
-        return middleNames;
-    }
-
-    public void setMiddleNames(List<String> middleNames) {
-        this.middleNames = middleNames;
-    }
-
-    public PersonSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public PersonSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public PersonSearchRequest personDbIds(List<String> personDbIds) {
-        this.personDbIds = personDbIds;
-        return this;
-    }
-
-    public PersonSearchRequest addPersonDbIdsItem(String personDbIdsItem) {
-        if (this.personDbIds == null) {
-            this.personDbIds = new ArrayList<String>();
-        }
-        this.personDbIds.add(personDbIdsItem);
-        return this;
-    }
-
-    /**
-     * Unique ID for this person
-     *
-     * @return personDbIds
-     **/
-    @Schema(example = "[\"1e7731ab\",\"bc28cff8\"]", description = "Unique ID for this person")
-    public List<String> getPersonDbIds() {
-        return personDbIds;
-    }
-
-    public void setPersonDbIds(List<String> personDbIds) {
-        this.personDbIds = personDbIds;
-    }
-
-    public PersonSearchRequest phoneNumbers(List<String> phoneNumbers) {
-        this.phoneNumbers = phoneNumbers;
-        return this;
-    }
-
-    public PersonSearchRequest addPhoneNumbersItem(String phoneNumbersItem) {
-        if (this.phoneNumbers == null) {
-            this.phoneNumbers = new ArrayList<String>();
-        }
-        this.phoneNumbers.add(phoneNumbersItem);
-        return this;
-    }
-
-    /**
-     * phone number of this person
-     *
-     * @return phoneNumbers
-     **/
-    @Schema(example = "[\"9995555555\",\"8884444444\"]", description = "phone number of this person")
-    public List<String> getPhoneNumbers() {
-        return phoneNumbers;
-    }
-
-    public void setPhoneNumbers(List<String> phoneNumbers) {
-        this.phoneNumbers = phoneNumbers;
-    }
-
-    public PersonSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public PersonSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public PersonSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public PersonSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public PersonSearchRequest userIDs(List<String> userIDs) {
-        this.userIDs = userIDs;
-        return this;
-    }
-
-    public PersonSearchRequest addUserIDsItem(String userIDsItem) {
-        if (this.userIDs == null) {
-            this.userIDs = new ArrayList<String>();
-        }
-        this.userIDs.add(userIDsItem);
-        return this;
-    }
-
-    /**
-     * A systems user ID associated with this person. Different from personDbId because you could have a person who is not a user of the system.
-     *
-     * @return userIDs
-     **/
-    @Schema(example = "[\"bob\",\"rob\"]", description = "A systems user ID associated with this person. Different from personDbId because you could have a person who is not a user of the system.")
-    public List<String> getUserIDs() {
-        return userIDs;
-    }
-
-    public void setUserIDs(List<String> userIDs) {
-        this.userIDs = userIDs;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PersonSearchRequest personSearchRequest = (PersonSearchRequest) o;
-        return Objects.equals(this.commonCropNames, personSearchRequest.commonCropNames) &&
-                Objects.equals(this.emailAddresses, personSearchRequest.emailAddresses) &&
-                Objects.equals(this.externalReferenceIDs, personSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, personSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, personSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.firstNames, personSearchRequest.firstNames) &&
-                Objects.equals(this.lastNames, personSearchRequest.lastNames) &&
-                Objects.equals(this.mailingAddresses, personSearchRequest.mailingAddresses) &&
-                Objects.equals(this.middleNames, personSearchRequest.middleNames) &&
-                Objects.equals(this.page, personSearchRequest.page) &&
-                Objects.equals(this.pageSize, personSearchRequest.pageSize) &&
-                Objects.equals(this.personDbIds, personSearchRequest.personDbIds) &&
-                Objects.equals(this.phoneNumbers, personSearchRequest.phoneNumbers) &&
-                Objects.equals(this.programDbIds, personSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, personSearchRequest.programNames) &&
-                Objects.equals(this.userIDs, personSearchRequest.userIDs);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, emailAddresses, externalReferenceIDs, externalReferenceIds, externalReferenceSources, firstNames, lastNames, mailingAddresses, middleNames, page, pageSize, personDbIds, phoneNumbers, programDbIds, programNames, userIDs);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PersonSearchRequest {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    emailAddresses: ").append(toIndentedString(emailAddresses)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    firstNames: ").append(toIndentedString(firstNames)).append("\n");
-        sb.append("    lastNames: ").append(toIndentedString(lastNames)).append("\n");
-        sb.append("    mailingAddresses: ").append(toIndentedString(mailingAddresses)).append("\n");
-        sb.append("    middleNames: ").append(toIndentedString(middleNames)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    personDbIds: ").append(toIndentedString(personDbIds)).append("\n");
-        sb.append("    phoneNumbers: ").append(toIndentedString(phoneNumbers)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    userIDs: ").append(toIndentedString(userIDs)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonSingleResponse.java
deleted file mode 100644
index 9dab4cd1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PersonSingleResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * PersonSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class PersonSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Person result = null;
-
-    public PersonSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public PersonSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public PersonSingleResponse result(Person result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Person getResult() {
-        return result;
-    }
-
-    public void setResult(Person result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PersonSingleResponse personSingleResponse = (PersonSingleResponse) o;
-        return Objects.equals(this._atContext, personSingleResponse._atContext) &&
-                Objects.equals(this.metadata, personSingleResponse.metadata) &&
-                Objects.equals(this.result, personSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PersonSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PointGeometry.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PointGeometry.java
deleted file mode 100644
index 2f0a3446..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PointGeometry.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Copied from RFC 7946 Section 3.1.1  A position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.
- */
-@Schema(description = "Copied from RFC 7946 Section 3.1.1  A position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class PointGeometry {
-    @SerializedName("coordinates")
-    private List<BigDecimal> coordinates = null;
-
-    @SerializedName("type")
-    private String type = "Point";
-
-    public PointGeometry coordinates(List<BigDecimal> coordinates) {
-        this.coordinates = coordinates;
-        return this;
-    }
-
-    public PointGeometry addCoordinatesItem(BigDecimal coordinatesItem) {
-        if (this.coordinates == null) {
-            this.coordinates = new ArrayList<BigDecimal>();
-        }
-        this.coordinates.add(coordinatesItem);
-        return this;
-    }
-
-    /**
-     * A single position
-     *
-     * @return coordinates
-     **/
-    @Schema(example = "[-76.506042,42.417373,123]", description = "A single position")
-    public List<BigDecimal> getCoordinates() {
-        return coordinates;
-    }
-
-    public void setCoordinates(List<BigDecimal> coordinates) {
-        this.coordinates = coordinates;
-    }
-
-    public PointGeometry type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The literal string \&quot;Point\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Point", description = "The literal string \"Point\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PointGeometry pointGeometry = (PointGeometry) o;
-        return Objects.equals(this.coordinates, pointGeometry.coordinates) &&
-                Objects.equals(this.type, pointGeometry.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(coordinates, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PointGeometry {\n");
-
-        sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Polygon.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Polygon.java
deleted file mode 100644
index 3a9327d5..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Polygon.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An array of linear rings
- */
-@Schema(description = "An array of linear rings")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class Polygon extends ArrayList<List> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Polygon {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PolygonGeometry.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PolygonGeometry.java
deleted file mode 100644
index 362dc6b3..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/PolygonGeometry.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An array of Linear Rings. Each Linear Ring is an array of Points.   A Point is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.
- */
-@Schema(description = "An array of Linear Rings. Each Linear Ring is an array of Points.   A Point is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class PolygonGeometry {
-    @SerializedName("coordinates")
-    private List<List<List<BigDecimal>>> coordinates = null;
-
-    @SerializedName("type")
-    private String type = "Polygon";
-
-    public PolygonGeometry coordinates(List<List<List<BigDecimal>>> coordinates) {
-        this.coordinates = coordinates;
-        return this;
-    }
-
-    public PolygonGeometry addCoordinatesItem(List<List<BigDecimal>> coordinatesItem) {
-        if (this.coordinates == null) {
-            this.coordinates = new ArrayList<List<List<BigDecimal>>>();
-        }
-        this.coordinates.add(coordinatesItem);
-        return this;
-    }
-
-    /**
-     * An array of linear rings
-     *
-     * @return coordinates
-     **/
-    @Schema(example = "[[[-77.456654,42.241133,494],[-75.414133,41.508282,571],[-76.506042,42.417373,123],[-77.456654,42.241133,346]]]", description = "An array of linear rings")
-    public List<List<List<BigDecimal>>> getCoordinates() {
-        return coordinates;
-    }
-
-    public void setCoordinates(List<List<List<BigDecimal>>> coordinates) {
-        this.coordinates = coordinates;
-    }
-
-    public PolygonGeometry type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The literal string \&quot;Polygon\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Polygon", description = "The literal string \"Polygon\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PolygonGeometry polygonGeometry = (PolygonGeometry) o;
-        return Objects.equals(this.coordinates, polygonGeometry.coordinates) &&
-                Objects.equals(this.type, polygonGeometry.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(coordinates, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PolygonGeometry {\n");
-
-        sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Position.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Position.java
deleted file mode 100644
index 11e56603..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Position.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Objects;
-
-/**
- * A single position
- */
-@Schema(description = "A single position")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class Position extends ArrayList<BigDecimal> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Position {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Program.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Program.java
deleted file mode 100644
index 94b73530..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Program.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * Program
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class Program {
-    @SerializedName("abbreviation")
-    private String abbreviation = null;
-
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("fundingInformation")
-    private String fundingInformation = null;
-
-    @SerializedName("leadPersonDbId")
-    private String leadPersonDbId = null;
-
-    @SerializedName("leadPersonName")
-    private String leadPersonName = null;
-
-    @SerializedName("objective")
-    private String objective = null;
-
-    @SerializedName("programDbId")
-    private String programDbId = null;
-
-    @SerializedName("programName")
-    private String programName = null;
-
-    /**
-     * The type of program entity this object represents &lt;br/&gt; &#x27;STANARD&#x27; represents a standard, permenant breeding program &lt;br/&gt; &#x27;PROJECT&#x27; represents a short term project, usually with a set time limit based on funding
-     */
-    @JsonAdapter(ProgramTypeEnum.Adapter.class)
-    public enum ProgramTypeEnum {
-        STANARD("STANARD"),
-        PROJECT("PROJECT");
-
-        private String value;
-
-        ProgramTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static ProgramTypeEnum fromValue(String input) {
-            for (ProgramTypeEnum b : ProgramTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<ProgramTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final ProgramTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public ProgramTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return ProgramTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("programType")
-    private ProgramTypeEnum programType = null;
-
-    public Program abbreviation(String abbreviation) {
-        this.abbreviation = abbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Program
-     *
-     * @return abbreviation
-     **/
-    @Schema(example = "P1", description = "A shortened version of the human readable name for a Program")
-    public String getAbbreviation() {
-        return abbreviation;
-    }
-
-    public void setAbbreviation(String abbreviation) {
-        this.abbreviation = abbreviation;
-    }
-
-    public Program additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Program putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Program commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Common name for the crop which this program is for
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Tomatillo", description = "Common name for the crop which this program is for")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public Program documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public Program externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Program addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Program fundingInformation(String fundingInformation) {
-        this.fundingInformation = fundingInformation;
-        return this;
-    }
-
-    /**
-     * Information describing the grant or funding source for this program
-     *
-     * @return fundingInformation
-     **/
-    @Schema(example = "EU: FP7-244374", description = "Information describing the grant or funding source for this program")
-    public String getFundingInformation() {
-        return fundingInformation;
-    }
-
-    public void setFundingInformation(String fundingInformation) {
-        this.fundingInformation = fundingInformation;
-    }
-
-    public Program leadPersonDbId(String leadPersonDbId) {
-        this.leadPersonDbId = leadPersonDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier of the program leader
-     *
-     * @return leadPersonDbId
-     **/
-    @Schema(example = "fe6f5c50", description = "The unique identifier of the program leader")
-    public String getLeadPersonDbId() {
-        return leadPersonDbId;
-    }
-
-    public void setLeadPersonDbId(String leadPersonDbId) {
-        this.leadPersonDbId = leadPersonDbId;
-    }
-
-    public Program leadPersonName(String leadPersonName) {
-        this.leadPersonName = leadPersonName;
-        return this;
-    }
-
-    /**
-     * The name of the program leader
-     *
-     * @return leadPersonName
-     **/
-    @Schema(example = "Bob Robertson", description = "The name of the program leader")
-    public String getLeadPersonName() {
-        return leadPersonName;
-    }
-
-    public void setLeadPersonName(String leadPersonName) {
-        this.leadPersonName = leadPersonName;
-    }
-
-    public Program objective(String objective) {
-        this.objective = objective;
-        return this;
-    }
-
-    /**
-     * The primary objective of the program
-     *
-     * @return objective
-     **/
-    @Schema(example = "Make a better tomatillo", description = "The primary objective of the program")
-    public String getObjective() {
-        return objective;
-    }
-
-    public void setObjective(String objective) {
-        this.objective = objective;
-    }
-
-    public Program programDbId(String programDbId) {
-        this.programDbId = programDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies the program
-     *
-     * @return programDbId
-     **/
-    @Schema(example = "f60f15b2", description = "The ID which uniquely identifies the program")
-    public String getProgramDbId() {
-        return programDbId;
-    }
-
-    public void setProgramDbId(String programDbId) {
-        this.programDbId = programDbId;
-    }
-
-    public Program programName(String programName) {
-        this.programName = programName;
-        return this;
-    }
-
-    /**
-     * Human readable name of the program
-     *
-     * @return programName
-     **/
-    @Schema(example = "Tomatillo_Breeding_Program", description = "Human readable name of the program")
-    public String getProgramName() {
-        return programName;
-    }
-
-    public void setProgramName(String programName) {
-        this.programName = programName;
-    }
-
-    public Program programType(ProgramTypeEnum programType) {
-        this.programType = programType;
-        return this;
-    }
-
-    /**
-     * The type of program entity this object represents &lt;br/&gt; &#x27;STANARD&#x27; represents a standard, permenant breeding program &lt;br/&gt; &#x27;PROJECT&#x27; represents a short term project, usually with a set time limit based on funding
-     *
-     * @return programType
-     **/
-    @Schema(example = "STANARD", description = "The type of program entity this object represents <br/> 'STANARD' represents a standard, permenant breeding program <br/> 'PROJECT' represents a short term project, usually with a set time limit based on funding   ")
-    public ProgramTypeEnum getProgramType() {
-        return programType;
-    }
-
-    public void setProgramType(ProgramTypeEnum programType) {
-        this.programType = programType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Program program = (Program) o;
-        return Objects.equals(this.abbreviation, program.abbreviation) &&
-                Objects.equals(this.additionalInfo, program.additionalInfo) &&
-                Objects.equals(this.commonCropName, program.commonCropName) &&
-                Objects.equals(this.documentationURL, program.documentationURL) &&
-                Objects.equals(this.externalReferences, program.externalReferences) &&
-                Objects.equals(this.fundingInformation, program.fundingInformation) &&
-                Objects.equals(this.leadPersonDbId, program.leadPersonDbId) &&
-                Objects.equals(this.leadPersonName, program.leadPersonName) &&
-                Objects.equals(this.objective, program.objective) &&
-                Objects.equals(this.programDbId, program.programDbId) &&
-                Objects.equals(this.programName, program.programName) &&
-                Objects.equals(this.programType, program.programType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(abbreviation, additionalInfo, commonCropName, documentationURL, externalReferences, fundingInformation, leadPersonDbId, leadPersonName, objective, programDbId, programName, programType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Program {\n");
-
-        sb.append("    abbreviation: ").append(toIndentedString(abbreviation)).append("\n");
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    fundingInformation: ").append(toIndentedString(fundingInformation)).append("\n");
-        sb.append("    leadPersonDbId: ").append(toIndentedString(leadPersonDbId)).append("\n");
-        sb.append("    leadPersonName: ").append(toIndentedString(leadPersonName)).append("\n");
-        sb.append("    objective: ").append(toIndentedString(objective)).append("\n");
-        sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-        sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
-        sb.append("    programType: ").append(toIndentedString(programType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramListResponse.java
deleted file mode 100644
index 62427751..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ProgramListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ProgramListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ProgramListResponseResult result = null;
-
-    public ProgramListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ProgramListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ProgramListResponse result(ProgramListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ProgramListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ProgramListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ProgramListResponse programListResponse = (ProgramListResponse) o;
-        return Objects.equals(this._atContext, programListResponse._atContext) &&
-                Objects.equals(this.metadata, programListResponse.metadata) &&
-                Objects.equals(this.result, programListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ProgramListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramListResponseResult.java
deleted file mode 100644
index 41726173..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ProgramListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ProgramListResponseResult {
-    @SerializedName("data")
-    private List<Program> data = new ArrayList<Program>();
-
-    public ProgramListResponseResult data(List<Program> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ProgramListResponseResult addDataItem(Program dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Program> getData() {
-        return data;
-    }
-
-    public void setData(List<Program> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ProgramListResponseResult programListResponseResult = (ProgramListResponseResult) o;
-        return Objects.equals(this.data, programListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ProgramListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramNewRequest.java
deleted file mode 100644
index a26625f5..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramNewRequest.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * ProgramNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ProgramNewRequest {
-    @SerializedName("abbreviation")
-    private String abbreviation = null;
-
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("fundingInformation")
-    private String fundingInformation = null;
-
-    @SerializedName("leadPersonDbId")
-    private String leadPersonDbId = null;
-
-    @SerializedName("leadPersonName")
-    private String leadPersonName = null;
-
-    @SerializedName("objective")
-    private String objective = null;
-
-    @SerializedName("programName")
-    private String programName = null;
-
-    /**
-     * The type of program entity this object represents &lt;br/&gt; &#x27;STANARD&#x27; represents a standard, permenant breeding program &lt;br/&gt; &#x27;PROJECT&#x27; represents a short term project, usually with a set time limit based on funding
-     */
-    @JsonAdapter(ProgramTypeEnum.Adapter.class)
-    public enum ProgramTypeEnum {
-        STANARD("STANARD"),
-        PROJECT("PROJECT");
-
-        private String value;
-
-        ProgramTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static ProgramTypeEnum fromValue(String input) {
-            for (ProgramTypeEnum b : ProgramTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<ProgramTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final ProgramTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public ProgramTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return ProgramTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("programType")
-    private ProgramTypeEnum programType = null;
-
-    public ProgramNewRequest abbreviation(String abbreviation) {
-        this.abbreviation = abbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Program
-     *
-     * @return abbreviation
-     **/
-    @Schema(example = "P1", description = "A shortened version of the human readable name for a Program")
-    public String getAbbreviation() {
-        return abbreviation;
-    }
-
-    public void setAbbreviation(String abbreviation) {
-        this.abbreviation = abbreviation;
-    }
-
-    public ProgramNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ProgramNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ProgramNewRequest commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Common name for the crop which this program is for
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Tomatillo", description = "Common name for the crop which this program is for")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public ProgramNewRequest documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public ProgramNewRequest externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ProgramNewRequest addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ProgramNewRequest fundingInformation(String fundingInformation) {
-        this.fundingInformation = fundingInformation;
-        return this;
-    }
-
-    /**
-     * Information describing the grant or funding source for this program
-     *
-     * @return fundingInformation
-     **/
-    @Schema(example = "EU: FP7-244374", description = "Information describing the grant or funding source for this program")
-    public String getFundingInformation() {
-        return fundingInformation;
-    }
-
-    public void setFundingInformation(String fundingInformation) {
-        this.fundingInformation = fundingInformation;
-    }
-
-    public ProgramNewRequest leadPersonDbId(String leadPersonDbId) {
-        this.leadPersonDbId = leadPersonDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier of the program leader
-     *
-     * @return leadPersonDbId
-     **/
-    @Schema(example = "fe6f5c50", description = "The unique identifier of the program leader")
-    public String getLeadPersonDbId() {
-        return leadPersonDbId;
-    }
-
-    public void setLeadPersonDbId(String leadPersonDbId) {
-        this.leadPersonDbId = leadPersonDbId;
-    }
-
-    public ProgramNewRequest leadPersonName(String leadPersonName) {
-        this.leadPersonName = leadPersonName;
-        return this;
-    }
-
-    /**
-     * The name of the program leader
-     *
-     * @return leadPersonName
-     **/
-    @Schema(example = "Bob Robertson", description = "The name of the program leader")
-    public String getLeadPersonName() {
-        return leadPersonName;
-    }
-
-    public void setLeadPersonName(String leadPersonName) {
-        this.leadPersonName = leadPersonName;
-    }
-
-    public ProgramNewRequest objective(String objective) {
-        this.objective = objective;
-        return this;
-    }
-
-    /**
-     * The primary objective of the program
-     *
-     * @return objective
-     **/
-    @Schema(example = "Make a better tomatillo", description = "The primary objective of the program")
-    public String getObjective() {
-        return objective;
-    }
-
-    public void setObjective(String objective) {
-        this.objective = objective;
-    }
-
-    public ProgramNewRequest programName(String programName) {
-        this.programName = programName;
-        return this;
-    }
-
-    /**
-     * Human readable name of the program
-     *
-     * @return programName
-     **/
-    @Schema(example = "Tomatillo_Breeding_Program", description = "Human readable name of the program")
-    public String getProgramName() {
-        return programName;
-    }
-
-    public void setProgramName(String programName) {
-        this.programName = programName;
-    }
-
-    public ProgramNewRequest programType(ProgramTypeEnum programType) {
-        this.programType = programType;
-        return this;
-    }
-
-    /**
-     * The type of program entity this object represents &lt;br/&gt; &#x27;STANARD&#x27; represents a standard, permenant breeding program &lt;br/&gt; &#x27;PROJECT&#x27; represents a short term project, usually with a set time limit based on funding
-     *
-     * @return programType
-     **/
-    @Schema(example = "STANARD", description = "The type of program entity this object represents <br/> 'STANARD' represents a standard, permenant breeding program <br/> 'PROJECT' represents a short term project, usually with a set time limit based on funding   ")
-    public ProgramTypeEnum getProgramType() {
-        return programType;
-    }
-
-    public void setProgramType(ProgramTypeEnum programType) {
-        this.programType = programType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ProgramNewRequest programNewRequest = (ProgramNewRequest) o;
-        return Objects.equals(this.abbreviation, programNewRequest.abbreviation) &&
-                Objects.equals(this.additionalInfo, programNewRequest.additionalInfo) &&
-                Objects.equals(this.commonCropName, programNewRequest.commonCropName) &&
-                Objects.equals(this.documentationURL, programNewRequest.documentationURL) &&
-                Objects.equals(this.externalReferences, programNewRequest.externalReferences) &&
-                Objects.equals(this.fundingInformation, programNewRequest.fundingInformation) &&
-                Objects.equals(this.leadPersonDbId, programNewRequest.leadPersonDbId) &&
-                Objects.equals(this.leadPersonName, programNewRequest.leadPersonName) &&
-                Objects.equals(this.objective, programNewRequest.objective) &&
-                Objects.equals(this.programName, programNewRequest.programName) &&
-                Objects.equals(this.programType, programNewRequest.programType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(abbreviation, additionalInfo, commonCropName, documentationURL, externalReferences, fundingInformation, leadPersonDbId, leadPersonName, objective, programName, programType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ProgramNewRequest {\n");
-
-        sb.append("    abbreviation: ").append(toIndentedString(abbreviation)).append("\n");
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    fundingInformation: ").append(toIndentedString(fundingInformation)).append("\n");
-        sb.append("    leadPersonDbId: ").append(toIndentedString(leadPersonDbId)).append("\n");
-        sb.append("    leadPersonName: ").append(toIndentedString(leadPersonName)).append("\n");
-        sb.append("    objective: ").append(toIndentedString(objective)).append("\n");
-        sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
-        sb.append("    programType: ").append(toIndentedString(programType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramSearchRequest.java
deleted file mode 100644
index 0d7f59db..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramSearchRequest.java
+++ /dev/null
@@ -1,517 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ProgramSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ProgramSearchRequest {
-    @SerializedName("abbreviations")
-    private List<String> abbreviations = null;
-
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("leadPersonDbIds")
-    private List<String> leadPersonDbIds = null;
-
-    @SerializedName("leadPersonNames")
-    private List<String> leadPersonNames = null;
-
-    @SerializedName("objectives")
-    private List<String> objectives = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    /**
-     * Gets or Sets programTypes
-     */
-    @JsonAdapter(ProgramTypesEnum.Adapter.class)
-    public enum ProgramTypesEnum {
-        STANARD("STANARD"),
-        PROJECT("PROJECT");
-
-        private String value;
-
-        ProgramTypesEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static ProgramTypesEnum fromValue(String input) {
-            for (ProgramTypesEnum b : ProgramTypesEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<ProgramTypesEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final ProgramTypesEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public ProgramTypesEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return ProgramTypesEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("programTypes")
-    private List<ProgramTypesEnum> programTypes = null;
-
-    public ProgramSearchRequest abbreviations(List<String> abbreviations) {
-        this.abbreviations = abbreviations;
-        return this;
-    }
-
-    public ProgramSearchRequest addAbbreviationsItem(String abbreviationsItem) {
-        if (this.abbreviations == null) {
-            this.abbreviations = new ArrayList<String>();
-        }
-        this.abbreviations.add(abbreviationsItem);
-        return this;
-    }
-
-    /**
-     * A list of shortened human readable names for a set of Programs
-     *
-     * @return abbreviations
-     **/
-    @Schema(example = "[\"P1\",\"P2\"]", description = "A list of shortened human readable names for a set of Programs")
-    public List<String> getAbbreviations() {
-        return abbreviations;
-    }
-
-    public void setAbbreviations(List<String> abbreviations) {
-        this.abbreviations = abbreviations;
-    }
-
-    public ProgramSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public ProgramSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public ProgramSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public ProgramSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public ProgramSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public ProgramSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public ProgramSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public ProgramSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public ProgramSearchRequest leadPersonDbIds(List<String> leadPersonDbIds) {
-        this.leadPersonDbIds = leadPersonDbIds;
-        return this;
-    }
-
-    public ProgramSearchRequest addLeadPersonDbIdsItem(String leadPersonDbIdsItem) {
-        if (this.leadPersonDbIds == null) {
-            this.leadPersonDbIds = new ArrayList<String>();
-        }
-        this.leadPersonDbIds.add(leadPersonDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The person DbIds of the program leader to search for
-     *
-     * @return leadPersonDbIds
-     **/
-    @Schema(example = "[\"d8bd96c7\",\"a2b9c8e7\"]", description = "The person DbIds of the program leader to search for")
-    public List<String> getLeadPersonDbIds() {
-        return leadPersonDbIds;
-    }
-
-    public void setLeadPersonDbIds(List<String> leadPersonDbIds) {
-        this.leadPersonDbIds = leadPersonDbIds;
-    }
-
-    public ProgramSearchRequest leadPersonNames(List<String> leadPersonNames) {
-        this.leadPersonNames = leadPersonNames;
-        return this;
-    }
-
-    public ProgramSearchRequest addLeadPersonNamesItem(String leadPersonNamesItem) {
-        if (this.leadPersonNames == null) {
-            this.leadPersonNames = new ArrayList<String>();
-        }
-        this.leadPersonNames.add(leadPersonNamesItem);
-        return this;
-    }
-
-    /**
-     * The names of the program leader to search for
-     *
-     * @return leadPersonNames
-     **/
-    @Schema(example = "[\"Bob Robertson\",\"Rob Robertson\"]", description = "The names of the program leader to search for")
-    public List<String> getLeadPersonNames() {
-        return leadPersonNames;
-    }
-
-    public void setLeadPersonNames(List<String> leadPersonNames) {
-        this.leadPersonNames = leadPersonNames;
-    }
-
-    public ProgramSearchRequest objectives(List<String> objectives) {
-        this.objectives = objectives;
-        return this;
-    }
-
-    public ProgramSearchRequest addObjectivesItem(String objectivesItem) {
-        if (this.objectives == null) {
-            this.objectives = new ArrayList<String>();
-        }
-        this.objectives.add(objectivesItem);
-        return this;
-    }
-
-    /**
-     * A program objective to search for
-     *
-     * @return objectives
-     **/
-    @Schema(example = "[\"Objective Code One\",\"This is a longer objective search query\"]", description = "A program objective to search for")
-    public List<String> getObjectives() {
-        return objectives;
-    }
-
-    public void setObjectives(List<String> objectives) {
-        this.objectives = objectives;
-    }
-
-    public ProgramSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public ProgramSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public ProgramSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public ProgramSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public ProgramSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public ProgramSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public ProgramSearchRequest programTypes(List<ProgramTypesEnum> programTypes) {
-        this.programTypes = programTypes;
-        return this;
-    }
-
-    public ProgramSearchRequest addProgramTypesItem(ProgramTypesEnum programTypesItem) {
-        if (this.programTypes == null) {
-            this.programTypes = new ArrayList<ProgramTypesEnum>();
-        }
-        this.programTypes.add(programTypesItem);
-        return this;
-    }
-
-    /**
-     * The type of program entity this object represents &lt;br/&gt; &#x27;STANARD&#x27; represents a standard, permenant breeding program &lt;br/&gt; &#x27;PROJECT&#x27; represents a short term project, usually with a set time limit based on funding
-     *
-     * @return programTypes
-     **/
-    @Schema(example = "[\"STANARD\",\"PROJECT\"]", description = "The type of program entity this object represents <br/> 'STANARD' represents a standard, permenant breeding program <br/> 'PROJECT' represents a short term project, usually with a set time limit based on funding ")
-    public List<ProgramTypesEnum> getProgramTypes() {
-        return programTypes;
-    }
-
-    public void setProgramTypes(List<ProgramTypesEnum> programTypes) {
-        this.programTypes = programTypes;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ProgramSearchRequest programSearchRequest = (ProgramSearchRequest) o;
-        return Objects.equals(this.abbreviations, programSearchRequest.abbreviations) &&
-                Objects.equals(this.commonCropNames, programSearchRequest.commonCropNames) &&
-                Objects.equals(this.externalReferenceIDs, programSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, programSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, programSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.leadPersonDbIds, programSearchRequest.leadPersonDbIds) &&
-                Objects.equals(this.leadPersonNames, programSearchRequest.leadPersonNames) &&
-                Objects.equals(this.objectives, programSearchRequest.objectives) &&
-                Objects.equals(this.page, programSearchRequest.page) &&
-                Objects.equals(this.pageSize, programSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, programSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, programSearchRequest.programNames) &&
-                Objects.equals(this.programTypes, programSearchRequest.programTypes);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(abbreviations, commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, leadPersonDbIds, leadPersonNames, objectives, page, pageSize, programDbIds, programNames, programTypes);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ProgramSearchRequest {\n");
-
-        sb.append("    abbreviations: ").append(toIndentedString(abbreviations)).append("\n");
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    leadPersonDbIds: ").append(toIndentedString(leadPersonDbIds)).append("\n");
-        sb.append("    leadPersonNames: ").append(toIndentedString(leadPersonNames)).append("\n");
-        sb.append("    objectives: ").append(toIndentedString(objectives)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    programTypes: ").append(toIndentedString(programTypes)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramSingleResponse.java
deleted file mode 100644
index a712eb44..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ProgramSingleResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ProgramSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ProgramSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Program result = null;
-
-    public ProgramSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ProgramSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ProgramSingleResponse result(Program result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Program getResult() {
-        return result;
-    }
-
-    public void setResult(Program result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ProgramSingleResponse programSingleResponse = (ProgramSingleResponse) o;
-        return Objects.equals(this._atContext, programSingleResponse._atContext) &&
-                Objects.equals(this.metadata, programSingleResponse.metadata) &&
-                Objects.equals(this.result, programSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ProgramSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Scale.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Scale.java
deleted file mode 100644
index d821a31f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Scale.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * Scale metadata
- */
-@Schema(description = "Scale metadata")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Scale {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypeEnum.Adapter.class)
-    public enum DataTypeEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypeEnum fromValue(String input) {
-            for (DataTypeEnum b : DataTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataType")
-    private DataTypeEnum dataType = null;
-
-    @SerializedName("decimalPlaces")
-    private Integer decimalPlaces = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    @SerializedName("scaleDbId")
-    private String scaleDbId = null;
-
-    @SerializedName("scaleName")
-    private String scaleName = null;
-
-    @SerializedName("scalePUI")
-    private String scalePUI = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    @SerializedName("validValues")
-    private ObservationVariableScaleValidValues validValues = null;
-
-    public Scale additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Scale putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Scale dataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-        return this;
-    }
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     *
-     * @return dataType
-     **/
-    @Schema(example = "Numerical", description = "<p>Class of the scale, entries can be</p> <p>\"Code\" -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \"75VD\" means \"75 %\" of the plant is infected and the plant is very delayed.</p> <p>\"Date\" - The date class is for events expressed in a time format, See ISO 8601</p> <p>\"Duration\" - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months</p> <p>\"Nominal\" - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories</p> <p>\"Numerical\" - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches</p> <p>\"Ordinal\" - Ordinal scales are scales composed of ordered categories</p> <p>\"Text\" - A free text is used to express the trait.</p>")
-    public DataTypeEnum getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-    }
-
-    public Scale decimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-        return this;
-    }
-
-    /**
-     * For numerical, number of decimal places to be reported
-     *
-     * @return decimalPlaces
-     **/
-    @Schema(example = "2", description = "For numerical, number of decimal places to be reported")
-    public Integer getDecimalPlaces() {
-        return decimalPlaces;
-    }
-
-    public void setDecimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-    }
-
-    public Scale externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Scale addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Scale ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public Scale scaleDbId(String scaleDbId) {
-        this.scaleDbId = scaleDbId;
-        return this;
-    }
-
-    /**
-     * Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.
-     *
-     * @return scaleDbId
-     **/
-    @Schema(example = "af730171", description = "Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.")
-    public String getScaleDbId() {
-        return scaleDbId;
-    }
-
-    public void setScaleDbId(String scaleDbId) {
-        this.scaleDbId = scaleDbId;
-    }
-
-    public Scale scaleName(String scaleName) {
-        this.scaleName = scaleName;
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleName
-     **/
-    @Schema(example = "Meters", description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public String getScaleName() {
-        return scaleName;
-    }
-
-    public void setScaleName(String scaleName) {
-        this.scaleName = scaleName;
-    }
-
-    public Scale scalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000112", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public String getScalePUI() {
-        return scalePUI;
-    }
-
-    public void setScalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-    }
-
-    public Scale units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when &#x60;dataType&#x60; is Numeric, but could also be included for other dataTypes when applicable.
-     *
-     * @return units
-     **/
-    @Schema(example = "m", description = "This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when `dataType` is Numeric, but could also be included for other dataTypes when applicable.")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    public Scale validValues(ObservationVariableScaleValidValues validValues) {
-        this.validValues = validValues;
-        return this;
-    }
-
-    /**
-     * Get validValues
-     *
-     * @return validValues
-     **/
-    @Schema(description = "")
-    public ObservationVariableScaleValidValues getValidValues() {
-        return validValues;
-    }
-
-    public void setValidValues(ObservationVariableScaleValidValues validValues) {
-        this.validValues = validValues;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Scale scale = (Scale) o;
-        return Objects.equals(this.additionalInfo, scale.additionalInfo) &&
-                Objects.equals(this.dataType, scale.dataType) &&
-                Objects.equals(this.decimalPlaces, scale.decimalPlaces) &&
-                Objects.equals(this.externalReferences, scale.externalReferences) &&
-                Objects.equals(this.ontologyReference, scale.ontologyReference) &&
-                Objects.equals(this.scaleDbId, scale.scaleDbId) &&
-                Objects.equals(this.scaleName, scale.scaleName) &&
-                Objects.equals(this.scalePUI, scale.scalePUI) &&
-                Objects.equals(this.units, scale.units) &&
-                Objects.equals(this.validValues, scale.validValues);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, dataType, decimalPlaces, externalReferences, ontologyReference, scaleDbId, scaleName, scalePUI, units, validValues);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Scale {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
-        sb.append("    decimalPlaces: ").append(toIndentedString(decimalPlaces)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scaleDbId: ").append(toIndentedString(scaleDbId)).append("\n");
-        sb.append("    scaleName: ").append(toIndentedString(scaleName)).append("\n");
-        sb.append("    scalePUI: ").append(toIndentedString(scalePUI)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("    validValues: ").append(toIndentedString(validValues)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleBaseClass.java
deleted file mode 100644
index ca78572c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleBaseClass.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * A Scale describes the units and acceptable values for an ObservationVariable.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Scale \&quot;inches\&quot; or \&quot;pixels\&quot;.
- */
-@Schema(description = "A Scale describes the units and acceptable values for an ObservationVariable.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Scale \"inches\" or \"pixels\".")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ScaleBaseClass {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypeEnum.Adapter.class)
-    public enum DataTypeEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypeEnum fromValue(String input) {
-            for (DataTypeEnum b : DataTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataType")
-    private DataTypeEnum dataType = null;
-
-    @SerializedName("decimalPlaces")
-    private Integer decimalPlaces = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("ontologyReference")
-    private MethodBaseClassOntologyReference ontologyReference = null;
-
-    @SerializedName("scaleName")
-    private String scaleName = null;
-
-    @SerializedName("scalePUI")
-    private String scalePUI = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    @SerializedName("validValues")
-    private ScaleBaseClassValidValues validValues = null;
-
-    public ScaleBaseClass additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ScaleBaseClass putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ScaleBaseClass dataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-        return this;
-    }
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     *
-     * @return dataType
-     **/
-    @Schema(example = "Numerical", description = "<p>Class of the scale, entries can be</p> <p>\"Code\" -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \"75VD\" means \"75 %\" of the plant is infected and the plant is very delayed.</p> <p>\"Date\" - The date class is for events expressed in a time format, See ISO 8601</p> <p>\"Duration\" - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months</p> <p>\"Nominal\" - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories</p> <p>\"Numerical\" - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches</p> <p>\"Ordinal\" - Ordinal scales are scales composed of ordered categories</p> <p>\"Text\" - A free text is used to express the trait.</p>")
-    public DataTypeEnum getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-    }
-
-    public ScaleBaseClass decimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-        return this;
-    }
-
-    /**
-     * For numerical, number of decimal places to be reported
-     *
-     * @return decimalPlaces
-     **/
-    @Schema(example = "2", description = "For numerical, number of decimal places to be reported")
-    public Integer getDecimalPlaces() {
-        return decimalPlaces;
-    }
-
-    public void setDecimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-    }
-
-    public ScaleBaseClass externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ScaleBaseClass addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ScaleBaseClass ontologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodBaseClassOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public ScaleBaseClass scaleName(String scaleName) {
-        this.scaleName = scaleName;
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleName
-     **/
-    @Schema(example = "Meters", required = true, description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public String getScaleName() {
-        return scaleName;
-    }
-
-    public void setScaleName(String scaleName) {
-        this.scaleName = scaleName;
-    }
-
-    public ScaleBaseClass scalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000112", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public String getScalePUI() {
-        return scalePUI;
-    }
-
-    public void setScalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-    }
-
-    public ScaleBaseClass units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when &#x60;dataType&#x60; is Numeric, but could also be included for other dataTypes when applicable.
-     *
-     * @return units
-     **/
-    @Schema(example = "m", description = "This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when `dataType` is Numeric, but could also be included for other dataTypes when applicable.")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    public ScaleBaseClass validValues(ScaleBaseClassValidValues validValues) {
-        this.validValues = validValues;
-        return this;
-    }
-
-    /**
-     * Get validValues
-     *
-     * @return validValues
-     **/
-    @Schema(description = "")
-    public ScaleBaseClassValidValues getValidValues() {
-        return validValues;
-    }
-
-    public void setValidValues(ScaleBaseClassValidValues validValues) {
-        this.validValues = validValues;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ScaleBaseClass scaleBaseClass = (ScaleBaseClass) o;
-        return Objects.equals(this.additionalInfo, scaleBaseClass.additionalInfo) &&
-                Objects.equals(this.dataType, scaleBaseClass.dataType) &&
-                Objects.equals(this.decimalPlaces, scaleBaseClass.decimalPlaces) &&
-                Objects.equals(this.externalReferences, scaleBaseClass.externalReferences) &&
-                Objects.equals(this.ontologyReference, scaleBaseClass.ontologyReference) &&
-                Objects.equals(this.scaleName, scaleBaseClass.scaleName) &&
-                Objects.equals(this.scalePUI, scaleBaseClass.scalePUI) &&
-                Objects.equals(this.units, scaleBaseClass.units) &&
-                Objects.equals(this.validValues, scaleBaseClass.validValues);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, dataType, decimalPlaces, externalReferences, ontologyReference, scaleName, scalePUI, units, validValues);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScaleBaseClass {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
-        sb.append("    decimalPlaces: ").append(toIndentedString(decimalPlaces)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scaleName: ").append(toIndentedString(scaleName)).append("\n");
-        sb.append("    scalePUI: ").append(toIndentedString(scalePUI)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("    validValues: ").append(toIndentedString(validValues)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleBaseClassValidValues.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleBaseClassValidValues.java
deleted file mode 100644
index 278deb67..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleBaseClassValidValues.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ScaleBaseClassValidValues
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ScaleBaseClassValidValues {
-    @SerializedName("categories")
-    private List<ScaleBaseClassValidValuesCategories> categories = null;
-
-    @SerializedName("max")
-    private Integer max = null;
-
-    @SerializedName("maximumValue")
-    private String maximumValue = null;
-
-    @SerializedName("min")
-    private Integer min = null;
-
-    @SerializedName("minimumValue")
-    private String minimumValue = null;
-
-    public ScaleBaseClassValidValues categories(List<ScaleBaseClassValidValuesCategories> categories) {
-        this.categories = categories;
-        return this;
-    }
-
-    public ScaleBaseClassValidValues addCategoriesItem(ScaleBaseClassValidValuesCategories categoriesItem) {
-        if (this.categories == null) {
-            this.categories = new ArrayList<ScaleBaseClassValidValuesCategories>();
-        }
-        this.categories.add(categoriesItem);
-        return this;
-    }
-
-    /**
-     * List of possible values with optional labels
-     *
-     * @return categories
-     **/
-    @Schema(example = "[{\"label\":\"low\",\"value\":\"0\"},{\"label\":\"medium\",\"value\":\"5\"},{\"label\":\"high\",\"value\":\"10\"}]", description = "List of possible values with optional labels")
-    public List<ScaleBaseClassValidValuesCategories> getCategories() {
-        return categories;
-    }
-
-    public void setCategories(List<ScaleBaseClassValidValuesCategories> categories) {
-        this.categories = categories;
-    }
-
-    public ScaleBaseClassValidValues max(Integer max) {
-        this.max = max;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;maximumValue&#x60;. Github issue number #450  &lt;br&gt;Maximum value for numerical scales. Typically used for data capture control and QC.
-     *
-     * @return max
-     **/
-    @Schema(example = "9999", description = "**Deprecated in v2.1** Please use `maximumValue`. Github issue number #450  <br>Maximum value for numerical scales. Typically used for data capture control and QC.")
-    public Integer getMax() {
-        return max;
-    }
-
-    public void setMax(Integer max) {
-        this.max = max;
-    }
-
-    public ScaleBaseClassValidValues maximumValue(String maximumValue) {
-        this.maximumValue = maximumValue;
-        return this;
-    }
-
-    /**
-     * Maximum value for numerical, date, and time scales. Typically used for data capture control and QC.
-     *
-     * @return maximumValue
-     **/
-    @Schema(example = "9999", description = "Maximum value for numerical, date, and time scales. Typically used for data capture control and QC.")
-    public String getMaximumValue() {
-        return maximumValue;
-    }
-
-    public void setMaximumValue(String maximumValue) {
-        this.maximumValue = maximumValue;
-    }
-
-    public ScaleBaseClassValidValues min(Integer min) {
-        this.min = min;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;minimumValue&#x60;. Github issue number #450  &lt;br&gt;Minimum value for numerical scales. Typically used for data capture control and QC.
-     *
-     * @return min
-     **/
-    @Schema(example = "2", description = "**Deprecated in v2.1** Please use `minimumValue`. Github issue number #450  <br>Minimum value for numerical scales. Typically used for data capture control and QC.")
-    public Integer getMin() {
-        return min;
-    }
-
-    public void setMin(Integer min) {
-        this.min = min;
-    }
-
-    public ScaleBaseClassValidValues minimumValue(String minimumValue) {
-        this.minimumValue = minimumValue;
-        return this;
-    }
-
-    /**
-     * Minimum value for numerical, date, and time scales. Typically used for data capture control and QC.
-     *
-     * @return minimumValue
-     **/
-    @Schema(example = "2", description = "Minimum value for numerical, date, and time scales. Typically used for data capture control and QC.")
-    public String getMinimumValue() {
-        return minimumValue;
-    }
-
-    public void setMinimumValue(String minimumValue) {
-        this.minimumValue = minimumValue;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ScaleBaseClassValidValues scaleBaseClassValidValues = (ScaleBaseClassValidValues) o;
-        return Objects.equals(this.categories, scaleBaseClassValidValues.categories) &&
-                Objects.equals(this.max, scaleBaseClassValidValues.max) &&
-                Objects.equals(this.maximumValue, scaleBaseClassValidValues.maximumValue) &&
-                Objects.equals(this.min, scaleBaseClassValidValues.min) &&
-                Objects.equals(this.minimumValue, scaleBaseClassValidValues.minimumValue);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(categories, max, maximumValue, min, minimumValue);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScaleBaseClassValidValues {\n");
-
-        sb.append("    categories: ").append(toIndentedString(categories)).append("\n");
-        sb.append("    max: ").append(toIndentedString(max)).append("\n");
-        sb.append("    maximumValue: ").append(toIndentedString(maximumValue)).append("\n");
-        sb.append("    min: ").append(toIndentedString(min)).append("\n");
-        sb.append("    minimumValue: ").append(toIndentedString(minimumValue)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleBaseClassValidValuesCategories.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleBaseClassValidValuesCategories.java
deleted file mode 100644
index 43254c9e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleBaseClassValidValuesCategories.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ScaleBaseClassValidValuesCategories
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ScaleBaseClassValidValuesCategories {
-    @SerializedName("label")
-    private String label = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    public ScaleBaseClassValidValuesCategories label(String label) {
-        this.label = label;
-        return this;
-    }
-
-    /**
-     * A text label for a category
-     *
-     * @return label
-     **/
-    @Schema(description = "A text label for a category")
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    public ScaleBaseClassValidValuesCategories value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * The actual value for a category
-     *
-     * @return value
-     **/
-    @Schema(description = "The actual value for a category")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ScaleBaseClassValidValuesCategories scaleBaseClassValidValuesCategories = (ScaleBaseClassValidValuesCategories) o;
-        return Objects.equals(this.label, scaleBaseClassValidValuesCategories.label) &&
-                Objects.equals(this.value, scaleBaseClassValidValuesCategories.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(label, value);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScaleBaseClassValidValuesCategories {\n");
-
-        sb.append("    label: ").append(toIndentedString(label)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleListResponse.java
deleted file mode 100644
index 92a6388a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ScaleListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ScaleListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ScaleListResponseResult result = null;
-
-    public ScaleListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ScaleListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ScaleListResponse result(ScaleListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ScaleListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ScaleListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ScaleListResponse scaleListResponse = (ScaleListResponse) o;
-        return Objects.equals(this._atContext, scaleListResponse._atContext) &&
-                Objects.equals(this.metadata, scaleListResponse.metadata) &&
-                Objects.equals(this.result, scaleListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScaleListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleListResponseResult.java
deleted file mode 100644
index ea5a54fb..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ScaleListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ScaleListResponseResult {
-    @SerializedName("data")
-    private List<Scale> data = new ArrayList<Scale>();
-
-    public ScaleListResponseResult data(List<Scale> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ScaleListResponseResult addDataItem(Scale dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Scale> getData() {
-        return data;
-    }
-
-    public void setData(List<Scale> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ScaleListResponseResult scaleListResponseResult = (ScaleListResponseResult) o;
-        return Objects.equals(this.data, scaleListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScaleListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleNewRequest.java
deleted file mode 100644
index 1fcfef7b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleNewRequest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import java.util.Objects;
-
-/**
- * ScaleNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ScaleNewRequest {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash();
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScaleNewRequest {\n");
-
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleSingleResponse.java
deleted file mode 100644
index 53842c19..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ScaleSingleResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ScaleSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ScaleSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Scale result = null;
-
-    public ScaleSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ScaleSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ScaleSingleResponse result(Scale result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Scale getResult() {
-        return result;
-    }
-
-    public void setResult(Scale result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ScaleSingleResponse scaleSingleResponse = (ScaleSingleResponse) o;
-        return Objects.equals(this._atContext, scaleSingleResponse._atContext) &&
-                Objects.equals(this.metadata, scaleSingleResponse.metadata) &&
-                Objects.equals(this.result, scaleSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScaleSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchImagesBody.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchImagesBody.java
deleted file mode 100644
index 151e55d0..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchImagesBody.java
+++ /dev/null
@@ -1,747 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchImagesBody
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SearchImagesBody {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("descriptiveOntologyTerms")
-    private List<String> descriptiveOntologyTerms = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("imageDbIds")
-    private List<String> imageDbIds = null;
-
-    @SerializedName("imageFileNames")
-    private List<String> imageFileNames = null;
-
-    @SerializedName("imageFileSizeMax")
-    private Integer imageFileSizeMax = null;
-
-    @SerializedName("imageFileSizeMin")
-    private Integer imageFileSizeMin = null;
-
-    @SerializedName("imageHeightMax")
-    private Integer imageHeightMax = null;
-
-    @SerializedName("imageHeightMin")
-    private Integer imageHeightMin = null;
-
-    @SerializedName("imageLocation")
-    private GeoJSONSearchArea imageLocation = null;
-
-    @SerializedName("imageNames")
-    private List<String> imageNames = null;
-
-    @SerializedName("imageTimeStampRangeEnd")
-    private OffsetDateTime imageTimeStampRangeEnd = null;
-
-    @SerializedName("imageTimeStampRangeStart")
-    private OffsetDateTime imageTimeStampRangeStart = null;
-
-    @SerializedName("imageWidthMax")
-    private Integer imageWidthMax = null;
-
-    @SerializedName("imageWidthMin")
-    private Integer imageWidthMin = null;
-
-    @SerializedName("mimeTypes")
-    private List<String> mimeTypes = null;
-
-    @SerializedName("observationDbIds")
-    private List<String> observationDbIds = null;
-
-    @SerializedName("observationUnitDbIds")
-    private List<String> observationUnitDbIds = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    public SearchImagesBody commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public SearchImagesBody addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public SearchImagesBody descriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-        return this;
-    }
-
-    public SearchImagesBody addDescriptiveOntologyTermsItem(String descriptiveOntologyTermsItem) {
-        if (this.descriptiveOntologyTerms == null) {
-            this.descriptiveOntologyTerms = new ArrayList<String>();
-        }
-        this.descriptiveOntologyTerms.add(descriptiveOntologyTermsItem);
-        return this;
-    }
-
-    /**
-     * A list of terms to formally describe the image to search for. Each item could be a simple Tag, an Ontology reference Id, or a full ontology URL.
-     *
-     * @return descriptiveOntologyTerms
-     **/
-    @Schema(example = "[\"doi:10.1002/0470841559\",\"Red\",\"ncbi:0300294\"]", description = "A list of terms to formally describe the image to search for. Each item could be a simple Tag, an Ontology reference Id, or a full ontology URL.")
-    public List<String> getDescriptiveOntologyTerms() {
-        return descriptiveOntologyTerms;
-    }
-
-    public void setDescriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-    }
-
-    public SearchImagesBody externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public SearchImagesBody addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public SearchImagesBody externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public SearchImagesBody addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public SearchImagesBody externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public SearchImagesBody addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public SearchImagesBody imageDbIds(List<String> imageDbIds) {
-        this.imageDbIds = imageDbIds;
-        return this;
-    }
-
-    public SearchImagesBody addImageDbIdsItem(String imageDbIdsItem) {
-        if (this.imageDbIds == null) {
-            this.imageDbIds = new ArrayList<String>();
-        }
-        this.imageDbIds.add(imageDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of image Ids to search for
-     *
-     * @return imageDbIds
-     **/
-    @Schema(example = "[\"564b64a6\",\"0d122d1d\"]", description = "A list of image Ids to search for")
-    public List<String> getImageDbIds() {
-        return imageDbIds;
-    }
-
-    public void setImageDbIds(List<String> imageDbIds) {
-        this.imageDbIds = imageDbIds;
-    }
-
-    public SearchImagesBody imageFileNames(List<String> imageFileNames) {
-        this.imageFileNames = imageFileNames;
-        return this;
-    }
-
-    public SearchImagesBody addImageFileNamesItem(String imageFileNamesItem) {
-        if (this.imageFileNames == null) {
-            this.imageFileNames = new ArrayList<String>();
-        }
-        this.imageFileNames.add(imageFileNamesItem);
-        return this;
-    }
-
-    /**
-     * Image file names to search for.
-     *
-     * @return imageFileNames
-     **/
-    @Schema(example = "[\"image_01032019.jpg\",\"picture_field_1234.jpg\"]", description = "Image file names to search for.")
-    public List<String> getImageFileNames() {
-        return imageFileNames;
-    }
-
-    public void setImageFileNames(List<String> imageFileNames) {
-        this.imageFileNames = imageFileNames;
-    }
-
-    public SearchImagesBody imageFileSizeMax(Integer imageFileSizeMax) {
-        this.imageFileSizeMax = imageFileSizeMax;
-        return this;
-    }
-
-    /**
-     * A maximum image file size to search for.
-     *
-     * @return imageFileSizeMax
-     **/
-    @Schema(example = "20000000", description = "A maximum image file size to search for.")
-    public Integer getImageFileSizeMax() {
-        return imageFileSizeMax;
-    }
-
-    public void setImageFileSizeMax(Integer imageFileSizeMax) {
-        this.imageFileSizeMax = imageFileSizeMax;
-    }
-
-    public SearchImagesBody imageFileSizeMin(Integer imageFileSizeMin) {
-        this.imageFileSizeMin = imageFileSizeMin;
-        return this;
-    }
-
-    /**
-     * A minimum image file size to search for.
-     *
-     * @return imageFileSizeMin
-     **/
-    @Schema(example = "1000", description = "A minimum image file size to search for.")
-    public Integer getImageFileSizeMin() {
-        return imageFileSizeMin;
-    }
-
-    public void setImageFileSizeMin(Integer imageFileSizeMin) {
-        this.imageFileSizeMin = imageFileSizeMin;
-    }
-
-    public SearchImagesBody imageHeightMax(Integer imageHeightMax) {
-        this.imageHeightMax = imageHeightMax;
-        return this;
-    }
-
-    /**
-     * A maximum image height to search for.
-     *
-     * @return imageHeightMax
-     **/
-    @Schema(example = "1080", description = "A maximum image height to search for.")
-    public Integer getImageHeightMax() {
-        return imageHeightMax;
-    }
-
-    public void setImageHeightMax(Integer imageHeightMax) {
-        this.imageHeightMax = imageHeightMax;
-    }
-
-    public SearchImagesBody imageHeightMin(Integer imageHeightMin) {
-        this.imageHeightMin = imageHeightMin;
-        return this;
-    }
-
-    /**
-     * A minimum image height to search for.
-     *
-     * @return imageHeightMin
-     **/
-    @Schema(example = "720", description = "A minimum image height to search for.")
-    public Integer getImageHeightMin() {
-        return imageHeightMin;
-    }
-
-    public void setImageHeightMin(Integer imageHeightMin) {
-        this.imageHeightMin = imageHeightMin;
-    }
-
-    public SearchImagesBody imageLocation(GeoJSONSearchArea imageLocation) {
-        this.imageLocation = imageLocation;
-        return this;
-    }
-
-    /**
-     * Get imageLocation
-     *
-     * @return imageLocation
-     **/
-    @Schema(description = "")
-    public GeoJSONSearchArea getImageLocation() {
-        return imageLocation;
-    }
-
-    public void setImageLocation(GeoJSONSearchArea imageLocation) {
-        this.imageLocation = imageLocation;
-    }
-
-    public SearchImagesBody imageNames(List<String> imageNames) {
-        this.imageNames = imageNames;
-        return this;
-    }
-
-    public SearchImagesBody addImageNamesItem(String imageNamesItem) {
-        if (this.imageNames == null) {
-            this.imageNames = new ArrayList<String>();
-        }
-        this.imageNames.add(imageNamesItem);
-        return this;
-    }
-
-    /**
-     * Human readable names to search for.
-     *
-     * @return imageNames
-     **/
-    @Schema(example = "[\"Image 43\",\"Tractor in field\"]", description = "Human readable names to search for.")
-    public List<String> getImageNames() {
-        return imageNames;
-    }
-
-    public void setImageNames(List<String> imageNames) {
-        this.imageNames = imageNames;
-    }
-
-    public SearchImagesBody imageTimeStampRangeEnd(OffsetDateTime imageTimeStampRangeEnd) {
-        this.imageTimeStampRangeEnd = imageTimeStampRangeEnd;
-        return this;
-    }
-
-    /**
-     * The latest timestamp to search for.
-     *
-     * @return imageTimeStampRangeEnd
-     **/
-    @Schema(description = "The latest timestamp to search for.")
-    public OffsetDateTime getImageTimeStampRangeEnd() {
-        return imageTimeStampRangeEnd;
-    }
-
-    public void setImageTimeStampRangeEnd(OffsetDateTime imageTimeStampRangeEnd) {
-        this.imageTimeStampRangeEnd = imageTimeStampRangeEnd;
-    }
-
-    public SearchImagesBody imageTimeStampRangeStart(OffsetDateTime imageTimeStampRangeStart) {
-        this.imageTimeStampRangeStart = imageTimeStampRangeStart;
-        return this;
-    }
-
-    /**
-     * The earliest timestamp to search for.
-     *
-     * @return imageTimeStampRangeStart
-     **/
-    @Schema(description = "The earliest timestamp to search for.")
-    public OffsetDateTime getImageTimeStampRangeStart() {
-        return imageTimeStampRangeStart;
-    }
-
-    public void setImageTimeStampRangeStart(OffsetDateTime imageTimeStampRangeStart) {
-        this.imageTimeStampRangeStart = imageTimeStampRangeStart;
-    }
-
-    public SearchImagesBody imageWidthMax(Integer imageWidthMax) {
-        this.imageWidthMax = imageWidthMax;
-        return this;
-    }
-
-    /**
-     * A maximum image width to search for.
-     *
-     * @return imageWidthMax
-     **/
-    @Schema(example = "1920", description = "A maximum image width to search for.")
-    public Integer getImageWidthMax() {
-        return imageWidthMax;
-    }
-
-    public void setImageWidthMax(Integer imageWidthMax) {
-        this.imageWidthMax = imageWidthMax;
-    }
-
-    public SearchImagesBody imageWidthMin(Integer imageWidthMin) {
-        this.imageWidthMin = imageWidthMin;
-        return this;
-    }
-
-    /**
-     * A minimum image width to search for.
-     *
-     * @return imageWidthMin
-     **/
-    @Schema(example = "1280", description = "A minimum image width to search for.")
-    public Integer getImageWidthMin() {
-        return imageWidthMin;
-    }
-
-    public void setImageWidthMin(Integer imageWidthMin) {
-        this.imageWidthMin = imageWidthMin;
-    }
-
-    public SearchImagesBody mimeTypes(List<String> mimeTypes) {
-        this.mimeTypes = mimeTypes;
-        return this;
-    }
-
-    public SearchImagesBody addMimeTypesItem(String mimeTypesItem) {
-        if (this.mimeTypes == null) {
-            this.mimeTypes = new ArrayList<String>();
-        }
-        this.mimeTypes.add(mimeTypesItem);
-        return this;
-    }
-
-    /**
-     * A set of image file types to search for.
-     *
-     * @return mimeTypes
-     **/
-    @Schema(example = "[\"image/jpg\",\"image/jpeg\",\"image/gif\"]", description = "A set of image file types to search for.")
-    public List<String> getMimeTypes() {
-        return mimeTypes;
-    }
-
-    public void setMimeTypes(List<String> mimeTypes) {
-        this.mimeTypes = mimeTypes;
-    }
-
-    public SearchImagesBody observationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-        return this;
-    }
-
-    public SearchImagesBody addObservationDbIdsItem(String observationDbIdsItem) {
-        if (this.observationDbIds == null) {
-            this.observationDbIds = new ArrayList<String>();
-        }
-        this.observationDbIds.add(observationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of observation Ids this image is associated with to search for
-     *
-     * @return observationDbIds
-     **/
-    @Schema(example = "[\"47326456\",\"fc9823ac\"]", description = "A list of observation Ids this image is associated with to search for")
-    public List<String> getObservationDbIds() {
-        return observationDbIds;
-    }
-
-    public void setObservationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-    }
-
-    public SearchImagesBody observationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-        return this;
-    }
-
-    public SearchImagesBody addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-        if (this.observationUnitDbIds == null) {
-            this.observationUnitDbIds = new ArrayList<String>();
-        }
-        this.observationUnitDbIds.add(observationUnitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A set of observation unit identifiers to search for.
-     *
-     * @return observationUnitDbIds
-     **/
-    @Schema(example = "[\"f5e4b273\",\"328c9424\"]", description = "A set of observation unit identifiers to search for.")
-    public List<String> getObservationUnitDbIds() {
-        return observationUnitDbIds;
-    }
-
-    public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-    }
-
-    public SearchImagesBody page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SearchImagesBody pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public SearchImagesBody programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public SearchImagesBody addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public SearchImagesBody programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public SearchImagesBody addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchImagesBody searchImagesBody = (SearchImagesBody) o;
-        return Objects.equals(this.commonCropNames, searchImagesBody.commonCropNames) &&
-                Objects.equals(this.descriptiveOntologyTerms, searchImagesBody.descriptiveOntologyTerms) &&
-                Objects.equals(this.externalReferenceIDs, searchImagesBody.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, searchImagesBody.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, searchImagesBody.externalReferenceSources) &&
-                Objects.equals(this.imageDbIds, searchImagesBody.imageDbIds) &&
-                Objects.equals(this.imageFileNames, searchImagesBody.imageFileNames) &&
-                Objects.equals(this.imageFileSizeMax, searchImagesBody.imageFileSizeMax) &&
-                Objects.equals(this.imageFileSizeMin, searchImagesBody.imageFileSizeMin) &&
-                Objects.equals(this.imageHeightMax, searchImagesBody.imageHeightMax) &&
-                Objects.equals(this.imageHeightMin, searchImagesBody.imageHeightMin) &&
-                Objects.equals(this.imageLocation, searchImagesBody.imageLocation) &&
-                Objects.equals(this.imageNames, searchImagesBody.imageNames) &&
-                Objects.equals(this.imageTimeStampRangeEnd, searchImagesBody.imageTimeStampRangeEnd) &&
-                Objects.equals(this.imageTimeStampRangeStart, searchImagesBody.imageTimeStampRangeStart) &&
-                Objects.equals(this.imageWidthMax, searchImagesBody.imageWidthMax) &&
-                Objects.equals(this.imageWidthMin, searchImagesBody.imageWidthMin) &&
-                Objects.equals(this.mimeTypes, searchImagesBody.mimeTypes) &&
-                Objects.equals(this.observationDbIds, searchImagesBody.observationDbIds) &&
-                Objects.equals(this.observationUnitDbIds, searchImagesBody.observationUnitDbIds) &&
-                Objects.equals(this.page, searchImagesBody.page) &&
-                Objects.equals(this.pageSize, searchImagesBody.pageSize) &&
-                Objects.equals(this.programDbIds, searchImagesBody.programDbIds) &&
-                Objects.equals(this.programNames, searchImagesBody.programNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, descriptiveOntologyTerms, externalReferenceIDs, externalReferenceIds, externalReferenceSources, imageDbIds, imageFileNames, imageFileSizeMax, imageFileSizeMin, imageHeightMax, imageHeightMin, imageLocation, imageNames, imageTimeStampRangeEnd, imageTimeStampRangeStart, imageWidthMax, imageWidthMin, mimeTypes, observationDbIds, observationUnitDbIds, page, pageSize, programDbIds, programNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchImagesBody {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    descriptiveOntologyTerms: ").append(toIndentedString(descriptiveOntologyTerms)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    imageDbIds: ").append(toIndentedString(imageDbIds)).append("\n");
-        sb.append("    imageFileNames: ").append(toIndentedString(imageFileNames)).append("\n");
-        sb.append("    imageFileSizeMax: ").append(toIndentedString(imageFileSizeMax)).append("\n");
-        sb.append("    imageFileSizeMin: ").append(toIndentedString(imageFileSizeMin)).append("\n");
-        sb.append("    imageHeightMax: ").append(toIndentedString(imageHeightMax)).append("\n");
-        sb.append("    imageHeightMin: ").append(toIndentedString(imageHeightMin)).append("\n");
-        sb.append("    imageLocation: ").append(toIndentedString(imageLocation)).append("\n");
-        sb.append("    imageNames: ").append(toIndentedString(imageNames)).append("\n");
-        sb.append("    imageTimeStampRangeEnd: ").append(toIndentedString(imageTimeStampRangeEnd)).append("\n");
-        sb.append("    imageTimeStampRangeStart: ").append(toIndentedString(imageTimeStampRangeStart)).append("\n");
-        sb.append("    imageWidthMax: ").append(toIndentedString(imageWidthMax)).append("\n");
-        sb.append("    imageWidthMin: ").append(toIndentedString(imageWidthMin)).append("\n");
-        sb.append("    mimeTypes: ").append(toIndentedString(mimeTypes)).append("\n");
-        sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
-        sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchObservationsBody.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchObservationsBody.java
deleted file mode 100644
index 702f378c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchObservationsBody.java
+++ /dev/null
@@ -1,867 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchObservationsBody
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SearchObservationsBody {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("locationDbIds")
-    private List<String> locationDbIds = null;
-
-    @SerializedName("locationNames")
-    private List<String> locationNames = null;
-
-    @SerializedName("observationDbIds")
-    private List<String> observationDbIds = null;
-
-    @SerializedName("observationLevelRelationships")
-    private List<ObservationUnitLevelRelationship1> observationLevelRelationships = null;
-
-    @SerializedName("observationLevels")
-    private List<ObservationUnitLevel1> observationLevels = null;
-
-    @SerializedName("observationTimeStampRangeEnd")
-    private OffsetDateTime observationTimeStampRangeEnd = null;
-
-    @SerializedName("observationTimeStampRangeStart")
-    private OffsetDateTime observationTimeStampRangeStart = null;
-
-    @SerializedName("observationUnitDbIds")
-    private List<String> observationUnitDbIds = null;
-
-    @SerializedName("observationVariableDbIds")
-    private List<String> observationVariableDbIds = null;
-
-    @SerializedName("observationVariableNames")
-    private List<String> observationVariableNames = null;
-
-    @SerializedName("observationVariablePUIs")
-    private List<String> observationVariablePUIs = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("seasonDbIds")
-    private List<String> seasonDbIds = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public SearchObservationsBody commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public SearchObservationsBody addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public SearchObservationsBody externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public SearchObservationsBody addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public SearchObservationsBody externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public SearchObservationsBody addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public SearchObservationsBody externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public SearchObservationsBody addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public SearchObservationsBody germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public SearchObservationsBody germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public SearchObservationsBody addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public SearchObservationsBody locationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addLocationDbIdsItem(String locationDbIdsItem) {
-        if (this.locationDbIds == null) {
-            this.locationDbIds = new ArrayList<String>();
-        }
-        this.locationDbIds.add(locationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The location ids to search for
-     *
-     * @return locationDbIds
-     **/
-    @Schema(example = "[\"b28911cf\",\"5071d1e4\"]", description = "The location ids to search for")
-    public List<String> getLocationDbIds() {
-        return locationDbIds;
-    }
-
-    public void setLocationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-    }
-
-    public SearchObservationsBody locationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-        return this;
-    }
-
-    public SearchObservationsBody addLocationNamesItem(String locationNamesItem) {
-        if (this.locationNames == null) {
-            this.locationNames = new ArrayList<String>();
-        }
-        this.locationNames.add(locationNamesItem);
-        return this;
-    }
-
-    /**
-     * A human readable names to search for
-     *
-     * @return locationNames
-     **/
-    @Schema(example = "[\"Location Alpha\",\"The Large Hadron Collider\"]", description = "A human readable names to search for")
-    public List<String> getLocationNames() {
-        return locationNames;
-    }
-
-    public void setLocationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-    }
-
-    public SearchObservationsBody observationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addObservationDbIdsItem(String observationDbIdsItem) {
-        if (this.observationDbIds == null) {
-            this.observationDbIds = new ArrayList<String>();
-        }
-        this.observationDbIds.add(observationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique id of an Observation
-     *
-     * @return observationDbIds
-     **/
-    @Schema(example = "[\"6a4a59d8\",\"3ff067e0\"]", description = "The unique id of an Observation")
-    public List<String> getObservationDbIds() {
-        return observationDbIds;
-    }
-
-    public void setObservationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-    }
-
-    public SearchObservationsBody observationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-        return this;
-    }
-
-    public SearchObservationsBody addObservationLevelRelationshipsItem(ObservationUnitLevelRelationship1 observationLevelRelationshipsItem) {
-        if (this.observationLevelRelationships == null) {
-            this.observationLevelRelationships = new ArrayList<ObservationUnitLevelRelationship1>();
-        }
-        this.observationLevelRelationships.add(observationLevelRelationshipsItem);
-        return this;
-    }
-
-    /**
-     * Searches for values in ObservationUnit-&gt;observationUnitPosition-&gt;observationLevelRelationships
-     *
-     * @return observationLevelRelationships
-     **/
-    @Schema(example = "[{\"levelCode\":\"Field_1\",\"levelName\":\"field\"}]", description = "Searches for values in ObservationUnit->observationUnitPosition->observationLevelRelationships")
-    public List<ObservationUnitLevelRelationship1> getObservationLevelRelationships() {
-        return observationLevelRelationships;
-    }
-
-    public void setObservationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-    }
-
-    public SearchObservationsBody observationLevels(List<ObservationUnitLevel1> observationLevels) {
-        this.observationLevels = observationLevels;
-        return this;
-    }
-
-    public SearchObservationsBody addObservationLevelsItem(ObservationUnitLevel1 observationLevelsItem) {
-        if (this.observationLevels == null) {
-            this.observationLevels = new ArrayList<ObservationUnitLevel1>();
-        }
-        this.observationLevels.add(observationLevelsItem);
-        return this;
-    }
-
-    /**
-     * Searches for values in ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel
-     *
-     * @return observationLevels
-     **/
-    @Schema(example = "[{\"levelCode\":\"Plot_123\",\"levelName\":\"plot\"},{\"levelCode\":\"Plot_456\",\"levelName\":\"plot\"},{\"levelCode\":\"Plot_789\",\"levelName\":\"plot\"}]", description = "Searches for values in ObservationUnit->observationUnitPosition->observationLevel")
-    public List<ObservationUnitLevel1> getObservationLevels() {
-        return observationLevels;
-    }
-
-    public void setObservationLevels(List<ObservationUnitLevel1> observationLevels) {
-        this.observationLevels = observationLevels;
-    }
-
-    public SearchObservationsBody observationTimeStampRangeEnd(OffsetDateTime observationTimeStampRangeEnd) {
-        this.observationTimeStampRangeEnd = observationTimeStampRangeEnd;
-        return this;
-    }
-
-    /**
-     * Timestamp range end
-     *
-     * @return observationTimeStampRangeEnd
-     **/
-    @Schema(description = "Timestamp range end")
-    public OffsetDateTime getObservationTimeStampRangeEnd() {
-        return observationTimeStampRangeEnd;
-    }
-
-    public void setObservationTimeStampRangeEnd(OffsetDateTime observationTimeStampRangeEnd) {
-        this.observationTimeStampRangeEnd = observationTimeStampRangeEnd;
-    }
-
-    public SearchObservationsBody observationTimeStampRangeStart(OffsetDateTime observationTimeStampRangeStart) {
-        this.observationTimeStampRangeStart = observationTimeStampRangeStart;
-        return this;
-    }
-
-    /**
-     * Timestamp range start
-     *
-     * @return observationTimeStampRangeStart
-     **/
-    @Schema(description = "Timestamp range start")
-    public OffsetDateTime getObservationTimeStampRangeStart() {
-        return observationTimeStampRangeStart;
-    }
-
-    public void setObservationTimeStampRangeStart(OffsetDateTime observationTimeStampRangeStart) {
-        this.observationTimeStampRangeStart = observationTimeStampRangeStart;
-    }
-
-    public SearchObservationsBody observationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-        if (this.observationUnitDbIds == null) {
-            this.observationUnitDbIds = new ArrayList<String>();
-        }
-        this.observationUnitDbIds.add(observationUnitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique id of an Observation Unit
-     *
-     * @return observationUnitDbIds
-     **/
-    @Schema(example = "[\"76f559b5\",\"066bc5d3\"]", description = "The unique id of an Observation Unit")
-    public List<String> getObservationUnitDbIds() {
-        return observationUnitDbIds;
-    }
-
-    public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-    }
-
-    public SearchObservationsBody observationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-        if (this.observationVariableDbIds == null) {
-            this.observationVariableDbIds = new ArrayList<String>();
-        }
-        this.observationVariableDbIds.add(observationVariableDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The DbIds of Variables to search for
-     *
-     * @return observationVariableDbIds
-     **/
-    @Schema(example = "[\"a646187d\",\"6d23513b\"]", description = "The DbIds of Variables to search for")
-    public List<String> getObservationVariableDbIds() {
-        return observationVariableDbIds;
-    }
-
-    public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-    }
-
-    public SearchObservationsBody observationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-        return this;
-    }
-
-    public SearchObservationsBody addObservationVariableNamesItem(String observationVariableNamesItem) {
-        if (this.observationVariableNames == null) {
-            this.observationVariableNames = new ArrayList<String>();
-        }
-        this.observationVariableNames.add(observationVariableNamesItem);
-        return this;
-    }
-
-    /**
-     * The names of Variables to search for
-     *
-     * @return observationVariableNames
-     **/
-    @Schema(example = "[\"Plant Height in meters\",\"Wheat rust score 1-5\"]", description = "The names of Variables to search for")
-    public List<String> getObservationVariableNames() {
-        return observationVariableNames;
-    }
-
-    public void setObservationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-    }
-
-    public SearchObservationsBody observationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-        return this;
-    }
-
-    public SearchObservationsBody addObservationVariablePUIsItem(String observationVariablePUIsItem) {
-        if (this.observationVariablePUIs == null) {
-            this.observationVariablePUIs = new ArrayList<String>();
-        }
-        this.observationVariablePUIs.add(observationVariablePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI
-     *
-     * @return observationVariablePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008012\",\"http://my-traits.com/trait/CO_123:0007261\"]", description = "The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI")
-    public List<String> getObservationVariablePUIs() {
-        return observationVariablePUIs;
-    }
-
-    public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-    }
-
-    public SearchObservationsBody page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SearchObservationsBody pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public SearchObservationsBody programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public SearchObservationsBody programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public SearchObservationsBody addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public SearchObservationsBody seasonDbIds(List<String> seasonDbIds) {
-        this.seasonDbIds = seasonDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addSeasonDbIdsItem(String seasonDbIdsItem) {
-        if (this.seasonDbIds == null) {
-            this.seasonDbIds = new ArrayList<String>();
-        }
-        this.seasonDbIds.add(seasonDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The year or Phenotyping campaign of a multi-annual study (trees, grape, ...)
-     *
-     * @return seasonDbIds
-     **/
-    @Schema(example = "[\"Spring 2018\",\"Season A\"]", description = "The year or Phenotyping campaign of a multi-annual study (trees, grape, ...)")
-    public List<String> getSeasonDbIds() {
-        return seasonDbIds;
-    }
-
-    public void setSeasonDbIds(List<String> seasonDbIds) {
-        this.seasonDbIds = seasonDbIds;
-    }
-
-    public SearchObservationsBody studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public SearchObservationsBody studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public SearchObservationsBody addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public SearchObservationsBody trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public SearchObservationsBody trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public SearchObservationsBody addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchObservationsBody searchObservationsBody = (SearchObservationsBody) o;
-        return Objects.equals(this.commonCropNames, searchObservationsBody.commonCropNames) &&
-                Objects.equals(this.externalReferenceIDs, searchObservationsBody.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, searchObservationsBody.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, searchObservationsBody.externalReferenceSources) &&
-                Objects.equals(this.germplasmDbIds, searchObservationsBody.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, searchObservationsBody.germplasmNames) &&
-                Objects.equals(this.locationDbIds, searchObservationsBody.locationDbIds) &&
-                Objects.equals(this.locationNames, searchObservationsBody.locationNames) &&
-                Objects.equals(this.observationDbIds, searchObservationsBody.observationDbIds) &&
-                Objects.equals(this.observationLevelRelationships, searchObservationsBody.observationLevelRelationships) &&
-                Objects.equals(this.observationLevels, searchObservationsBody.observationLevels) &&
-                Objects.equals(this.observationTimeStampRangeEnd, searchObservationsBody.observationTimeStampRangeEnd) &&
-                Objects.equals(this.observationTimeStampRangeStart, searchObservationsBody.observationTimeStampRangeStart) &&
-                Objects.equals(this.observationUnitDbIds, searchObservationsBody.observationUnitDbIds) &&
-                Objects.equals(this.observationVariableDbIds, searchObservationsBody.observationVariableDbIds) &&
-                Objects.equals(this.observationVariableNames, searchObservationsBody.observationVariableNames) &&
-                Objects.equals(this.observationVariablePUIs, searchObservationsBody.observationVariablePUIs) &&
-                Objects.equals(this.page, searchObservationsBody.page) &&
-                Objects.equals(this.pageSize, searchObservationsBody.pageSize) &&
-                Objects.equals(this.programDbIds, searchObservationsBody.programDbIds) &&
-                Objects.equals(this.programNames, searchObservationsBody.programNames) &&
-                Objects.equals(this.seasonDbIds, searchObservationsBody.seasonDbIds) &&
-                Objects.equals(this.studyDbIds, searchObservationsBody.studyDbIds) &&
-                Objects.equals(this.studyNames, searchObservationsBody.studyNames) &&
-                Objects.equals(this.trialDbIds, searchObservationsBody.trialDbIds) &&
-                Objects.equals(this.trialNames, searchObservationsBody.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds, germplasmNames, locationDbIds, locationNames, observationDbIds, observationLevelRelationships, observationLevels, observationTimeStampRangeEnd, observationTimeStampRangeStart, observationUnitDbIds, observationVariableDbIds, observationVariableNames, observationVariablePUIs, page, pageSize, programDbIds, programNames, seasonDbIds, studyDbIds, studyNames, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchObservationsBody {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-        sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-        sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
-        sb.append("    observationLevelRelationships: ").append(toIndentedString(observationLevelRelationships)).append("\n");
-        sb.append("    observationLevels: ").append(toIndentedString(observationLevels)).append("\n");
-        sb.append("    observationTimeStampRangeEnd: ").append(toIndentedString(observationTimeStampRangeEnd)).append("\n");
-        sb.append("    observationTimeStampRangeStart: ").append(toIndentedString(observationTimeStampRangeStart)).append("\n");
-        sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-        sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-        sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
-        sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    seasonDbIds: ").append(toIndentedString(seasonDbIds)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersCommonCropNames.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersCommonCropNames.java
deleted file mode 100644
index ec548d2d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersCommonCropNames.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersCommonCropNames
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class SearchRequestParametersCommonCropNames {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    public SearchRequestParametersCommonCropNames commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public SearchRequestParametersCommonCropNames addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersCommonCropNames searchRequestParametersCommonCropNames = (SearchRequestParametersCommonCropNames) o;
-        return Objects.equals(this.commonCropNames, searchRequestParametersCommonCropNames.commonCropNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersCommonCropNames {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersExternalReferences.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersExternalReferences.java
deleted file mode 100644
index 6e6edbda..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersExternalReferences.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersExternalReferences
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class SearchRequestParametersExternalReferences {
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    public SearchRequestParametersExternalReferences externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public SearchRequestParametersExternalReferences addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public SearchRequestParametersExternalReferences externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public SearchRequestParametersExternalReferences addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public SearchRequestParametersExternalReferences externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public SearchRequestParametersExternalReferences addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersExternalReferences searchRequestParametersExternalReferences = (SearchRequestParametersExternalReferences) o;
-        return Objects.equals(this.externalReferenceIDs, searchRequestParametersExternalReferences.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, searchRequestParametersExternalReferences.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, searchRequestParametersExternalReferences.externalReferenceSources);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(externalReferenceIDs, externalReferenceIds, externalReferenceSources);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersExternalReferences {\n");
-
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersGermplasm.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersGermplasm.java
deleted file mode 100644
index 920d61de..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersGermplasm.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersGermplasm
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class SearchRequestParametersGermplasm {
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    public SearchRequestParametersGermplasm germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersGermplasm addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public SearchRequestParametersGermplasm germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public SearchRequestParametersGermplasm addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersGermplasm searchRequestParametersGermplasm = (SearchRequestParametersGermplasm) o;
-        return Objects.equals(this.germplasmDbIds, searchRequestParametersGermplasm.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, searchRequestParametersGermplasm.germplasmNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(germplasmDbIds, germplasmNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersGermplasm {\n");
-
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersLocations.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersLocations.java
deleted file mode 100644
index 55629e29..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersLocations.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersLocations
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class SearchRequestParametersLocations {
-    @SerializedName("locationDbIds")
-    private List<String> locationDbIds = null;
-
-    @SerializedName("locationNames")
-    private List<String> locationNames = null;
-
-    public SearchRequestParametersLocations locationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersLocations addLocationDbIdsItem(String locationDbIdsItem) {
-        if (this.locationDbIds == null) {
-            this.locationDbIds = new ArrayList<String>();
-        }
-        this.locationDbIds.add(locationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The location ids to search for
-     *
-     * @return locationDbIds
-     **/
-    @Schema(example = "[\"b28911cf\",\"5071d1e4\"]", description = "The location ids to search for")
-    public List<String> getLocationDbIds() {
-        return locationDbIds;
-    }
-
-    public void setLocationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-    }
-
-    public SearchRequestParametersLocations locationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-        return this;
-    }
-
-    public SearchRequestParametersLocations addLocationNamesItem(String locationNamesItem) {
-        if (this.locationNames == null) {
-            this.locationNames = new ArrayList<String>();
-        }
-        this.locationNames.add(locationNamesItem);
-        return this;
-    }
-
-    /**
-     * A human readable names to search for
-     *
-     * @return locationNames
-     **/
-    @Schema(example = "[\"Location Alpha\",\"The Large Hadron Collider\"]", description = "A human readable names to search for")
-    public List<String> getLocationNames() {
-        return locationNames;
-    }
-
-    public void setLocationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersLocations searchRequestParametersLocations = (SearchRequestParametersLocations) o;
-        return Objects.equals(this.locationDbIds, searchRequestParametersLocations.locationDbIds) &&
-                Objects.equals(this.locationNames, searchRequestParametersLocations.locationNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(locationDbIds, locationNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersLocations {\n");
-
-        sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-        sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersObservationVariables.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersObservationVariables.java
deleted file mode 100644
index 7b362c22..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersObservationVariables.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersObservationVariables
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class SearchRequestParametersObservationVariables {
-    @SerializedName("observationVariableDbIds")
-    private List<String> observationVariableDbIds = null;
-
-    @SerializedName("observationVariableNames")
-    private List<String> observationVariableNames = null;
-
-    @SerializedName("observationVariablePUIs")
-    private List<String> observationVariablePUIs = null;
-
-    public SearchRequestParametersObservationVariables observationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersObservationVariables addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-        if (this.observationVariableDbIds == null) {
-            this.observationVariableDbIds = new ArrayList<String>();
-        }
-        this.observationVariableDbIds.add(observationVariableDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The DbIds of Variables to search for
-     *
-     * @return observationVariableDbIds
-     **/
-    @Schema(example = "[\"a646187d\",\"6d23513b\"]", description = "The DbIds of Variables to search for")
-    public List<String> getObservationVariableDbIds() {
-        return observationVariableDbIds;
-    }
-
-    public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-    }
-
-    public SearchRequestParametersObservationVariables observationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-        return this;
-    }
-
-    public SearchRequestParametersObservationVariables addObservationVariableNamesItem(String observationVariableNamesItem) {
-        if (this.observationVariableNames == null) {
-            this.observationVariableNames = new ArrayList<String>();
-        }
-        this.observationVariableNames.add(observationVariableNamesItem);
-        return this;
-    }
-
-    /**
-     * The names of Variables to search for
-     *
-     * @return observationVariableNames
-     **/
-    @Schema(example = "[\"Plant Height in meters\",\"Wheat rust score 1-5\"]", description = "The names of Variables to search for")
-    public List<String> getObservationVariableNames() {
-        return observationVariableNames;
-    }
-
-    public void setObservationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-    }
-
-    public SearchRequestParametersObservationVariables observationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-        return this;
-    }
-
-    public SearchRequestParametersObservationVariables addObservationVariablePUIsItem(String observationVariablePUIsItem) {
-        if (this.observationVariablePUIs == null) {
-            this.observationVariablePUIs = new ArrayList<String>();
-        }
-        this.observationVariablePUIs.add(observationVariablePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI
-     *
-     * @return observationVariablePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008012\",\"http://my-traits.com/trait/CO_123:0007261\"]", description = "The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI")
-    public List<String> getObservationVariablePUIs() {
-        return observationVariablePUIs;
-    }
-
-    public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersObservationVariables searchRequestParametersObservationVariables = (SearchRequestParametersObservationVariables) o;
-        return Objects.equals(this.observationVariableDbIds, searchRequestParametersObservationVariables.observationVariableDbIds) &&
-                Objects.equals(this.observationVariableNames, searchRequestParametersObservationVariables.observationVariableNames) &&
-                Objects.equals(this.observationVariablePUIs, searchRequestParametersObservationVariables.observationVariablePUIs);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(observationVariableDbIds, observationVariableNames, observationVariablePUIs);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersObservationVariables {\n");
-
-        sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-        sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
-        sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersPaging.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersPaging.java
deleted file mode 100644
index 0ce85bf2..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersPaging.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * SearchRequestParametersPaging
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class SearchRequestParametersPaging {
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    public SearchRequestParametersPaging page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SearchRequestParametersPaging pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersPaging searchRequestParametersPaging = (SearchRequestParametersPaging) o;
-        return Objects.equals(this.page, searchRequestParametersPaging.page) &&
-                Objects.equals(this.pageSize, searchRequestParametersPaging.pageSize);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(page, pageSize);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersPaging {\n");
-
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersPrograms.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersPrograms.java
deleted file mode 100644
index 305d4a01..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersPrograms.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersPrograms
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class SearchRequestParametersPrograms {
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    public SearchRequestParametersPrograms programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersPrograms addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public SearchRequestParametersPrograms programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public SearchRequestParametersPrograms addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersPrograms searchRequestParametersPrograms = (SearchRequestParametersPrograms) o;
-        return Objects.equals(this.programDbIds, searchRequestParametersPrograms.programDbIds) &&
-                Objects.equals(this.programNames, searchRequestParametersPrograms.programNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(programDbIds, programNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersPrograms {\n");
-
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersStudies.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersStudies.java
deleted file mode 100644
index 9f6a9dff..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersStudies.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersStudies
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class SearchRequestParametersStudies {
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    public SearchRequestParametersStudies studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersStudies addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public SearchRequestParametersStudies studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public SearchRequestParametersStudies addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersStudies searchRequestParametersStudies = (SearchRequestParametersStudies) o;
-        return Objects.equals(this.studyDbIds, searchRequestParametersStudies.studyDbIds) &&
-                Objects.equals(this.studyNames, searchRequestParametersStudies.studyNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(studyDbIds, studyNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersStudies {\n");
-
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersTokenPaging.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersTokenPaging.java
deleted file mode 100644
index c5d5ce3c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersTokenPaging.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * SearchRequestParametersTokenPaging
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class SearchRequestParametersTokenPaging {
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("pageToken")
-    private String pageToken = null;
-
-    public SearchRequestParametersTokenPaging page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SearchRequestParametersTokenPaging pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public SearchRequestParametersTokenPaging pageToken(String pageToken) {
-        this.pageToken = pageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;Used to request a specific page of data to be returned. &lt;br&gt;Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.
-     *
-     * @return pageToken
-     **/
-    @Schema(example = "33c27874", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>Used to request a specific page of data to be returned. <br>Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively. ")
-    public String getPageToken() {
-        return pageToken;
-    }
-
-    public void setPageToken(String pageToken) {
-        this.pageToken = pageToken;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersTokenPaging searchRequestParametersTokenPaging = (SearchRequestParametersTokenPaging) o;
-        return Objects.equals(this.page, searchRequestParametersTokenPaging.page) &&
-                Objects.equals(this.pageSize, searchRequestParametersTokenPaging.pageSize) &&
-                Objects.equals(this.pageToken, searchRequestParametersTokenPaging.pageToken);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(page, pageSize, pageToken);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersTokenPaging {\n");
-
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    pageToken: ").append(toIndentedString(pageToken)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersTrials.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersTrials.java
deleted file mode 100644
index 9dbc1717..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersTrials.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersTrials
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class SearchRequestParametersTrials {
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public SearchRequestParametersTrials trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersTrials addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public SearchRequestParametersTrials trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public SearchRequestParametersTrials addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersTrials searchRequestParametersTrials = (SearchRequestParametersTrials) o;
-        return Objects.equals(this.trialDbIds, searchRequestParametersTrials.trialDbIds) &&
-                Objects.equals(this.trialNames, searchRequestParametersTrials.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersTrials {\n");
-
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersVariableBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersVariableBaseClass.java
deleted file mode 100644
index 8de17939..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SearchRequestParametersVariableBaseClass.java
+++ /dev/null
@@ -1,1034 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersVariableBaseClass
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class SearchRequestParametersVariableBaseClass {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypesEnum.Adapter.class)
-    public enum DataTypesEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypesEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypesEnum fromValue(String input) {
-            for (DataTypesEnum b : DataTypesEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypesEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypesEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypesEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypesEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataTypes")
-    private List<DataTypesEnum> dataTypes = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("methodDbIds")
-    private List<String> methodDbIds = null;
-
-    @SerializedName("methodNames")
-    private List<String> methodNames = null;
-
-    @SerializedName("methodPUIs")
-    private List<String> methodPUIs = null;
-
-    @SerializedName("ontologyDbIds")
-    private List<String> ontologyDbIds = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("scaleDbIds")
-    private List<String> scaleDbIds = null;
-
-    @SerializedName("scaleNames")
-    private List<String> scaleNames = null;
-
-    @SerializedName("scalePUIs")
-    private List<String> scalePUIs = null;
-
-    @SerializedName("studyDbId")
-    private List<String> studyDbId = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("traitAttributePUIs")
-    private List<String> traitAttributePUIs = null;
-
-    @SerializedName("traitAttributes")
-    private List<String> traitAttributes = null;
-
-    @SerializedName("traitClasses")
-    private List<String> traitClasses = null;
-
-    @SerializedName("traitDbIds")
-    private List<String> traitDbIds = null;
-
-    @SerializedName("traitEntities")
-    private List<String> traitEntities = null;
-
-    @SerializedName("traitEntityPUIs")
-    private List<String> traitEntityPUIs = null;
-
-    @SerializedName("traitNames")
-    private List<String> traitNames = null;
-
-    @SerializedName("traitPUIs")
-    private List<String> traitPUIs = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public SearchRequestParametersVariableBaseClass commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass dataTypes(List<DataTypesEnum> dataTypes) {
-        this.dataTypes = dataTypes;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addDataTypesItem(DataTypesEnum dataTypesItem) {
-        if (this.dataTypes == null) {
-            this.dataTypes = new ArrayList<DataTypesEnum>();
-        }
-        this.dataTypes.add(dataTypesItem);
-        return this;
-    }
-
-    /**
-     * List of scale data types to filter search results
-     *
-     * @return dataTypes
-     **/
-    @Schema(example = "[\"Numerical\",\"Ordinal\",\"Text\"]", description = "List of scale data types to filter search results")
-    public List<DataTypesEnum> getDataTypes() {
-        return dataTypes;
-    }
-
-    public void setDataTypes(List<DataTypesEnum> dataTypes) {
-        this.dataTypes = dataTypes;
-    }
-
-    public SearchRequestParametersVariableBaseClass externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public SearchRequestParametersVariableBaseClass externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public SearchRequestParametersVariableBaseClass methodDbIds(List<String> methodDbIds) {
-        this.methodDbIds = methodDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addMethodDbIdsItem(String methodDbIdsItem) {
-        if (this.methodDbIds == null) {
-            this.methodDbIds = new ArrayList<String>();
-        }
-        this.methodDbIds.add(methodDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of methods to filter search results
-     *
-     * @return methodDbIds
-     **/
-    @Schema(example = "[\"07e34f83\",\"d3d5517a\"]", description = "List of methods to filter search results")
-    public List<String> getMethodDbIds() {
-        return methodDbIds;
-    }
-
-    public void setMethodDbIds(List<String> methodDbIds) {
-        this.methodDbIds = methodDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass methodNames(List<String> methodNames) {
-        this.methodNames = methodNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addMethodNamesItem(String methodNamesItem) {
-        if (this.methodNames == null) {
-            this.methodNames = new ArrayList<String>();
-        }
-        this.methodNames.add(methodNamesItem);
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodNames
-     **/
-    @Schema(example = "[\"Measuring Tape\",\"Spectrometer\"]", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public List<String> getMethodNames() {
-        return methodNames;
-    }
-
-    public void setMethodNames(List<String> methodNames) {
-        this.methodNames = methodNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass methodPUIs(List<String> methodPUIs) {
-        this.methodPUIs = methodPUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addMethodPUIsItem(String methodPUIsItem) {
-        if (this.methodPUIs == null) {
-            this.methodPUIs = new ArrayList<String>();
-        }
-        this.methodPUIs.add(methodPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000212\",\"http://my-traits.com/trait/CO_123:0003557\"]", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public List<String> getMethodPUIs() {
-        return methodPUIs;
-    }
-
-    public void setMethodPUIs(List<String> methodPUIs) {
-        this.methodPUIs = methodPUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass ontologyDbIds(List<String> ontologyDbIds) {
-        this.ontologyDbIds = ontologyDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addOntologyDbIdsItem(String ontologyDbIdsItem) {
-        if (this.ontologyDbIds == null) {
-            this.ontologyDbIds = new ArrayList<String>();
-        }
-        this.ontologyDbIds.add(ontologyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of ontology IDs to search for
-     *
-     * @return ontologyDbIds
-     **/
-    @Schema(example = "[\"f44f7b23\",\"a26b576e\"]", description = "List of ontology IDs to search for")
-    public List<String> getOntologyDbIds() {
-        return ontologyDbIds;
-    }
-
-    public void setOntologyDbIds(List<String> ontologyDbIds) {
-        this.ontologyDbIds = ontologyDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SearchRequestParametersVariableBaseClass pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public SearchRequestParametersVariableBaseClass programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass scaleDbIds(List<String> scaleDbIds) {
-        this.scaleDbIds = scaleDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addScaleDbIdsItem(String scaleDbIdsItem) {
-        if (this.scaleDbIds == null) {
-            this.scaleDbIds = new ArrayList<String>();
-        }
-        this.scaleDbIds.add(scaleDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Scale
-     *
-     * @return scaleDbIds
-     **/
-    @Schema(example = "[\"a13ecffa\",\"7e1afe4f\"]", description = "The unique identifier for a Scale")
-    public List<String> getScaleDbIds() {
-        return scaleDbIds;
-    }
-
-    public void setScaleDbIds(List<String> scaleDbIds) {
-        this.scaleDbIds = scaleDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass scaleNames(List<String> scaleNames) {
-        this.scaleNames = scaleNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addScaleNamesItem(String scaleNamesItem) {
-        if (this.scaleNames == null) {
-            this.scaleNames = new ArrayList<String>();
-        }
-        this.scaleNames.add(scaleNamesItem);
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleNames
-     **/
-    @Schema(example = "[\"Meters\",\"Liters\"]", description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public List<String> getScaleNames() {
-        return scaleNames;
-    }
-
-    public void setScaleNames(List<String> scaleNames) {
-        this.scaleNames = scaleNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass scalePUIs(List<String> scalePUIs) {
-        this.scalePUIs = scalePUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addScalePUIsItem(String scalePUIsItem) {
-        if (this.scalePUIs == null) {
-            this.scalePUIs = new ArrayList<String>();
-        }
-        this.scalePUIs.add(scalePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000336\",\"http://my-traits.com/trait/CO_123:0000560\"]", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public List<String> getScalePUIs() {
-        return scalePUIs;
-    }
-
-    public void setScalePUIs(List<String> scalePUIs) {
-        this.scalePUIs = scalePUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass studyDbId(List<String> studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addStudyDbIdItem(String studyDbIdItem) {
-        if (this.studyDbId == null) {
-            this.studyDbId = new ArrayList<String>();
-        }
-        this.studyDbId.add(studyDbIdItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;studyDbIds&#x60;. Github issue number #483  &lt;br&gt;The unique ID of a studies to filter on
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "[\"5bcac0ae\",\"7f48e22d\"]", description = "**Deprecated in v2.1** Please use `studyDbIds`. Github issue number #483  <br>The unique ID of a studies to filter on")
-    public List<String> getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(List<String> studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public SearchRequestParametersVariableBaseClass studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitAttributePUIs(List<String> traitAttributePUIs) {
-        this.traitAttributePUIs = traitAttributePUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitAttributePUIsItem(String traitAttributePUIsItem) {
-        if (this.traitAttributePUIs == null) {
-            this.traitAttributePUIs = new ArrayList<String>();
-        }
-        this.traitAttributePUIs.add(traitAttributePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return traitAttributePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008336\",\"http://my-traits.com/trait/CO_123:0001092\"]", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public List<String> getTraitAttributePUIs() {
-        return traitAttributePUIs;
-    }
-
-    public void setTraitAttributePUIs(List<String> traitAttributePUIs) {
-        this.traitAttributePUIs = traitAttributePUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitAttributes(List<String> traitAttributes) {
-        this.traitAttributes = traitAttributes;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitAttributesItem(String traitAttributesItem) {
-        if (this.traitAttributes == null) {
-            this.traitAttributes = new ArrayList<String>();
-        }
-        this.traitAttributes.add(traitAttributesItem);
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return traitAttributes
-     **/
-    @Schema(example = "[\"Height\",\"Color\"]", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public List<String> getTraitAttributes() {
-        return traitAttributes;
-    }
-
-    public void setTraitAttributes(List<String> traitAttributes) {
-        this.traitAttributes = traitAttributes;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitClasses(List<String> traitClasses) {
-        this.traitClasses = traitClasses;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitClassesItem(String traitClassesItem) {
-        if (this.traitClasses == null) {
-            this.traitClasses = new ArrayList<String>();
-        }
-        this.traitClasses.add(traitClassesItem);
-        return this;
-    }
-
-    /**
-     * List of trait classes to filter search results
-     *
-     * @return traitClasses
-     **/
-    @Schema(example = "[\"morphological\",\"phenological\",\"agronomical\"]", description = "List of trait classes to filter search results")
-    public List<String> getTraitClasses() {
-        return traitClasses;
-    }
-
-    public void setTraitClasses(List<String> traitClasses) {
-        this.traitClasses = traitClasses;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitDbIds(List<String> traitDbIds) {
-        this.traitDbIds = traitDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitDbIdsItem(String traitDbIdsItem) {
-        if (this.traitDbIds == null) {
-            this.traitDbIds = new ArrayList<String>();
-        }
-        this.traitDbIds.add(traitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Trait
-     *
-     * @return traitDbIds
-     **/
-    @Schema(example = "[\"ef81147b\",\"78d82fad\"]", description = "The unique identifier for a Trait")
-    public List<String> getTraitDbIds() {
-        return traitDbIds;
-    }
-
-    public void setTraitDbIds(List<String> traitDbIds) {
-        this.traitDbIds = traitDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitEntities(List<String> traitEntities) {
-        this.traitEntities = traitEntities;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitEntitiesItem(String traitEntitiesItem) {
-        if (this.traitEntities == null) {
-            this.traitEntities = new ArrayList<String>();
-        }
-        this.traitEntities.add(traitEntitiesItem);
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return traitEntities
-     **/
-    @Schema(example = "[\"Stalk\",\"Root\"]", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public List<String> getTraitEntities() {
-        return traitEntities;
-    }
-
-    public void setTraitEntities(List<String> traitEntities) {
-        this.traitEntities = traitEntities;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitEntityPUIs(List<String> traitEntityPUIs) {
-        this.traitEntityPUIs = traitEntityPUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitEntityPUIsItem(String traitEntityPUIsItem) {
-        if (this.traitEntityPUIs == null) {
-            this.traitEntityPUIs = new ArrayList<String>();
-        }
-        this.traitEntityPUIs.add(traitEntityPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return traitEntityPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0004098\",\"http://my-traits.com/trait/CO_123:0002366\"]", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public List<String> getTraitEntityPUIs() {
-        return traitEntityPUIs;
-    }
-
-    public void setTraitEntityPUIs(List<String> traitEntityPUIs) {
-        this.traitEntityPUIs = traitEntityPUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitNames(List<String> traitNames) {
-        this.traitNames = traitNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitNamesItem(String traitNamesItem) {
-        if (this.traitNames == null) {
-            this.traitNames = new ArrayList<String>();
-        }
-        this.traitNames.add(traitNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitNames
-     **/
-    @Schema(example = "[\"Stalk Height\",\"Root Color\"]", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public List<String> getTraitNames() {
-        return traitNames;
-    }
-
-    public void setTraitNames(List<String> traitNames) {
-        this.traitNames = traitNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitPUIs(List<String> traitPUIs) {
-        this.traitPUIs = traitPUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitPUIsItem(String traitPUIsItem) {
-        if (this.traitPUIs == null) {
-            this.traitPUIs = new ArrayList<String>();
-        }
-        this.traitPUIs.add(traitPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000456\",\"http://my-traits.com/trait/CO_123:0000820\"]", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public List<String> getTraitPUIs() {
-        return traitPUIs;
-    }
-
-    public void setTraitPUIs(List<String> traitPUIs) {
-        this.traitPUIs = traitPUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersVariableBaseClass searchRequestParametersVariableBaseClass = (SearchRequestParametersVariableBaseClass) o;
-        return Objects.equals(this.commonCropNames, searchRequestParametersVariableBaseClass.commonCropNames) &&
-                Objects.equals(this.dataTypes, searchRequestParametersVariableBaseClass.dataTypes) &&
-                Objects.equals(this.externalReferenceIDs, searchRequestParametersVariableBaseClass.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, searchRequestParametersVariableBaseClass.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, searchRequestParametersVariableBaseClass.externalReferenceSources) &&
-                Objects.equals(this.methodDbIds, searchRequestParametersVariableBaseClass.methodDbIds) &&
-                Objects.equals(this.methodNames, searchRequestParametersVariableBaseClass.methodNames) &&
-                Objects.equals(this.methodPUIs, searchRequestParametersVariableBaseClass.methodPUIs) &&
-                Objects.equals(this.ontologyDbIds, searchRequestParametersVariableBaseClass.ontologyDbIds) &&
-                Objects.equals(this.page, searchRequestParametersVariableBaseClass.page) &&
-                Objects.equals(this.pageSize, searchRequestParametersVariableBaseClass.pageSize) &&
-                Objects.equals(this.programDbIds, searchRequestParametersVariableBaseClass.programDbIds) &&
-                Objects.equals(this.programNames, searchRequestParametersVariableBaseClass.programNames) &&
-                Objects.equals(this.scaleDbIds, searchRequestParametersVariableBaseClass.scaleDbIds) &&
-                Objects.equals(this.scaleNames, searchRequestParametersVariableBaseClass.scaleNames) &&
-                Objects.equals(this.scalePUIs, searchRequestParametersVariableBaseClass.scalePUIs) &&
-                Objects.equals(this.studyDbId, searchRequestParametersVariableBaseClass.studyDbId) &&
-                Objects.equals(this.studyDbIds, searchRequestParametersVariableBaseClass.studyDbIds) &&
-                Objects.equals(this.studyNames, searchRequestParametersVariableBaseClass.studyNames) &&
-                Objects.equals(this.traitAttributePUIs, searchRequestParametersVariableBaseClass.traitAttributePUIs) &&
-                Objects.equals(this.traitAttributes, searchRequestParametersVariableBaseClass.traitAttributes) &&
-                Objects.equals(this.traitClasses, searchRequestParametersVariableBaseClass.traitClasses) &&
-                Objects.equals(this.traitDbIds, searchRequestParametersVariableBaseClass.traitDbIds) &&
-                Objects.equals(this.traitEntities, searchRequestParametersVariableBaseClass.traitEntities) &&
-                Objects.equals(this.traitEntityPUIs, searchRequestParametersVariableBaseClass.traitEntityPUIs) &&
-                Objects.equals(this.traitNames, searchRequestParametersVariableBaseClass.traitNames) &&
-                Objects.equals(this.traitPUIs, searchRequestParametersVariableBaseClass.traitPUIs) &&
-                Objects.equals(this.trialDbIds, searchRequestParametersVariableBaseClass.trialDbIds) &&
-                Objects.equals(this.trialNames, searchRequestParametersVariableBaseClass.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, dataTypes, externalReferenceIDs, externalReferenceIds, externalReferenceSources, methodDbIds, methodNames, methodPUIs, ontologyDbIds, page, pageSize, programDbIds, programNames, scaleDbIds, scaleNames, scalePUIs, studyDbId, studyDbIds, studyNames, traitAttributePUIs, traitAttributes, traitClasses, traitDbIds, traitEntities, traitEntityPUIs, traitNames, traitPUIs, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersVariableBaseClass {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    dataTypes: ").append(toIndentedString(dataTypes)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    methodDbIds: ").append(toIndentedString(methodDbIds)).append("\n");
-        sb.append("    methodNames: ").append(toIndentedString(methodNames)).append("\n");
-        sb.append("    methodPUIs: ").append(toIndentedString(methodPUIs)).append("\n");
-        sb.append("    ontologyDbIds: ").append(toIndentedString(ontologyDbIds)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    scaleDbIds: ").append(toIndentedString(scaleDbIds)).append("\n");
-        sb.append("    scaleNames: ").append(toIndentedString(scaleNames)).append("\n");
-        sb.append("    scalePUIs: ").append(toIndentedString(scalePUIs)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    traitAttributePUIs: ").append(toIndentedString(traitAttributePUIs)).append("\n");
-        sb.append("    traitAttributes: ").append(toIndentedString(traitAttributes)).append("\n");
-        sb.append("    traitClasses: ").append(toIndentedString(traitClasses)).append("\n");
-        sb.append("    traitDbIds: ").append(toIndentedString(traitDbIds)).append("\n");
-        sb.append("    traitEntities: ").append(toIndentedString(traitEntities)).append("\n");
-        sb.append("    traitEntityPUIs: ").append(toIndentedString(traitEntityPUIs)).append("\n");
-        sb.append("    traitNames: ").append(toIndentedString(traitNames)).append("\n");
-        sb.append("    traitPUIs: ").append(toIndentedString(traitPUIs)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Season.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Season.java
deleted file mode 100644
index 5d12a64a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Season.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Season
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class Season {
-    @SerializedName("seasonDbId")
-    private String seasonDbId = null;
-
-    @SerializedName("seasonName")
-    private String seasonName = null;
-
-    @SerializedName("year")
-    private Integer year = null;
-
-    public Season seasonDbId(String seasonDbId) {
-        this.seasonDbId = seasonDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a season. For backward compatibility it can be a string like &#x27;2012&#x27;, &#x27;1957-2004&#x27;
-     *
-     * @return seasonDbId
-     **/
-    @Schema(example = "Spring_2018", required = true, description = "The ID which uniquely identifies a season. For backward compatibility it can be a string like '2012', '1957-2004'")
-    public String getSeasonDbId() {
-        return seasonDbId;
-    }
-
-    public void setSeasonDbId(String seasonDbId) {
-        this.seasonDbId = seasonDbId;
-    }
-
-    public Season seasonName(String seasonName) {
-        this.seasonName = seasonName;
-        return this;
-    }
-
-    /**
-     * Name of the season. ex. &#x27;Spring&#x27;, &#x27;Q2&#x27;, &#x27;Season A&#x27;, etc.
-     *
-     * @return seasonName
-     **/
-    @Schema(example = "Spring", description = "Name of the season. ex. 'Spring', 'Q2', 'Season A', etc.")
-    public String getSeasonName() {
-        return seasonName;
-    }
-
-    public void setSeasonName(String seasonName) {
-        this.seasonName = seasonName;
-    }
-
-    public Season year(Integer year) {
-        this.year = year;
-        return this;
-    }
-
-    /**
-     * The 4 digit year of the season.
-     *
-     * @return year
-     **/
-    @Schema(example = "2018", description = "The 4 digit year of the season.")
-    public Integer getYear() {
-        return year;
-    }
-
-    public void setYear(Integer year) {
-        this.year = year;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Season season = (Season) o;
-        return Objects.equals(this.seasonDbId, season.seasonDbId) &&
-                Objects.equals(this.seasonName, season.seasonName) &&
-                Objects.equals(this.year, season.year);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(seasonDbId, seasonName, year);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Season {\n");
-
-        sb.append("    seasonDbId: ").append(toIndentedString(seasonDbId)).append("\n");
-        sb.append("    seasonName: ").append(toIndentedString(seasonName)).append("\n");
-        sb.append("    year: ").append(toIndentedString(year)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SeasonListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SeasonListResponse.java
deleted file mode 100644
index e1de0e37..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SeasonListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * SeasonListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class SeasonListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private SeasonListResponseResult result = null;
-
-    public SeasonListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public SeasonListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public SeasonListResponse result(SeasonListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public SeasonListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(SeasonListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SeasonListResponse seasonListResponse = (SeasonListResponse) o;
-        return Objects.equals(this._atContext, seasonListResponse._atContext) &&
-                Objects.equals(this.metadata, seasonListResponse.metadata) &&
-                Objects.equals(this.result, seasonListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SeasonListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SeasonListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SeasonListResponseResult.java
deleted file mode 100644
index c02dfd08..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SeasonListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SeasonListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class SeasonListResponseResult {
-    @SerializedName("data")
-    private List<Season> data = new ArrayList<Season>();
-
-    public SeasonListResponseResult data(List<Season> data) {
-        this.data = data;
-        return this;
-    }
-
-    public SeasonListResponseResult addDataItem(Season dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Season> getData() {
-        return data;
-    }
-
-    public void setData(List<Season> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SeasonListResponseResult seasonListResponseResult = (SeasonListResponseResult) o;
-        return Objects.equals(this.data, seasonListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SeasonListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SeasonObs.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SeasonObs.java
deleted file mode 100644
index 32cdddca..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SeasonObs.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * SeasonObs
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SeasonObs {
-    @SerializedName("season")
-    private String season = null;
-
-    @SerializedName("seasonDbId")
-    private String seasonDbId = null;
-
-    @SerializedName("seasonName")
-    private String seasonName = null;
-
-    @SerializedName("year")
-    private Integer year = null;
-
-    public SeasonObs season(String season) {
-        this.season = season;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;seasonName&#x60;. Github issue number #456  &lt;br&gt;Name of the season. ex. &#x27;Spring&#x27;, &#x27;Q2&#x27;, &#x27;Season A&#x27;, etc.
-     *
-     * @return season
-     **/
-    @Schema(example = "Spring", description = "**Deprecated in v2.1** Please use `seasonName`. Github issue number #456  <br>Name of the season. ex. 'Spring', 'Q2', 'Season A', etc.")
-    public String getSeason() {
-        return season;
-    }
-
-    public void setSeason(String season) {
-        this.season = season;
-    }
-
-    public SeasonObs seasonDbId(String seasonDbId) {
-        this.seasonDbId = seasonDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a season. For backward compatibility it can be a string like &#x27;2012&#x27;, &#x27;1957-2004&#x27;
-     *
-     * @return seasonDbId
-     **/
-    @Schema(example = "Spring_2018", required = true, description = "The ID which uniquely identifies a season. For backward compatibility it can be a string like '2012', '1957-2004'")
-    public String getSeasonDbId() {
-        return seasonDbId;
-    }
-
-    public void setSeasonDbId(String seasonDbId) {
-        this.seasonDbId = seasonDbId;
-    }
-
-    public SeasonObs seasonName(String seasonName) {
-        this.seasonName = seasonName;
-        return this;
-    }
-
-    /**
-     * Name of the season. ex. &#x27;Spring&#x27;, &#x27;Q2&#x27;, &#x27;Season A&#x27;, etc.
-     *
-     * @return seasonName
-     **/
-    @Schema(example = "Spring", description = "Name of the season. ex. 'Spring', 'Q2', 'Season A', etc.")
-    public String getSeasonName() {
-        return seasonName;
-    }
-
-    public void setSeasonName(String seasonName) {
-        this.seasonName = seasonName;
-    }
-
-    public SeasonObs year(Integer year) {
-        this.year = year;
-        return this;
-    }
-
-    /**
-     * The 4 digit year of the season.
-     *
-     * @return year
-     **/
-    @Schema(example = "2018", description = "The 4 digit year of the season.")
-    public Integer getYear() {
-        return year;
-    }
-
-    public void setYear(Integer year) {
-        this.year = year;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SeasonObs seasonObs = (SeasonObs) o;
-        return Objects.equals(this.season, seasonObs.season) &&
-                Objects.equals(this.seasonDbId, seasonObs.seasonDbId) &&
-                Objects.equals(this.seasonName, seasonObs.seasonName) &&
-                Objects.equals(this.year, seasonObs.year);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(season, seasonDbId, seasonName, year);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SeasonObs {\n");
-
-        sb.append("    season: ").append(toIndentedString(season)).append("\n");
-        sb.append("    seasonDbId: ").append(toIndentedString(seasonDbId)).append("\n");
-        sb.append("    seasonName: ").append(toIndentedString(seasonName)).append("\n");
-        sb.append("    year: ").append(toIndentedString(year)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SeasonSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SeasonSingleResponse.java
deleted file mode 100644
index 7e3f482e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/SeasonSingleResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * SeasonSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class SeasonSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Season result = null;
-
-    public SeasonSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public SeasonSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public SeasonSingleResponse result(Season result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Season getResult() {
-        return result;
-    }
-
-    public void setResult(Season result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SeasonSingleResponse seasonSingleResponse = (SeasonSingleResponse) o;
-        return Objects.equals(this._atContext, seasonSingleResponse._atContext) &&
-                Objects.equals(this.metadata, seasonSingleResponse.metadata) &&
-                Objects.equals(this.result, seasonSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SeasonSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ServerInfo.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ServerInfo.java
deleted file mode 100644
index f0d0dd52..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ServerInfo.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ServerInfo
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ServerInfo {
-    @SerializedName("calls")
-    private List<Service> calls = new ArrayList<Service>();
-
-    @SerializedName("contactEmail")
-    private String contactEmail = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("location")
-    private String location = null;
-
-    @SerializedName("organizationName")
-    private String organizationName = null;
-
-    @SerializedName("organizationURL")
-    private String organizationURL = null;
-
-    @SerializedName("serverDescription")
-    private String serverDescription = null;
-
-    @SerializedName("serverName")
-    private String serverName = null;
-
-    public ServerInfo calls(List<Service> calls) {
-        this.calls = calls;
-        return this;
-    }
-
-    public ServerInfo addCallsItem(Service callsItem) {
-        this.calls.add(callsItem);
-        return this;
-    }
-
-    /**
-     * Array of available calls on this server
-     *
-     * @return calls
-     **/
-    @Schema(required = true, description = "Array of available calls on this server")
-    public List<Service> getCalls() {
-        return calls;
-    }
-
-    public void setCalls(List<Service> calls) {
-        this.calls = calls;
-    }
-
-    public ServerInfo contactEmail(String contactEmail) {
-        this.contactEmail = contactEmail;
-        return this;
-    }
-
-    /**
-     * A contact email address for this server management
-     *
-     * @return contactEmail
-     **/
-    @Schema(example = "contact@institute.org", description = "A contact email address for this server management")
-    public String getContactEmail() {
-        return contactEmail;
-    }
-
-    public void setContactEmail(String contactEmail) {
-        this.contactEmail = contactEmail;
-    }
-
-    public ServerInfo documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "institute.org/server", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public ServerInfo location(String location) {
-        this.location = location;
-        return this;
-    }
-
-    /**
-     * Physical location of this server (ie. City, Country)
-     *
-     * @return location
-     **/
-    @Schema(example = "USA", description = "Physical location of this server (ie. City, Country)")
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public ServerInfo organizationName(String organizationName) {
-        this.organizationName = organizationName;
-        return this;
-    }
-
-    /**
-     * The name of the organization that manages this server and data
-     *
-     * @return organizationName
-     **/
-    @Schema(example = "The Institute", description = "The name of the organization that manages this server and data")
-    public String getOrganizationName() {
-        return organizationName;
-    }
-
-    public void setOrganizationName(String organizationName) {
-        this.organizationName = organizationName;
-    }
-
-    public ServerInfo organizationURL(String organizationURL) {
-        this.organizationURL = organizationURL;
-        return this;
-    }
-
-    /**
-     * The URL of the organization that manages this server and data
-     *
-     * @return organizationURL
-     **/
-    @Schema(example = "institute.org/home", description = "The URL of the organization that manages this server and data")
-    public String getOrganizationURL() {
-        return organizationURL;
-    }
-
-    public void setOrganizationURL(String organizationURL) {
-        this.organizationURL = organizationURL;
-    }
-
-    public ServerInfo serverDescription(String serverDescription) {
-        this.serverDescription = serverDescription;
-        return this;
-    }
-
-    /**
-     * A description of this server
-     *
-     * @return serverDescription
-     **/
-    @Schema(example = "The BrAPI Test Server Web Server - Apache Tomcat 7.0.32 Database - Postgres 10 Supported BrAPI Version - V2.0", description = "A description of this server")
-    public String getServerDescription() {
-        return serverDescription;
-    }
-
-    public void setServerDescription(String serverDescription) {
-        this.serverDescription = serverDescription;
-    }
-
-    public ServerInfo serverName(String serverName) {
-        this.serverName = serverName;
-        return this;
-    }
-
-    /**
-     * The name of this server
-     *
-     * @return serverName
-     **/
-    @Schema(example = "The BrAPI Test Server", description = "The name of this server")
-    public String getServerName() {
-        return serverName;
-    }
-
-    public void setServerName(String serverName) {
-        this.serverName = serverName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ServerInfo serverInfo = (ServerInfo) o;
-        return Objects.equals(this.calls, serverInfo.calls) &&
-                Objects.equals(this.contactEmail, serverInfo.contactEmail) &&
-                Objects.equals(this.documentationURL, serverInfo.documentationURL) &&
-                Objects.equals(this.location, serverInfo.location) &&
-                Objects.equals(this.organizationName, serverInfo.organizationName) &&
-                Objects.equals(this.organizationURL, serverInfo.organizationURL) &&
-                Objects.equals(this.serverDescription, serverInfo.serverDescription) &&
-                Objects.equals(this.serverName, serverInfo.serverName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(calls, contactEmail, documentationURL, location, organizationName, organizationURL, serverDescription, serverName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ServerInfo {\n");
-
-        sb.append("    calls: ").append(toIndentedString(calls)).append("\n");
-        sb.append("    contactEmail: ").append(toIndentedString(contactEmail)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    location: ").append(toIndentedString(location)).append("\n");
-        sb.append("    organizationName: ").append(toIndentedString(organizationName)).append("\n");
-        sb.append("    organizationURL: ").append(toIndentedString(organizationURL)).append("\n");
-        sb.append("    serverDescription: ").append(toIndentedString(serverDescription)).append("\n");
-        sb.append("    serverName: ").append(toIndentedString(serverName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ServerInfoResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ServerInfoResponse.java
deleted file mode 100644
index 9965c3d8..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/ServerInfoResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ServerInfoResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class ServerInfoResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ServerInfo result = null;
-
-    public ServerInfoResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ServerInfoResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ServerInfoResponse result(ServerInfo result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ServerInfo getResult() {
-        return result;
-    }
-
-    public void setResult(ServerInfo result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ServerInfoResponse serverInfoResponse = (ServerInfoResponse) o;
-        return Objects.equals(this._atContext, serverInfoResponse._atContext) &&
-                Objects.equals(this.metadata, serverInfoResponse.metadata) &&
-                Objects.equals(this.result, serverInfoResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ServerInfoResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Service.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Service.java
deleted file mode 100644
index 4e2f3c5a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Service.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Service
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class Service {
-    @SerializedName("contentTypes")
-    private List<ContentTypes> contentTypes = null;
-
-    @SerializedName("dataTypes")
-    private List<ContentTypes> dataTypes = null;
-
-    /**
-     * Gets or Sets methods
-     */
-    @JsonAdapter(MethodsEnum.Adapter.class)
-    public enum MethodsEnum {
-        GET("GET"),
-        POST("POST"),
-        PUT("PUT"),
-        DELETE("DELETE");
-
-        private String value;
-
-        MethodsEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static MethodsEnum fromValue(String input) {
-            for (MethodsEnum b : MethodsEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<MethodsEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final MethodsEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public MethodsEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return MethodsEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("methods")
-    private List<MethodsEnum> methods = new ArrayList<MethodsEnum>();
-
-    @SerializedName("service")
-    private String service = null;
-
-    /**
-     * Gets or Sets versions
-     */
-    @JsonAdapter(VersionsEnum.Adapter.class)
-    public enum VersionsEnum {
-        _0("2.0"),
-        _1("2.1"),
-        _2("2.2");
-
-        private String value;
-
-        VersionsEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static VersionsEnum fromValue(String input) {
-            for (VersionsEnum b : VersionsEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<VersionsEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final VersionsEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public VersionsEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return VersionsEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("versions")
-    private List<VersionsEnum> versions = new ArrayList<VersionsEnum>();
-
-    public Service contentTypes(List<ContentTypes> contentTypes) {
-        this.contentTypes = contentTypes;
-        return this;
-    }
-
-    public Service addContentTypesItem(ContentTypes contentTypesItem) {
-        if (this.contentTypes == null) {
-            this.contentTypes = new ArrayList<ContentTypes>();
-        }
-        this.contentTypes.add(contentTypesItem);
-        return this;
-    }
-
-    /**
-     * The possible content types returned by the service endpoint
-     *
-     * @return contentTypes
-     **/
-    @Schema(example = "[\"application/json\"]", description = "The possible content types returned by the service endpoint")
-    public List<ContentTypes> getContentTypes() {
-        return contentTypes;
-    }
-
-    public void setContentTypes(List<ContentTypes> contentTypes) {
-        this.contentTypes = contentTypes;
-    }
-
-    public Service dataTypes(List<ContentTypes> dataTypes) {
-        this.dataTypes = dataTypes;
-        return this;
-    }
-
-    public Service addDataTypesItem(ContentTypes dataTypesItem) {
-        if (this.dataTypes == null) {
-            this.dataTypes = new ArrayList<ContentTypes>();
-        }
-        this.dataTypes.add(dataTypesItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;contentTypes&#x60;. Github issue number #443  &lt;br/&gt;The possible data formats returned by the available call
-     *
-     * @return dataTypes
-     **/
-    @Schema(example = "[\"application/json\"]", description = "**Deprecated in v2.1** Please use `contentTypes`. Github issue number #443  <br/>The possible data formats returned by the available call ")
-    public List<ContentTypes> getDataTypes() {
-        return dataTypes;
-    }
-
-    public void setDataTypes(List<ContentTypes> dataTypes) {
-        this.dataTypes = dataTypes;
-    }
-
-    public Service methods(List<MethodsEnum> methods) {
-        this.methods = methods;
-        return this;
-    }
-
-    public Service addMethodsItem(MethodsEnum methodsItem) {
-        this.methods.add(methodsItem);
-        return this;
-    }
-
-    /**
-     * The possible HTTP Methods to be used with the available call
-     *
-     * @return methods
-     **/
-    @Schema(example = "[\"GET\",\"POST\"]", required = true, description = "The possible HTTP Methods to be used with the available call")
-    public List<MethodsEnum> getMethods() {
-        return methods;
-    }
-
-    public void setMethods(List<MethodsEnum> methods) {
-        this.methods = methods;
-    }
-
-    public Service service(String service) {
-        this.service = service;
-        return this;
-    }
-
-    /**
-     * The name of the available call as recorded in the documentation
-     *
-     * @return service
-     **/
-    @Schema(example = "germplasm/{germplasmDbId}/pedigree", required = true, description = "The name of the available call as recorded in the documentation")
-    public String getService() {
-        return service;
-    }
-
-    public void setService(String service) {
-        this.service = service;
-    }
-
-    public Service versions(List<VersionsEnum> versions) {
-        this.versions = versions;
-        return this;
-    }
-
-    public Service addVersionsItem(VersionsEnum versionsItem) {
-        this.versions.add(versionsItem);
-        return this;
-    }
-
-    /**
-     * The supported versions of a particular call
-     *
-     * @return versions
-     **/
-    @Schema(example = "[\"2.0\",\"2.1\"]", required = true, description = "The supported versions of a particular call")
-    public List<VersionsEnum> getVersions() {
-        return versions;
-    }
-
-    public void setVersions(List<VersionsEnum> versions) {
-        this.versions = versions;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Service service = (Service) o;
-        return Objects.equals(this.contentTypes, service.contentTypes) &&
-                Objects.equals(this.dataTypes, service.dataTypes) &&
-                Objects.equals(this.methods, service.methods) &&
-                Objects.equals(this.service, service.service) &&
-                Objects.equals(this.versions, service.versions);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(contentTypes, dataTypes, methods, service, versions);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Service {\n");
-
-        sb.append("    contentTypes: ").append(toIndentedString(contentTypes)).append("\n");
-        sb.append("    dataTypes: ").append(toIndentedString(dataTypes)).append("\n");
-        sb.append("    methods: ").append(toIndentedString(methods)).append("\n");
-        sb.append("    service: ").append(toIndentedString(service)).append("\n");
-        sb.append("    versions: ").append(toIndentedString(versions)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Status.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Status.java
deleted file mode 100644
index ccb8ed1e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Status.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * An array of status messages to convey technical logging information from the server to the client.
- */
-@Schema(description = "An array of status messages to convey technical logging information from the server to the client.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class Status {
-    @SerializedName("message")
-    private String message = null;
-
-    /**
-     * The logging level for the attached message
-     */
-    @JsonAdapter(MessageTypeEnum.Adapter.class)
-    public enum MessageTypeEnum {
-        DEBUG("DEBUG"),
-        ERROR("ERROR"),
-        WARNING("WARNING"),
-        INFO("INFO");
-
-        private String value;
-
-        MessageTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static MessageTypeEnum fromValue(String input) {
-            for (MessageTypeEnum b : MessageTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<MessageTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final MessageTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public MessageTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return MessageTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("messageType")
-    private MessageTypeEnum messageType = null;
-
-    public Status message(String message) {
-        this.message = message;
-        return this;
-    }
-
-    /**
-     * A short message concerning the status of this request/response
-     *
-     * @return message
-     **/
-    @Schema(example = "Request accepted, response successful", required = true, description = "A short message concerning the status of this request/response")
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public Status messageType(MessageTypeEnum messageType) {
-        this.messageType = messageType;
-        return this;
-    }
-
-    /**
-     * The logging level for the attached message
-     *
-     * @return messageType
-     **/
-    @Schema(example = "INFO", required = true, description = "The logging level for the attached message")
-    public MessageTypeEnum getMessageType() {
-        return messageType;
-    }
-
-    public void setMessageType(MessageTypeEnum messageType) {
-        this.messageType = messageType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Status status = (Status) o;
-        return Objects.equals(this.message, status.message) &&
-                Objects.equals(this.messageType, status.messageType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(message, messageType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Status {\n");
-
-        sb.append("    message: ").append(toIndentedString(message)).append("\n");
-        sb.append("    messageType: ").append(toIndentedString(messageType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Study.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Study.java
deleted file mode 100644
index 927c2aaf..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Study.java
+++ /dev/null
@@ -1,825 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * Study
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class Study {
-    @SerializedName("active")
-    private Boolean active = null;
-
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("contacts")
-    private List<StudyContacts> contacts = null;
-
-    @SerializedName("culturalPractices")
-    private String culturalPractices = null;
-
-    @SerializedName("dataLinks")
-    private List<StudyDataLinks> dataLinks = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("endDate")
-    private OffsetDateTime endDate = null;
-
-    @SerializedName("environmentParameters")
-    private List<StudyEnvironmentParameters> environmentParameters = null;
-
-    @SerializedName("experimentalDesign")
-    private StudyExperimentalDesign experimentalDesign = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("growthFacility")
-    private StudyGrowthFacility growthFacility = null;
-
-    @SerializedName("lastUpdate")
-    private StudyLastUpdate lastUpdate = null;
-
-    @SerializedName("license")
-    private String license = null;
-
-    @SerializedName("locationDbId")
-    private String locationDbId = null;
-
-    @SerializedName("locationName")
-    private String locationName = null;
-
-    @SerializedName("observationLevels")
-    private List<ObservationUnitHierarchyLevel1> observationLevels = null;
-
-    @SerializedName("observationUnitsDescription")
-    private String observationUnitsDescription = null;
-
-    @SerializedName("observationVariableDbIds")
-    private List<String> observationVariableDbIds = null;
-
-    @SerializedName("seasons")
-    private List<String> seasons = null;
-
-    @SerializedName("startDate")
-    private OffsetDateTime startDate = null;
-
-    @SerializedName("studyCode")
-    private String studyCode = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("studyDescription")
-    private String studyDescription = null;
-
-    @SerializedName("studyName")
-    private String studyName = null;
-
-    @SerializedName("studyPUI")
-    private String studyPUI = null;
-
-    @SerializedName("studyType")
-    private String studyType = null;
-
-    @SerializedName("trialDbId")
-    private String trialDbId = null;
-
-    @SerializedName("trialName")
-    private String trialName = null;
-
-    public Study active(Boolean active) {
-        this.active = active;
-        return this;
-    }
-
-    /**
-     * A flag to indicate if a Study is currently active and ongoing
-     *
-     * @return active
-     **/
-    @Schema(example = "true", description = "A flag to indicate if a Study is currently active and ongoing")
-    public Boolean isActive() {
-        return active;
-    }
-
-    public void setActive(Boolean active) {
-        this.active = active;
-    }
-
-    public Study additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Study putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Study commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Common name for the crop associated with this study
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Grape", description = "Common name for the crop associated with this study")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public Study contacts(List<StudyContacts> contacts) {
-        this.contacts = contacts;
-        return this;
-    }
-
-    public Study addContactsItem(StudyContacts contactsItem) {
-        if (this.contacts == null) {
-            this.contacts = new ArrayList<StudyContacts>();
-        }
-        this.contacts.add(contactsItem);
-        return this;
-    }
-
-    /**
-     * List of contact entities associated with this study
-     *
-     * @return contacts
-     **/
-    @Schema(description = "List of contact entities associated with this study")
-    public List<StudyContacts> getContacts() {
-        return contacts;
-    }
-
-    public void setContacts(List<StudyContacts> contacts) {
-        this.contacts = contacts;
-    }
-
-    public Study culturalPractices(String culturalPractices) {
-        this.culturalPractices = culturalPractices;
-        return this;
-    }
-
-    /**
-     * MIAPPE V1.1 (DM-28) Cultural practices - General description of the cultural practices of the study.
-     *
-     * @return culturalPractices
-     **/
-    @Schema(example = "Irrigation was applied according needs during summer to prevent water stress.", description = "MIAPPE V1.1 (DM-28) Cultural practices - General description of the cultural practices of the study.")
-    public String getCulturalPractices() {
-        return culturalPractices;
-    }
-
-    public void setCulturalPractices(String culturalPractices) {
-        this.culturalPractices = culturalPractices;
-    }
-
-    public Study dataLinks(List<StudyDataLinks> dataLinks) {
-        this.dataLinks = dataLinks;
-        return this;
-    }
-
-    public Study addDataLinksItem(StudyDataLinks dataLinksItem) {
-        if (this.dataLinks == null) {
-            this.dataLinks = new ArrayList<StudyDataLinks>();
-        }
-        this.dataLinks.add(dataLinksItem);
-        return this;
-    }
-
-    /**
-     * List of links to extra data files associated with this study. Extra data could include notes, images, and reference data.
-     *
-     * @return dataLinks
-     **/
-    @Schema(description = "List of links to extra data files associated with this study. Extra data could include notes, images, and reference data.")
-    public List<StudyDataLinks> getDataLinks() {
-        return dataLinks;
-    }
-
-    public void setDataLinks(List<StudyDataLinks> dataLinks) {
-        this.dataLinks = dataLinks;
-    }
-
-    public Study documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public Study endDate(OffsetDateTime endDate) {
-        this.endDate = endDate;
-        return this;
-    }
-
-    /**
-     * The date the study ends  MIAPPE V1.1 (DM-15) End date of study - Date and, if relevant, time when the experiment ended
-     *
-     * @return endDate
-     **/
-    @Schema(description = "The date the study ends  MIAPPE V1.1 (DM-15) End date of study - Date and, if relevant, time when the experiment ended")
-    public OffsetDateTime getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(OffsetDateTime endDate) {
-        this.endDate = endDate;
-    }
-
-    public Study environmentParameters(List<StudyEnvironmentParameters> environmentParameters) {
-        this.environmentParameters = environmentParameters;
-        return this;
-    }
-
-    public Study addEnvironmentParametersItem(StudyEnvironmentParameters environmentParametersItem) {
-        if (this.environmentParameters == null) {
-            this.environmentParameters = new ArrayList<StudyEnvironmentParameters>();
-        }
-        this.environmentParameters.add(environmentParametersItem);
-        return this;
-    }
-
-    /**
-     * Environmental parameters that were kept constant throughout the study and did not change between observation units.  MIAPPE V1.1 (DM-57) Environment - Environmental parameters that were kept constant throughout the study and did not change between observation units or assays. Environment characteristics that vary over time, i.e. environmental variables, should be recorded as Observed Variables (see below).
-     *
-     * @return environmentParameters
-     **/
-    @Schema(description = "Environmental parameters that were kept constant throughout the study and did not change between observation units.  MIAPPE V1.1 (DM-57) Environment - Environmental parameters that were kept constant throughout the study and did not change between observation units or assays. Environment characteristics that vary over time, i.e. environmental variables, should be recorded as Observed Variables (see below).")
-    public List<StudyEnvironmentParameters> getEnvironmentParameters() {
-        return environmentParameters;
-    }
-
-    public void setEnvironmentParameters(List<StudyEnvironmentParameters> environmentParameters) {
-        this.environmentParameters = environmentParameters;
-    }
-
-    public Study experimentalDesign(StudyExperimentalDesign experimentalDesign) {
-        this.experimentalDesign = experimentalDesign;
-        return this;
-    }
-
-    /**
-     * Get experimentalDesign
-     *
-     * @return experimentalDesign
-     **/
-    @Schema(description = "")
-    public StudyExperimentalDesign getExperimentalDesign() {
-        return experimentalDesign;
-    }
-
-    public void setExperimentalDesign(StudyExperimentalDesign experimentalDesign) {
-        this.experimentalDesign = experimentalDesign;
-    }
-
-    public Study externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Study addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Study growthFacility(StudyGrowthFacility growthFacility) {
-        this.growthFacility = growthFacility;
-        return this;
-    }
-
-    /**
-     * Get growthFacility
-     *
-     * @return growthFacility
-     **/
-    @Schema(description = "")
-    public StudyGrowthFacility getGrowthFacility() {
-        return growthFacility;
-    }
-
-    public void setGrowthFacility(StudyGrowthFacility growthFacility) {
-        this.growthFacility = growthFacility;
-    }
-
-    public Study lastUpdate(StudyLastUpdate lastUpdate) {
-        this.lastUpdate = lastUpdate;
-        return this;
-    }
-
-    /**
-     * Get lastUpdate
-     *
-     * @return lastUpdate
-     **/
-    @Schema(description = "")
-    public StudyLastUpdate getLastUpdate() {
-        return lastUpdate;
-    }
-
-    public void setLastUpdate(StudyLastUpdate lastUpdate) {
-        this.lastUpdate = lastUpdate;
-    }
-
-    public Study license(String license) {
-        this.license = license;
-        return this;
-    }
-
-    /**
-     * The usage license associated with the study data
-     *
-     * @return license
-     **/
-    @Schema(example = "MIT License", description = "The usage license associated with the study data")
-    public String getLicense() {
-        return license;
-    }
-
-    public void setLicense(String license) {
-        this.license = license;
-    }
-
-    public Study locationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Location
-     *
-     * @return locationDbId
-     **/
-    @Schema(example = "3cfdd67d", description = "The unique identifier for a Location")
-    public String getLocationDbId() {
-        return locationDbId;
-    }
-
-    public void setLocationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-    }
-
-    public Study locationName(String locationName) {
-        this.locationName = locationName;
-        return this;
-    }
-
-    /**
-     * A human readable name for this location  MIAPPE V1.1 (DM-18) Experimental site name - The name of the natural site, experimental field, greenhouse, phenotyping facility, etc. where the experiment took place.
-     *
-     * @return locationName
-     **/
-    @Schema(example = "Location 1", description = "A human readable name for this location  MIAPPE V1.1 (DM-18) Experimental site name - The name of the natural site, experimental field, greenhouse, phenotyping facility, etc. where the experiment took place.")
-    public String getLocationName() {
-        return locationName;
-    }
-
-    public void setLocationName(String locationName) {
-        this.locationName = locationName;
-    }
-
-    public Study observationLevels(List<ObservationUnitHierarchyLevel1> observationLevels) {
-        this.observationLevels = observationLevels;
-        return this;
-    }
-
-    public Study addObservationLevelsItem(ObservationUnitHierarchyLevel1 observationLevelsItem) {
-        if (this.observationLevels == null) {
-            this.observationLevels = new ArrayList<ObservationUnitHierarchyLevel1>();
-        }
-        this.observationLevels.add(observationLevelsItem);
-        return this;
-    }
-
-    /**
-     * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60; defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are at the bottom of the hierarchy (ie plant &gt; 6).
-     *
-     * @return observationLevels
-     **/
-    @Schema(example = "[{\"levelName\":\"field\",\"levelOrder\":0},{\"levelName\":\"block\",\"levelOrder\":1},{\"levelName\":\"plot\",\"levelOrder\":2}]", description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName` defines the level, `levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are at the bottom of the hierarchy (ie plant > 6). ")
-    public List<ObservationUnitHierarchyLevel1> getObservationLevels() {
-        return observationLevels;
-    }
-
-    public void setObservationLevels(List<ObservationUnitHierarchyLevel1> observationLevels) {
-        this.observationLevels = observationLevels;
-    }
-
-    public Study observationUnitsDescription(String observationUnitsDescription) {
-        this.observationUnitsDescription = observationUnitsDescription;
-        return this;
-    }
-
-    /**
-     * MIAPPE V1.1 (DM-25) Observation unit description - General description of the observation units in the study.
-     *
-     * @return observationUnitsDescription
-     **/
-    @Schema(example = "Observation units consisted in individual plots themselves consisting of a row of 15 plants at a density of approximately six plants per square meter.", description = "MIAPPE V1.1 (DM-25) Observation unit description - General description of the observation units in the study.")
-    public String getObservationUnitsDescription() {
-        return observationUnitsDescription;
-    }
-
-    public void setObservationUnitsDescription(String observationUnitsDescription) {
-        this.observationUnitsDescription = observationUnitsDescription;
-    }
-
-    public Study observationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-        return this;
-    }
-
-    public Study addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-        if (this.observationVariableDbIds == null) {
-            this.observationVariableDbIds = new ArrayList<String>();
-        }
-        this.observationVariableDbIds.add(observationVariableDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The list of Observation Variables being used in this study.   This list is intended to be the wishlist of variables to collect in this study. It may or may not match the set of variables used in the collected observation records.
-     *
-     * @return observationVariableDbIds
-     **/
-    @Schema(example = "[\"57c236f9\",\"48b327ea\",\"a5b367c5\"]", description = "The list of Observation Variables being used in this study.   This list is intended to be the wishlist of variables to collect in this study. It may or may not match the set of variables used in the collected observation records. ")
-    public List<String> getObservationVariableDbIds() {
-        return observationVariableDbIds;
-    }
-
-    public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-    }
-
-    public Study seasons(List<String> seasons) {
-        this.seasons = seasons;
-        return this;
-    }
-
-    public Study addSeasonsItem(String seasonsItem) {
-        if (this.seasons == null) {
-            this.seasons = new ArrayList<String>();
-        }
-        this.seasons.add(seasonsItem);
-        return this;
-    }
-
-    /**
-     * List of seasons over which this study was performed.
-     *
-     * @return seasons
-     **/
-    @Schema(example = "[\"Spring_2018\"]", description = "List of seasons over which this study was performed.")
-    public List<String> getSeasons() {
-        return seasons;
-    }
-
-    public void setSeasons(List<String> seasons) {
-        this.seasons = seasons;
-    }
-
-    public Study startDate(OffsetDateTime startDate) {
-        this.startDate = startDate;
-        return this;
-    }
-
-    /**
-     * The date this study started  MIAPPE V1.1 (DM-14) Start date of study - Date and, if relevant, time when the experiment started
-     *
-     * @return startDate
-     **/
-    @Schema(description = "The date this study started  MIAPPE V1.1 (DM-14) Start date of study - Date and, if relevant, time when the experiment started")
-    public OffsetDateTime getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(OffsetDateTime startDate) {
-        this.startDate = startDate;
-    }
-
-    public Study studyCode(String studyCode) {
-        this.studyCode = studyCode;
-        return this;
-    }
-
-    /**
-     * A short human readable code for a study
-     *
-     * @return studyCode
-     **/
-    @Schema(example = "Grape_Yield_Spring_2018", description = "A short human readable code for a study")
-    public String getStudyCode() {
-        return studyCode;
-    }
-
-    public void setStudyCode(String studyCode) {
-        this.studyCode = studyCode;
-    }
-
-    public Study studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a study within the given database server  MIAPPE V1.1 (DM-11) Study unique ID - Unique identifier comprising the name or identifier for the institution/database hosting the submission of the study data, and the identifier of the study in that institution.
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "175ac75a", description = "The ID which uniquely identifies a study within the given database server  MIAPPE V1.1 (DM-11) Study unique ID - Unique identifier comprising the name or identifier for the institution/database hosting the submission of the study data, and the identifier of the study in that institution.")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public Study studyDescription(String studyDescription) {
-        this.studyDescription = studyDescription;
-        return this;
-    }
-
-    /**
-     * The description of this study  MIAPPE V1.1 (DM-13) Study description - Human-readable text describing the study
-     *
-     * @return studyDescription
-     **/
-    @Schema(example = "This is a yield study for Spring 2018", description = "The description of this study  MIAPPE V1.1 (DM-13) Study description - Human-readable text describing the study")
-    public String getStudyDescription() {
-        return studyDescription;
-    }
-
-    public void setStudyDescription(String studyDescription) {
-        this.studyDescription = studyDescription;
-    }
-
-    public Study studyName(String studyName) {
-        this.studyName = studyName;
-        return this;
-    }
-
-    /**
-     * The human readable name for a study  MIAPPE V1.1 (DM-12) Study title - Human-readable text summarising the study
-     *
-     * @return studyName
-     **/
-    @Schema(example = "INRA's Walnut Genetic Resources Observation at Kenya", description = "The human readable name for a study  MIAPPE V1.1 (DM-12) Study title - Human-readable text summarising the study")
-    public String getStudyName() {
-        return studyName;
-    }
-
-    public void setStudyName(String studyName) {
-        this.studyName = studyName;
-    }
-
-    public Study studyPUI(String studyPUI) {
-        this.studyPUI = studyPUI;
-        return this;
-    }
-
-    /**
-     * A permanent unique identifier associated with this study data. For example, a URI or DOI
-     *
-     * @return studyPUI
-     **/
-    @Schema(example = "doi:10.155454/12349537312", description = "A permanent unique identifier associated with this study data. For example, a URI or DOI")
-    public String getStudyPUI() {
-        return studyPUI;
-    }
-
-    public void setStudyPUI(String studyPUI) {
-        this.studyPUI = studyPUI;
-    }
-
-    public Study studyType(String studyType) {
-        this.studyType = studyType;
-        return this;
-    }
-
-    /**
-     * The type of study being performed. ex. \&quot;Yield Trial\&quot;, etc
-     *
-     * @return studyType
-     **/
-    @Schema(example = "Phenotyping", description = "The type of study being performed. ex. \"Yield Trial\", etc")
-    public String getStudyType() {
-        return studyType;
-    }
-
-    public void setStudyType(String studyType) {
-        this.studyType = studyType;
-    }
-
-    public Study trialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial
-     *
-     * @return trialDbId
-     **/
-    @Schema(example = "48b327ea", description = "The ID which uniquely identifies a trial")
-    public String getTrialDbId() {
-        return trialDbId;
-    }
-
-    public void setTrialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-    }
-
-    public Study trialName(String trialName) {
-        this.trialName = trialName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial
-     *
-     * @return trialName
-     **/
-    @Schema(example = "Grape_Yield_Trial", description = "The human readable name of a trial")
-    public String getTrialName() {
-        return trialName;
-    }
-
-    public void setTrialName(String trialName) {
-        this.trialName = trialName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Study study = (Study) o;
-        return Objects.equals(this.active, study.active) &&
-                Objects.equals(this.additionalInfo, study.additionalInfo) &&
-                Objects.equals(this.commonCropName, study.commonCropName) &&
-                Objects.equals(this.contacts, study.contacts) &&
-                Objects.equals(this.culturalPractices, study.culturalPractices) &&
-                Objects.equals(this.dataLinks, study.dataLinks) &&
-                Objects.equals(this.documentationURL, study.documentationURL) &&
-                Objects.equals(this.endDate, study.endDate) &&
-                Objects.equals(this.environmentParameters, study.environmentParameters) &&
-                Objects.equals(this.experimentalDesign, study.experimentalDesign) &&
-                Objects.equals(this.externalReferences, study.externalReferences) &&
-                Objects.equals(this.growthFacility, study.growthFacility) &&
-                Objects.equals(this.lastUpdate, study.lastUpdate) &&
-                Objects.equals(this.license, study.license) &&
-                Objects.equals(this.locationDbId, study.locationDbId) &&
-                Objects.equals(this.locationName, study.locationName) &&
-                Objects.equals(this.observationLevels, study.observationLevels) &&
-                Objects.equals(this.observationUnitsDescription, study.observationUnitsDescription) &&
-                Objects.equals(this.observationVariableDbIds, study.observationVariableDbIds) &&
-                Objects.equals(this.seasons, study.seasons) &&
-                Objects.equals(this.startDate, study.startDate) &&
-                Objects.equals(this.studyCode, study.studyCode) &&
-                Objects.equals(this.studyDbId, study.studyDbId) &&
-                Objects.equals(this.studyDescription, study.studyDescription) &&
-                Objects.equals(this.studyName, study.studyName) &&
-                Objects.equals(this.studyPUI, study.studyPUI) &&
-                Objects.equals(this.studyType, study.studyType) &&
-                Objects.equals(this.trialDbId, study.trialDbId) &&
-                Objects.equals(this.trialName, study.trialName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(active, additionalInfo, commonCropName, contacts, culturalPractices, dataLinks, documentationURL, endDate, environmentParameters, experimentalDesign, externalReferences, growthFacility, lastUpdate, license, locationDbId, locationName, observationLevels, observationUnitsDescription, observationVariableDbIds, seasons, startDate, studyCode, studyDbId, studyDescription, studyName, studyPUI, studyType, trialDbId, trialName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Study {\n");
-
-        sb.append("    active: ").append(toIndentedString(active)).append("\n");
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    contacts: ").append(toIndentedString(contacts)).append("\n");
-        sb.append("    culturalPractices: ").append(toIndentedString(culturalPractices)).append("\n");
-        sb.append("    dataLinks: ").append(toIndentedString(dataLinks)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    endDate: ").append(toIndentedString(endDate)).append("\n");
-        sb.append("    environmentParameters: ").append(toIndentedString(environmentParameters)).append("\n");
-        sb.append("    experimentalDesign: ").append(toIndentedString(experimentalDesign)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    growthFacility: ").append(toIndentedString(growthFacility)).append("\n");
-        sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-        sb.append("    license: ").append(toIndentedString(license)).append("\n");
-        sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
-        sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
-        sb.append("    observationLevels: ").append(toIndentedString(observationLevels)).append("\n");
-        sb.append("    observationUnitsDescription: ").append(toIndentedString(observationUnitsDescription)).append("\n");
-        sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-        sb.append("    seasons: ").append(toIndentedString(seasons)).append("\n");
-        sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-        sb.append("    studyCode: ").append(toIndentedString(studyCode)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    studyDescription: ").append(toIndentedString(studyDescription)).append("\n");
-        sb.append("    studyName: ").append(toIndentedString(studyName)).append("\n");
-        sb.append("    studyPUI: ").append(toIndentedString(studyPUI)).append("\n");
-        sb.append("    studyType: ").append(toIndentedString(studyType)).append("\n");
-        sb.append("    trialDbId: ").append(toIndentedString(trialDbId)).append("\n");
-        sb.append("    trialName: ").append(toIndentedString(trialName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyContacts.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyContacts.java
deleted file mode 100644
index 0914d9e3..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyContacts.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * StudyContacts
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class StudyContacts {
-    @SerializedName("contactDbId")
-    private String contactDbId = null;
-
-    @SerializedName("email")
-    private String email = null;
-
-    @SerializedName("instituteName")
-    private String instituteName = null;
-
-    @SerializedName("name")
-    private String name = null;
-
-    @SerializedName("orcid")
-    private String orcid = null;
-
-    @SerializedName("type")
-    private String type = null;
-
-    public StudyContacts contactDbId(String contactDbId) {
-        this.contactDbId = contactDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies this contact  MIAPPE V1.1 (DM-33) Person ID - An identifier for the data submitter. If that submitter is an individual, ORCID identifiers are recommended.
-     *
-     * @return contactDbId
-     **/
-    @Schema(example = "5f4e5509", required = true, description = "The ID which uniquely identifies this contact  MIAPPE V1.1 (DM-33) Person ID - An identifier for the data submitter. If that submitter is an individual, ORCID identifiers are recommended.")
-    public String getContactDbId() {
-        return contactDbId;
-    }
-
-    public void setContactDbId(String contactDbId) {
-        this.contactDbId = contactDbId;
-    }
-
-    public StudyContacts email(String email) {
-        this.email = email;
-        return this;
-    }
-
-    /**
-     * The contacts email address  MIAPPE V1.1 (DM-32) Person email - The electronic mail address of the person.
-     *
-     * @return email
-     **/
-    @Schema(example = "bob@bob.com", description = "The contacts email address  MIAPPE V1.1 (DM-32) Person email - The electronic mail address of the person.")
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public StudyContacts instituteName(String instituteName) {
-        this.instituteName = instituteName;
-        return this;
-    }
-
-    /**
-     * The name of the institution which this contact is part of  MIAPPE V1.1 (DM-35) Person affiliation - The institution the person belongs to
-     *
-     * @return instituteName
-     **/
-    @Schema(example = "The BrAPI Institute", description = "The name of the institution which this contact is part of  MIAPPE V1.1 (DM-35) Person affiliation - The institution the person belongs to")
-    public String getInstituteName() {
-        return instituteName;
-    }
-
-    public void setInstituteName(String instituteName) {
-        this.instituteName = instituteName;
-    }
-
-    public StudyContacts name(String name) {
-        this.name = name;
-        return this;
-    }
-
-    /**
-     * The full name of this contact person  MIAPPE V1.1 (DM-31) Person name - The name of the person (either full name or as used in scientific publications)
-     *
-     * @return name
-     **/
-    @Schema(example = "Bob Robertson", description = "The full name of this contact person  MIAPPE V1.1 (DM-31) Person name - The name of the person (either full name or as used in scientific publications)")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public StudyContacts orcid(String orcid) {
-        this.orcid = orcid;
-        return this;
-    }
-
-    /**
-     * The Open Researcher and Contributor ID for this contact person (orcid.org)  MIAPPE V1.1 (DM-33) Person ID - An identifier for the data submitter. If that submitter is an individual, ORCID identifiers are recommended.
-     *
-     * @return orcid
-     **/
-    @Schema(example = "http://orcid.org/0000-0001-8640-1750", description = "The Open Researcher and Contributor ID for this contact person (orcid.org)  MIAPPE V1.1 (DM-33) Person ID - An identifier for the data submitter. If that submitter is an individual, ORCID identifiers are recommended.")
-    public String getOrcid() {
-        return orcid;
-    }
-
-    public void setOrcid(String orcid) {
-        this.orcid = orcid;
-    }
-
-    public StudyContacts type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The type of person this contact represents (ex: Coordinator, Scientist, PI, etc.)  MIAPPE V1.1 (DM-34) Person role - Type of contribution of the person to the investigation
-     *
-     * @return type
-     **/
-    @Schema(example = "PI", description = "The type of person this contact represents (ex: Coordinator, Scientist, PI, etc.)  MIAPPE V1.1 (DM-34) Person role - Type of contribution of the person to the investigation")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        StudyContacts studyContacts = (StudyContacts) o;
-        return Objects.equals(this.contactDbId, studyContacts.contactDbId) &&
-                Objects.equals(this.email, studyContacts.email) &&
-                Objects.equals(this.instituteName, studyContacts.instituteName) &&
-                Objects.equals(this.name, studyContacts.name) &&
-                Objects.equals(this.orcid, studyContacts.orcid) &&
-                Objects.equals(this.type, studyContacts.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(contactDbId, email, instituteName, name, orcid, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class StudyContacts {\n");
-
-        sb.append("    contactDbId: ").append(toIndentedString(contactDbId)).append("\n");
-        sb.append("    email: ").append(toIndentedString(email)).append("\n");
-        sb.append("    instituteName: ").append(toIndentedString(instituteName)).append("\n");
-        sb.append("    name: ").append(toIndentedString(name)).append("\n");
-        sb.append("    orcid: ").append(toIndentedString(orcid)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyDataLinks.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyDataLinks.java
deleted file mode 100644
index 45084f31..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyDataLinks.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * StudyDataLinks
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class StudyDataLinks {
-    @SerializedName("dataFormat")
-    private String dataFormat = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("fileFormat")
-    private String fileFormat = null;
-
-    @SerializedName("name")
-    private String name = null;
-
-    @SerializedName("provenance")
-    private String provenance = null;
-
-    @SerializedName("scientificType")
-    private String scientificType = null;
-
-    @SerializedName("url")
-    private String url = null;
-
-    @SerializedName("version")
-    private String version = null;
-
-    public StudyDataLinks dataFormat(String dataFormat) {
-        this.dataFormat = dataFormat;
-        return this;
-    }
-
-    /**
-     * The structure of the data within a file. For example - VCF, table, image archive, multispectral image archives in EDAM ontology (used in Galaxy)  MIAPPE V1.1 (DM-38) Data file description - Description of the format of the data file. May be a standard file format name, or a description of organization of the data in a tabular file.
-     *
-     * @return dataFormat
-     **/
-    @Schema(example = "Image Archive", description = "The structure of the data within a file. For example - VCF, table, image archive, multispectral image archives in EDAM ontology (used in Galaxy)  MIAPPE V1.1 (DM-38) Data file description - Description of the format of the data file. May be a standard file format name, or a description of organization of the data in a tabular file.")
-    public String getDataFormat() {
-        return dataFormat;
-    }
-
-    public void setDataFormat(String dataFormat) {
-        this.dataFormat = dataFormat;
-    }
-
-    public StudyDataLinks description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * The general description of this data link  MIAPPE V1.1 (DM-38) Data file description - Description of the format of the data file. May be a standard file format name, or a description of organization of the data in a tabular file.
-     *
-     * @return description
-     **/
-    @Schema(example = "Raw drone images collected for this study", description = "The general description of this data link  MIAPPE V1.1 (DM-38) Data file description - Description of the format of the data file. May be a standard file format name, or a description of organization of the data in a tabular file.")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public StudyDataLinks fileFormat(String fileFormat) {
-        this.fileFormat = fileFormat;
-        return this;
-    }
-
-    /**
-     * The MIME type of the file (ie text/csv, application/excel, application/zip).  MIAPPE V1.1 (DM-38) Data file description - Description of the format of the data file. May be a standard file format name, or a description of organization of the data in a tabular file.
-     *
-     * @return fileFormat
-     **/
-    @Schema(example = "application/zip", description = "The MIME type of the file (ie text/csv, application/excel, application/zip).  MIAPPE V1.1 (DM-38) Data file description - Description of the format of the data file. May be a standard file format name, or a description of organization of the data in a tabular file.")
-    public String getFileFormat() {
-        return fileFormat;
-    }
-
-    public void setFileFormat(String fileFormat) {
-        this.fileFormat = fileFormat;
-    }
-
-    public StudyDataLinks name(String name) {
-        this.name = name;
-        return this;
-    }
-
-    /**
-     * The name of the external data link  MIAPPE V1.1 (DM-38) Data file description - Description of the format of the data file. May be a standard file format name, or a description of organization of the data in a tabular file.
-     *
-     * @return name
-     **/
-    @Schema(example = "image-archive.zip", description = "The name of the external data link  MIAPPE V1.1 (DM-38) Data file description - Description of the format of the data file. May be a standard file format name, or a description of organization of the data in a tabular file.")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public StudyDataLinks provenance(String provenance) {
-        this.provenance = provenance;
-        return this;
-    }
-
-    /**
-     * The description of the origin or ownership of this linked data. Could be a formal reference to software, method, or workflow.
-     *
-     * @return provenance
-     **/
-    @Schema(example = "Image Processing Pipeline, built at the University of Antarctica: https://github.com/antarctica/pipeline", description = "The description of the origin or ownership of this linked data. Could be a formal reference to software, method, or workflow.")
-    public String getProvenance() {
-        return provenance;
-    }
-
-    public void setProvenance(String provenance) {
-        this.provenance = provenance;
-    }
-
-    public StudyDataLinks scientificType(String scientificType) {
-        this.scientificType = scientificType;
-        return this;
-    }
-
-    /**
-     * The general type of data. For example- Genotyping, Phenotyping raw data, Phenotyping reduced data, Environmental, etc
-     *
-     * @return scientificType
-     **/
-    @Schema(example = "Environmental", description = "The general type of data. For example- Genotyping, Phenotyping raw data, Phenotyping reduced data, Environmental, etc")
-    public String getScientificType() {
-        return scientificType;
-    }
-
-    public void setScientificType(String scientificType) {
-        this.scientificType = scientificType;
-    }
-
-    public StudyDataLinks url(String url) {
-        this.url = url;
-        return this;
-    }
-
-    /**
-     * URL describing the location of this data file to view or download  MIAPPE V1.1 (DM-37) Data file link - Link to the data file (or digital object) in a public database or in a persistent institutional repository; or identifier of the data file when submitted together with the MIAPPE submission.
-     *
-     * @return url
-     **/
-    @Schema(example = "https://brapi.org/image-archive.zip", description = "URL describing the location of this data file to view or download  MIAPPE V1.1 (DM-37) Data file link - Link to the data file (or digital object) in a public database or in a persistent institutional repository; or identifier of the data file when submitted together with the MIAPPE submission.")
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public StudyDataLinks version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    /**
-     * The version number for this data   MIAPPE V1.1 (DM-39) Data file version - The version of the dataset (the actual data).
-     *
-     * @return version
-     **/
-    @Schema(example = "1.0.3", description = "The version number for this data   MIAPPE V1.1 (DM-39) Data file version - The version of the dataset (the actual data).")
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        StudyDataLinks studyDataLinks = (StudyDataLinks) o;
-        return Objects.equals(this.dataFormat, studyDataLinks.dataFormat) &&
-                Objects.equals(this.description, studyDataLinks.description) &&
-                Objects.equals(this.fileFormat, studyDataLinks.fileFormat) &&
-                Objects.equals(this.name, studyDataLinks.name) &&
-                Objects.equals(this.provenance, studyDataLinks.provenance) &&
-                Objects.equals(this.scientificType, studyDataLinks.scientificType) &&
-                Objects.equals(this.url, studyDataLinks.url) &&
-                Objects.equals(this.version, studyDataLinks.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(dataFormat, description, fileFormat, name, provenance, scientificType, url, version);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class StudyDataLinks {\n");
-
-        sb.append("    dataFormat: ").append(toIndentedString(dataFormat)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    fileFormat: ").append(toIndentedString(fileFormat)).append("\n");
-        sb.append("    name: ").append(toIndentedString(name)).append("\n");
-        sb.append("    provenance: ").append(toIndentedString(provenance)).append("\n");
-        sb.append("    scientificType: ").append(toIndentedString(scientificType)).append("\n");
-        sb.append("    url: ").append(toIndentedString(url)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyEnvironmentParameters.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyEnvironmentParameters.java
deleted file mode 100644
index 0af329db..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyEnvironmentParameters.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * StudyEnvironmentParameters
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class StudyEnvironmentParameters {
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("parameterName")
-    private String parameterName = null;
-
-    @SerializedName("parameterPUI")
-    private String parameterPUI = null;
-
-    @SerializedName("unit")
-    private String unit = null;
-
-    @SerializedName("unitPUI")
-    private String unitPUI = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    @SerializedName("valuePUI")
-    private String valuePUI = null;
-
-    public StudyEnvironmentParameters description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Human-readable value of the environment parameter (defined above) constant within the experiment
-     *
-     * @return description
-     **/
-    @Schema(example = "the soil type was clay", required = true, description = "Human-readable value of the environment parameter (defined above) constant within the experiment")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public StudyEnvironmentParameters parameterName(String parameterName) {
-        this.parameterName = parameterName;
-        return this;
-    }
-
-    /**
-     * Name of the environment parameter constant within the experiment  MIAPPE V1.1 (DM-58) Environment parameter - Name of the environment parameter constant within the experiment.
-     *
-     * @return parameterName
-     **/
-    @Schema(example = "soil type", required = true, description = "Name of the environment parameter constant within the experiment  MIAPPE V1.1 (DM-58) Environment parameter - Name of the environment parameter constant within the experiment. ")
-    public String getParameterName() {
-        return parameterName;
-    }
-
-    public void setParameterName(String parameterName) {
-        this.parameterName = parameterName;
-    }
-
-    public StudyEnvironmentParameters parameterPUI(String parameterPUI) {
-        this.parameterPUI = parameterPUI;
-        return this;
-    }
-
-    /**
-     * URI pointing to an ontology class for the parameter
-     *
-     * @return parameterPUI
-     **/
-    @Schema(example = "PECO:0007155", description = "URI pointing to an ontology class for the parameter")
-    public String getParameterPUI() {
-        return parameterPUI;
-    }
-
-    public void setParameterPUI(String parameterPUI) {
-        this.parameterPUI = parameterPUI;
-    }
-
-    public StudyEnvironmentParameters unit(String unit) {
-        this.unit = unit;
-        return this;
-    }
-
-    /**
-     * Unit of the value for this parameter
-     *
-     * @return unit
-     **/
-    @Schema(example = "pH", description = "Unit of the value for this parameter")
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public StudyEnvironmentParameters unitPUI(String unitPUI) {
-        this.unitPUI = unitPUI;
-        return this;
-    }
-
-    /**
-     * URI pointing to an ontology class for the unit
-     *
-     * @return unitPUI
-     **/
-    @Schema(example = "PECO:0007059", description = "URI pointing to an ontology class for the unit")
-    public String getUnitPUI() {
-        return unitPUI;
-    }
-
-    public void setUnitPUI(String unitPUI) {
-        this.unitPUI = unitPUI;
-    }
-
-    public StudyEnvironmentParameters value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * Numerical or categorical value  MIAPPE V1.1 (DM-59) Environment parameter value - Value of the environment parameter (defined above) constant within the experiment.
-     *
-     * @return value
-     **/
-    @Schema(example = "clay soil", description = "Numerical or categorical value  MIAPPE V1.1 (DM-59) Environment parameter value - Value of the environment parameter (defined above) constant within the experiment.")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public StudyEnvironmentParameters valuePUI(String valuePUI) {
-        this.valuePUI = valuePUI;
-        return this;
-    }
-
-    /**
-     * URI pointing to an ontology class for the parameter value
-     *
-     * @return valuePUI
-     **/
-    @Schema(example = "ENVO:00002262", description = "URI pointing to an ontology class for the parameter value")
-    public String getValuePUI() {
-        return valuePUI;
-    }
-
-    public void setValuePUI(String valuePUI) {
-        this.valuePUI = valuePUI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        StudyEnvironmentParameters studyEnvironmentParameters = (StudyEnvironmentParameters) o;
-        return Objects.equals(this.description, studyEnvironmentParameters.description) &&
-                Objects.equals(this.parameterName, studyEnvironmentParameters.parameterName) &&
-                Objects.equals(this.parameterPUI, studyEnvironmentParameters.parameterPUI) &&
-                Objects.equals(this.unit, studyEnvironmentParameters.unit) &&
-                Objects.equals(this.unitPUI, studyEnvironmentParameters.unitPUI) &&
-                Objects.equals(this.value, studyEnvironmentParameters.value) &&
-                Objects.equals(this.valuePUI, studyEnvironmentParameters.valuePUI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(description, parameterName, parameterPUI, unit, unitPUI, value, valuePUI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class StudyEnvironmentParameters {\n");
-
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    parameterName: ").append(toIndentedString(parameterName)).append("\n");
-        sb.append("    parameterPUI: ").append(toIndentedString(parameterPUI)).append("\n");
-        sb.append("    unit: ").append(toIndentedString(unit)).append("\n");
-        sb.append("    unitPUI: ").append(toIndentedString(unitPUI)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("    valuePUI: ").append(toIndentedString(valuePUI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyExperimentalDesign.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyExperimentalDesign.java
deleted file mode 100644
index 142b438e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyExperimentalDesign.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * The experimental and statistical design full description plus a category PUI taken from crop research ontology or agronomy ontology
- */
-@Schema(description = "The experimental and statistical design full description plus a category PUI taken from crop research ontology or agronomy ontology")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class StudyExperimentalDesign {
-    @SerializedName("PUI")
-    private String PUI = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    public StudyExperimentalDesign PUI(String PUI) {
-        this.PUI = PUI;
-        return this;
-    }
-
-    /**
-     * MIAPPE V1.1 (DM-23) Type of experimental design - Type of experimental  design of the study, in the form of an accession number from the Crop Ontology.
-     *
-     * @return PUI
-     **/
-    @Schema(example = "CO_715:0000145", description = "MIAPPE V1.1 (DM-23) Type of experimental design - Type of experimental  design of the study, in the form of an accession number from the Crop Ontology.")
-    public String getPUI() {
-        return PUI;
-    }
-
-    public void setPUI(String PUI) {
-        this.PUI = PUI;
-    }
-
-    public StudyExperimentalDesign description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * MIAPPE V1.1 (DM-22) Description of the experimental design - Short description of the experimental design, possibly including statistical design. In specific cases, e.g. legacy datasets or data computed from several studies, the experimental design can be \&quot;unknown\&quot;/\&quot;NA\&quot;, \&quot;aggregated/reduced data\&quot;, or simply &#x27;none&#x27;.
-     *
-     * @return description
-     **/
-    @Schema(example = "Lines were repeated twice at each location using a complete block design. In order to limit competition effects, each block was organized into four sub-blocks corresponding to earliest groups based on a prior information.", description = "MIAPPE V1.1 (DM-22) Description of the experimental design - Short description of the experimental design, possibly including statistical design. In specific cases, e.g. legacy datasets or data computed from several studies, the experimental design can be \"unknown\"/\"NA\", \"aggregated/reduced data\", or simply 'none'.")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        StudyExperimentalDesign studyExperimentalDesign = (StudyExperimentalDesign) o;
-        return Objects.equals(this.PUI, studyExperimentalDesign.PUI) &&
-                Objects.equals(this.description, studyExperimentalDesign.description);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(PUI, description);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class StudyExperimentalDesign {\n");
-
-        sb.append("    PUI: ").append(toIndentedString(PUI)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyGrowthFacility.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyGrowthFacility.java
deleted file mode 100644
index 98ce08f1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyGrowthFacility.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Short description of the facility in which the study was carried out.
- */
-@Schema(description = "Short description of the facility in which the study was carried out.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class StudyGrowthFacility {
-    @SerializedName("PUI")
-    private String PUI = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    public StudyGrowthFacility PUI(String PUI) {
-        this.PUI = PUI;
-        return this;
-    }
-
-    /**
-     * MIAPPE V1.1 (DM-27) Type of growth facility - Type of growth facility in which the study was carried out, in the form of an accession number from the Crop Ontology.
-     *
-     * @return PUI
-     **/
-    @Schema(example = "CO_715:0000162", description = "MIAPPE V1.1 (DM-27) Type of growth facility - Type of growth facility in which the study was carried out, in the form of an accession number from the Crop Ontology.")
-    public String getPUI() {
-        return PUI;
-    }
-
-    public void setPUI(String PUI) {
-        this.PUI = PUI;
-    }
-
-    public StudyGrowthFacility description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * MIAPPE V1.1 (DM-26) Description of growth facility - Short description of the facility in which the study was carried out.
-     *
-     * @return description
-     **/
-    @Schema(example = "field environment condition, greenhouse", description = "MIAPPE V1.1 (DM-26) Description of growth facility - Short description of the facility in which the study was carried out.")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        StudyGrowthFacility studyGrowthFacility = (StudyGrowthFacility) o;
-        return Objects.equals(this.PUI, studyGrowthFacility.PUI) &&
-                Objects.equals(this.description, studyGrowthFacility.description);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(PUI, description);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class StudyGrowthFacility {\n");
-
-        sb.append("    PUI: ").append(toIndentedString(PUI)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyLastUpdate.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyLastUpdate.java
deleted file mode 100644
index 35234496..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyLastUpdate.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.Objects;
-
-/**
- * The date and time when this study was last modified
- */
-@Schema(description = "The date and time when this study was last modified")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class StudyLastUpdate {
-    @SerializedName("timestamp")
-    private OffsetDateTime timestamp = null;
-
-    @SerializedName("version")
-    private String version = null;
-
-    public StudyLastUpdate timestamp(OffsetDateTime timestamp) {
-        this.timestamp = timestamp;
-        return this;
-    }
-
-    /**
-     * Get timestamp
-     *
-     * @return timestamp
-     **/
-    @Schema(description = "")
-    public OffsetDateTime getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(OffsetDateTime timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public StudyLastUpdate version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    /**
-     * Get version
-     *
-     * @return version
-     **/
-    @Schema(example = "1.2.3", description = "")
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        StudyLastUpdate studyLastUpdate = (StudyLastUpdate) o;
-        return Objects.equals(this.timestamp, studyLastUpdate.timestamp) &&
-                Objects.equals(this.version, studyLastUpdate.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(timestamp, version);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class StudyLastUpdate {\n");
-
-        sb.append("    timestamp: ").append(toIndentedString(timestamp)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyListResponse.java
deleted file mode 100644
index 7e08bc90..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * StudyListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class StudyListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private StudyListResponseResult result = null;
-
-    public StudyListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public StudyListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public StudyListResponse result(StudyListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public StudyListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(StudyListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        StudyListResponse studyListResponse = (StudyListResponse) o;
-        return Objects.equals(this._atContext, studyListResponse._atContext) &&
-                Objects.equals(this.metadata, studyListResponse.metadata) &&
-                Objects.equals(this.result, studyListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class StudyListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyListResponseResult.java
deleted file mode 100644
index 0229709f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * StudyListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class StudyListResponseResult {
-    @SerializedName("data")
-    private List<Study> data = new ArrayList<Study>();
-
-    public StudyListResponseResult data(List<Study> data) {
-        this.data = data;
-        return this;
-    }
-
-    public StudyListResponseResult addDataItem(Study dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Study> getData() {
-        return data;
-    }
-
-    public void setData(List<Study> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        StudyListResponseResult studyListResponseResult = (StudyListResponseResult) o;
-        return Objects.equals(this.data, studyListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class StudyListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyNewRequest.java
deleted file mode 100644
index 1482fe82..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyNewRequest.java
+++ /dev/null
@@ -1,801 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * StudyNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class StudyNewRequest {
-    @SerializedName("active")
-    private Boolean active = null;
-
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("contacts")
-    private List<StudyContacts> contacts = null;
-
-    @SerializedName("culturalPractices")
-    private String culturalPractices = null;
-
-    @SerializedName("dataLinks")
-    private List<StudyDataLinks> dataLinks = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("endDate")
-    private OffsetDateTime endDate = null;
-
-    @SerializedName("environmentParameters")
-    private List<StudyEnvironmentParameters> environmentParameters = null;
-
-    @SerializedName("experimentalDesign")
-    private StudyExperimentalDesign experimentalDesign = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("growthFacility")
-    private StudyGrowthFacility growthFacility = null;
-
-    @SerializedName("lastUpdate")
-    private StudyLastUpdate lastUpdate = null;
-
-    @SerializedName("license")
-    private String license = null;
-
-    @SerializedName("locationDbId")
-    private String locationDbId = null;
-
-    @SerializedName("locationName")
-    private String locationName = null;
-
-    @SerializedName("observationLevels")
-    private List<ObservationUnitHierarchyLevel1> observationLevels = null;
-
-    @SerializedName("observationUnitsDescription")
-    private String observationUnitsDescription = null;
-
-    @SerializedName("observationVariableDbIds")
-    private List<String> observationVariableDbIds = null;
-
-    @SerializedName("seasons")
-    private List<String> seasons = null;
-
-    @SerializedName("startDate")
-    private OffsetDateTime startDate = null;
-
-    @SerializedName("studyCode")
-    private String studyCode = null;
-
-    @SerializedName("studyDescription")
-    private String studyDescription = null;
-
-    @SerializedName("studyName")
-    private String studyName = null;
-
-    @SerializedName("studyPUI")
-    private String studyPUI = null;
-
-    @SerializedName("studyType")
-    private String studyType = null;
-
-    @SerializedName("trialDbId")
-    private String trialDbId = null;
-
-    @SerializedName("trialName")
-    private String trialName = null;
-
-    public StudyNewRequest active(Boolean active) {
-        this.active = active;
-        return this;
-    }
-
-    /**
-     * A flag to indicate if a Study is currently active and ongoing
-     *
-     * @return active
-     **/
-    @Schema(example = "true", description = "A flag to indicate if a Study is currently active and ongoing")
-    public Boolean isActive() {
-        return active;
-    }
-
-    public void setActive(Boolean active) {
-        this.active = active;
-    }
-
-    public StudyNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public StudyNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public StudyNewRequest commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Common name for the crop associated with this study
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Grape", description = "Common name for the crop associated with this study")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public StudyNewRequest contacts(List<StudyContacts> contacts) {
-        this.contacts = contacts;
-        return this;
-    }
-
-    public StudyNewRequest addContactsItem(StudyContacts contactsItem) {
-        if (this.contacts == null) {
-            this.contacts = new ArrayList<StudyContacts>();
-        }
-        this.contacts.add(contactsItem);
-        return this;
-    }
-
-    /**
-     * List of contact entities associated with this study
-     *
-     * @return contacts
-     **/
-    @Schema(description = "List of contact entities associated with this study")
-    public List<StudyContacts> getContacts() {
-        return contacts;
-    }
-
-    public void setContacts(List<StudyContacts> contacts) {
-        this.contacts = contacts;
-    }
-
-    public StudyNewRequest culturalPractices(String culturalPractices) {
-        this.culturalPractices = culturalPractices;
-        return this;
-    }
-
-    /**
-     * MIAPPE V1.1 (DM-28) Cultural practices - General description of the cultural practices of the study.
-     *
-     * @return culturalPractices
-     **/
-    @Schema(example = "Irrigation was applied according needs during summer to prevent water stress.", description = "MIAPPE V1.1 (DM-28) Cultural practices - General description of the cultural practices of the study.")
-    public String getCulturalPractices() {
-        return culturalPractices;
-    }
-
-    public void setCulturalPractices(String culturalPractices) {
-        this.culturalPractices = culturalPractices;
-    }
-
-    public StudyNewRequest dataLinks(List<StudyDataLinks> dataLinks) {
-        this.dataLinks = dataLinks;
-        return this;
-    }
-
-    public StudyNewRequest addDataLinksItem(StudyDataLinks dataLinksItem) {
-        if (this.dataLinks == null) {
-            this.dataLinks = new ArrayList<StudyDataLinks>();
-        }
-        this.dataLinks.add(dataLinksItem);
-        return this;
-    }
-
-    /**
-     * List of links to extra data files associated with this study. Extra data could include notes, images, and reference data.
-     *
-     * @return dataLinks
-     **/
-    @Schema(description = "List of links to extra data files associated with this study. Extra data could include notes, images, and reference data.")
-    public List<StudyDataLinks> getDataLinks() {
-        return dataLinks;
-    }
-
-    public void setDataLinks(List<StudyDataLinks> dataLinks) {
-        this.dataLinks = dataLinks;
-    }
-
-    public StudyNewRequest documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public StudyNewRequest endDate(OffsetDateTime endDate) {
-        this.endDate = endDate;
-        return this;
-    }
-
-    /**
-     * The date the study ends  MIAPPE V1.1 (DM-15) End date of study - Date and, if relevant, time when the experiment ended
-     *
-     * @return endDate
-     **/
-    @Schema(description = "The date the study ends  MIAPPE V1.1 (DM-15) End date of study - Date and, if relevant, time when the experiment ended")
-    public OffsetDateTime getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(OffsetDateTime endDate) {
-        this.endDate = endDate;
-    }
-
-    public StudyNewRequest environmentParameters(List<StudyEnvironmentParameters> environmentParameters) {
-        this.environmentParameters = environmentParameters;
-        return this;
-    }
-
-    public StudyNewRequest addEnvironmentParametersItem(StudyEnvironmentParameters environmentParametersItem) {
-        if (this.environmentParameters == null) {
-            this.environmentParameters = new ArrayList<StudyEnvironmentParameters>();
-        }
-        this.environmentParameters.add(environmentParametersItem);
-        return this;
-    }
-
-    /**
-     * Environmental parameters that were kept constant throughout the study and did not change between observation units.  MIAPPE V1.1 (DM-57) Environment - Environmental parameters that were kept constant throughout the study and did not change between observation units or assays. Environment characteristics that vary over time, i.e. environmental variables, should be recorded as Observed Variables (see below).
-     *
-     * @return environmentParameters
-     **/
-    @Schema(description = "Environmental parameters that were kept constant throughout the study and did not change between observation units.  MIAPPE V1.1 (DM-57) Environment - Environmental parameters that were kept constant throughout the study and did not change between observation units or assays. Environment characteristics that vary over time, i.e. environmental variables, should be recorded as Observed Variables (see below).")
-    public List<StudyEnvironmentParameters> getEnvironmentParameters() {
-        return environmentParameters;
-    }
-
-    public void setEnvironmentParameters(List<StudyEnvironmentParameters> environmentParameters) {
-        this.environmentParameters = environmentParameters;
-    }
-
-    public StudyNewRequest experimentalDesign(StudyExperimentalDesign experimentalDesign) {
-        this.experimentalDesign = experimentalDesign;
-        return this;
-    }
-
-    /**
-     * Get experimentalDesign
-     *
-     * @return experimentalDesign
-     **/
-    @Schema(description = "")
-    public StudyExperimentalDesign getExperimentalDesign() {
-        return experimentalDesign;
-    }
-
-    public void setExperimentalDesign(StudyExperimentalDesign experimentalDesign) {
-        this.experimentalDesign = experimentalDesign;
-    }
-
-    public StudyNewRequest externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public StudyNewRequest addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public StudyNewRequest growthFacility(StudyGrowthFacility growthFacility) {
-        this.growthFacility = growthFacility;
-        return this;
-    }
-
-    /**
-     * Get growthFacility
-     *
-     * @return growthFacility
-     **/
-    @Schema(description = "")
-    public StudyGrowthFacility getGrowthFacility() {
-        return growthFacility;
-    }
-
-    public void setGrowthFacility(StudyGrowthFacility growthFacility) {
-        this.growthFacility = growthFacility;
-    }
-
-    public StudyNewRequest lastUpdate(StudyLastUpdate lastUpdate) {
-        this.lastUpdate = lastUpdate;
-        return this;
-    }
-
-    /**
-     * Get lastUpdate
-     *
-     * @return lastUpdate
-     **/
-    @Schema(description = "")
-    public StudyLastUpdate getLastUpdate() {
-        return lastUpdate;
-    }
-
-    public void setLastUpdate(StudyLastUpdate lastUpdate) {
-        this.lastUpdate = lastUpdate;
-    }
-
-    public StudyNewRequest license(String license) {
-        this.license = license;
-        return this;
-    }
-
-    /**
-     * The usage license associated with the study data
-     *
-     * @return license
-     **/
-    @Schema(example = "MIT License", description = "The usage license associated with the study data")
-    public String getLicense() {
-        return license;
-    }
-
-    public void setLicense(String license) {
-        this.license = license;
-    }
-
-    public StudyNewRequest locationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Location
-     *
-     * @return locationDbId
-     **/
-    @Schema(example = "3cfdd67d", description = "The unique identifier for a Location")
-    public String getLocationDbId() {
-        return locationDbId;
-    }
-
-    public void setLocationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-    }
-
-    public StudyNewRequest locationName(String locationName) {
-        this.locationName = locationName;
-        return this;
-    }
-
-    /**
-     * A human readable name for this location  MIAPPE V1.1 (DM-18) Experimental site name - The name of the natural site, experimental field, greenhouse, phenotyping facility, etc. where the experiment took place.
-     *
-     * @return locationName
-     **/
-    @Schema(example = "Location 1", description = "A human readable name for this location  MIAPPE V1.1 (DM-18) Experimental site name - The name of the natural site, experimental field, greenhouse, phenotyping facility, etc. where the experiment took place.")
-    public String getLocationName() {
-        return locationName;
-    }
-
-    public void setLocationName(String locationName) {
-        this.locationName = locationName;
-    }
-
-    public StudyNewRequest observationLevels(List<ObservationUnitHierarchyLevel1> observationLevels) {
-        this.observationLevels = observationLevels;
-        return this;
-    }
-
-    public StudyNewRequest addObservationLevelsItem(ObservationUnitHierarchyLevel1 observationLevelsItem) {
-        if (this.observationLevels == null) {
-            this.observationLevels = new ArrayList<ObservationUnitHierarchyLevel1>();
-        }
-        this.observationLevels.add(observationLevelsItem);
-        return this;
-    }
-
-    /**
-     * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60; defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are at the bottom of the hierarchy (ie plant &gt; 6).
-     *
-     * @return observationLevels
-     **/
-    @Schema(example = "[{\"levelName\":\"field\",\"levelOrder\":0},{\"levelName\":\"block\",\"levelOrder\":1},{\"levelName\":\"plot\",\"levelOrder\":2}]", description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName` defines the level, `levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are at the bottom of the hierarchy (ie plant > 6). ")
-    public List<ObservationUnitHierarchyLevel1> getObservationLevels() {
-        return observationLevels;
-    }
-
-    public void setObservationLevels(List<ObservationUnitHierarchyLevel1> observationLevels) {
-        this.observationLevels = observationLevels;
-    }
-
-    public StudyNewRequest observationUnitsDescription(String observationUnitsDescription) {
-        this.observationUnitsDescription = observationUnitsDescription;
-        return this;
-    }
-
-    /**
-     * MIAPPE V1.1 (DM-25) Observation unit description - General description of the observation units in the study.
-     *
-     * @return observationUnitsDescription
-     **/
-    @Schema(example = "Observation units consisted in individual plots themselves consisting of a row of 15 plants at a density of approximately six plants per square meter.", description = "MIAPPE V1.1 (DM-25) Observation unit description - General description of the observation units in the study.")
-    public String getObservationUnitsDescription() {
-        return observationUnitsDescription;
-    }
-
-    public void setObservationUnitsDescription(String observationUnitsDescription) {
-        this.observationUnitsDescription = observationUnitsDescription;
-    }
-
-    public StudyNewRequest observationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-        return this;
-    }
-
-    public StudyNewRequest addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-        if (this.observationVariableDbIds == null) {
-            this.observationVariableDbIds = new ArrayList<String>();
-        }
-        this.observationVariableDbIds.add(observationVariableDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The list of Observation Variables being used in this study.   This list is intended to be the wishlist of variables to collect in this study. It may or may not match the set of variables used in the collected observation records.
-     *
-     * @return observationVariableDbIds
-     **/
-    @Schema(example = "[\"57c236f9\",\"48b327ea\",\"a5b367c5\"]", description = "The list of Observation Variables being used in this study.   This list is intended to be the wishlist of variables to collect in this study. It may or may not match the set of variables used in the collected observation records. ")
-    public List<String> getObservationVariableDbIds() {
-        return observationVariableDbIds;
-    }
-
-    public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-    }
-
-    public StudyNewRequest seasons(List<String> seasons) {
-        this.seasons = seasons;
-        return this;
-    }
-
-    public StudyNewRequest addSeasonsItem(String seasonsItem) {
-        if (this.seasons == null) {
-            this.seasons = new ArrayList<String>();
-        }
-        this.seasons.add(seasonsItem);
-        return this;
-    }
-
-    /**
-     * List of seasons over which this study was performed.
-     *
-     * @return seasons
-     **/
-    @Schema(example = "[\"Spring_2018\"]", description = "List of seasons over which this study was performed.")
-    public List<String> getSeasons() {
-        return seasons;
-    }
-
-    public void setSeasons(List<String> seasons) {
-        this.seasons = seasons;
-    }
-
-    public StudyNewRequest startDate(OffsetDateTime startDate) {
-        this.startDate = startDate;
-        return this;
-    }
-
-    /**
-     * The date this study started  MIAPPE V1.1 (DM-14) Start date of study - Date and, if relevant, time when the experiment started
-     *
-     * @return startDate
-     **/
-    @Schema(description = "The date this study started  MIAPPE V1.1 (DM-14) Start date of study - Date and, if relevant, time when the experiment started")
-    public OffsetDateTime getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(OffsetDateTime startDate) {
-        this.startDate = startDate;
-    }
-
-    public StudyNewRequest studyCode(String studyCode) {
-        this.studyCode = studyCode;
-        return this;
-    }
-
-    /**
-     * A short human readable code for a study
-     *
-     * @return studyCode
-     **/
-    @Schema(example = "Grape_Yield_Spring_2018", description = "A short human readable code for a study")
-    public String getStudyCode() {
-        return studyCode;
-    }
-
-    public void setStudyCode(String studyCode) {
-        this.studyCode = studyCode;
-    }
-
-    public StudyNewRequest studyDescription(String studyDescription) {
-        this.studyDescription = studyDescription;
-        return this;
-    }
-
-    /**
-     * The description of this study  MIAPPE V1.1 (DM-13) Study description - Human-readable text describing the study
-     *
-     * @return studyDescription
-     **/
-    @Schema(example = "This is a yield study for Spring 2018", description = "The description of this study  MIAPPE V1.1 (DM-13) Study description - Human-readable text describing the study")
-    public String getStudyDescription() {
-        return studyDescription;
-    }
-
-    public void setStudyDescription(String studyDescription) {
-        this.studyDescription = studyDescription;
-    }
-
-    public StudyNewRequest studyName(String studyName) {
-        this.studyName = studyName;
-        return this;
-    }
-
-    /**
-     * The human readable name for a study  MIAPPE V1.1 (DM-12) Study title - Human-readable text summarising the study
-     *
-     * @return studyName
-     **/
-    @Schema(example = "INRA's Walnut Genetic Resources Observation at Kenya", description = "The human readable name for a study  MIAPPE V1.1 (DM-12) Study title - Human-readable text summarising the study")
-    public String getStudyName() {
-        return studyName;
-    }
-
-    public void setStudyName(String studyName) {
-        this.studyName = studyName;
-    }
-
-    public StudyNewRequest studyPUI(String studyPUI) {
-        this.studyPUI = studyPUI;
-        return this;
-    }
-
-    /**
-     * A permanent unique identifier associated with this study data. For example, a URI or DOI
-     *
-     * @return studyPUI
-     **/
-    @Schema(example = "doi:10.155454/12349537312", description = "A permanent unique identifier associated with this study data. For example, a URI or DOI")
-    public String getStudyPUI() {
-        return studyPUI;
-    }
-
-    public void setStudyPUI(String studyPUI) {
-        this.studyPUI = studyPUI;
-    }
-
-    public StudyNewRequest studyType(String studyType) {
-        this.studyType = studyType;
-        return this;
-    }
-
-    /**
-     * The type of study being performed. ex. \&quot;Yield Trial\&quot;, etc
-     *
-     * @return studyType
-     **/
-    @Schema(example = "Phenotyping", description = "The type of study being performed. ex. \"Yield Trial\", etc")
-    public String getStudyType() {
-        return studyType;
-    }
-
-    public void setStudyType(String studyType) {
-        this.studyType = studyType;
-    }
-
-    public StudyNewRequest trialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial
-     *
-     * @return trialDbId
-     **/
-    @Schema(example = "48b327ea", description = "The ID which uniquely identifies a trial")
-    public String getTrialDbId() {
-        return trialDbId;
-    }
-
-    public void setTrialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-    }
-
-    public StudyNewRequest trialName(String trialName) {
-        this.trialName = trialName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial
-     *
-     * @return trialName
-     **/
-    @Schema(example = "Grape_Yield_Trial", description = "The human readable name of a trial")
-    public String getTrialName() {
-        return trialName;
-    }
-
-    public void setTrialName(String trialName) {
-        this.trialName = trialName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        StudyNewRequest studyNewRequest = (StudyNewRequest) o;
-        return Objects.equals(this.active, studyNewRequest.active) &&
-                Objects.equals(this.additionalInfo, studyNewRequest.additionalInfo) &&
-                Objects.equals(this.commonCropName, studyNewRequest.commonCropName) &&
-                Objects.equals(this.contacts, studyNewRequest.contacts) &&
-                Objects.equals(this.culturalPractices, studyNewRequest.culturalPractices) &&
-                Objects.equals(this.dataLinks, studyNewRequest.dataLinks) &&
-                Objects.equals(this.documentationURL, studyNewRequest.documentationURL) &&
-                Objects.equals(this.endDate, studyNewRequest.endDate) &&
-                Objects.equals(this.environmentParameters, studyNewRequest.environmentParameters) &&
-                Objects.equals(this.experimentalDesign, studyNewRequest.experimentalDesign) &&
-                Objects.equals(this.externalReferences, studyNewRequest.externalReferences) &&
-                Objects.equals(this.growthFacility, studyNewRequest.growthFacility) &&
-                Objects.equals(this.lastUpdate, studyNewRequest.lastUpdate) &&
-                Objects.equals(this.license, studyNewRequest.license) &&
-                Objects.equals(this.locationDbId, studyNewRequest.locationDbId) &&
-                Objects.equals(this.locationName, studyNewRequest.locationName) &&
-                Objects.equals(this.observationLevels, studyNewRequest.observationLevels) &&
-                Objects.equals(this.observationUnitsDescription, studyNewRequest.observationUnitsDescription) &&
-                Objects.equals(this.observationVariableDbIds, studyNewRequest.observationVariableDbIds) &&
-                Objects.equals(this.seasons, studyNewRequest.seasons) &&
-                Objects.equals(this.startDate, studyNewRequest.startDate) &&
-                Objects.equals(this.studyCode, studyNewRequest.studyCode) &&
-                Objects.equals(this.studyDescription, studyNewRequest.studyDescription) &&
-                Objects.equals(this.studyName, studyNewRequest.studyName) &&
-                Objects.equals(this.studyPUI, studyNewRequest.studyPUI) &&
-                Objects.equals(this.studyType, studyNewRequest.studyType) &&
-                Objects.equals(this.trialDbId, studyNewRequest.trialDbId) &&
-                Objects.equals(this.trialName, studyNewRequest.trialName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(active, additionalInfo, commonCropName, contacts, culturalPractices, dataLinks, documentationURL, endDate, environmentParameters, experimentalDesign, externalReferences, growthFacility, lastUpdate, license, locationDbId, locationName, observationLevels, observationUnitsDescription, observationVariableDbIds, seasons, startDate, studyCode, studyDescription, studyName, studyPUI, studyType, trialDbId, trialName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class StudyNewRequest {\n");
-
-        sb.append("    active: ").append(toIndentedString(active)).append("\n");
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    contacts: ").append(toIndentedString(contacts)).append("\n");
-        sb.append("    culturalPractices: ").append(toIndentedString(culturalPractices)).append("\n");
-        sb.append("    dataLinks: ").append(toIndentedString(dataLinks)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    endDate: ").append(toIndentedString(endDate)).append("\n");
-        sb.append("    environmentParameters: ").append(toIndentedString(environmentParameters)).append("\n");
-        sb.append("    experimentalDesign: ").append(toIndentedString(experimentalDesign)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    growthFacility: ").append(toIndentedString(growthFacility)).append("\n");
-        sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-        sb.append("    license: ").append(toIndentedString(license)).append("\n");
-        sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
-        sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
-        sb.append("    observationLevels: ").append(toIndentedString(observationLevels)).append("\n");
-        sb.append("    observationUnitsDescription: ").append(toIndentedString(observationUnitsDescription)).append("\n");
-        sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-        sb.append("    seasons: ").append(toIndentedString(seasons)).append("\n");
-        sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-        sb.append("    studyCode: ").append(toIndentedString(studyCode)).append("\n");
-        sb.append("    studyDescription: ").append(toIndentedString(studyDescription)).append("\n");
-        sb.append("    studyName: ").append(toIndentedString(studyName)).append("\n");
-        sb.append("    studyPUI: ").append(toIndentedString(studyPUI)).append("\n");
-        sb.append("    studyType: ").append(toIndentedString(studyType)).append("\n");
-        sb.append("    trialDbId: ").append(toIndentedString(trialDbId)).append("\n");
-        sb.append("    trialName: ").append(toIndentedString(trialName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudySearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudySearchRequest.java
deleted file mode 100644
index 661353ef..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudySearchRequest.java
+++ /dev/null
@@ -1,964 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * StudySearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class StudySearchRequest {
-    @SerializedName("active")
-    private Boolean active = null;
-
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("locationDbIds")
-    private List<String> locationDbIds = null;
-
-    @SerializedName("locationNames")
-    private List<String> locationNames = null;
-
-    @SerializedName("observationVariableDbIds")
-    private List<String> observationVariableDbIds = null;
-
-    @SerializedName("observationVariableNames")
-    private List<String> observationVariableNames = null;
-
-    @SerializedName("observationVariablePUIs")
-    private List<String> observationVariablePUIs = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("seasonDbIds")
-    private List<String> seasonDbIds = null;
-
-    /**
-     * Name of one of the fields within the study object on which results can be sorted
-     */
-    @JsonAdapter(SortByEnum.Adapter.class)
-    public enum SortByEnum {
-        STUDYDBID("studyDbId"),
-        TRIALDBID("trialDbId"),
-        PROGRAMDBID("programDbId"),
-        LOCATIONDBID("locationDbId"),
-        SEASONDBID("seasonDbId"),
-        STUDYTYPE("studyType"),
-        STUDYNAME("studyName"),
-        STUDYLOCATION("studyLocation"),
-        PROGRAMNAME("programName"),
-        GERMPLASMDBID("germplasmDbId"),
-        OBSERVATIONVARIABLEDBID("observationVariableDbId");
-
-        private String value;
-
-        SortByEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static SortByEnum fromValue(String input) {
-            for (SortByEnum b : SortByEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<SortByEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final SortByEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public SortByEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return SortByEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("sortBy")
-    private SortByEnum sortBy = null;
-
-    /**
-     * Order results should be sorted. ex. \&quot;ASC\&quot; or \&quot;DESC\&quot;
-     */
-    @JsonAdapter(SortOrderEnum.Adapter.class)
-    public enum SortOrderEnum {
-        ASC("ASC"),
-        DESC("DESC");
-
-        private String value;
-
-        SortOrderEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static SortOrderEnum fromValue(String input) {
-            for (SortOrderEnum b : SortOrderEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<SortOrderEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final SortOrderEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public SortOrderEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return SortOrderEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("sortOrder")
-    private SortOrderEnum sortOrder = null;
-
-    @SerializedName("studyCodes")
-    private List<String> studyCodes = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("studyPUIs")
-    private List<String> studyPUIs = null;
-
-    @SerializedName("studyTypes")
-    private List<String> studyTypes = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public StudySearchRequest active(Boolean active) {
-        this.active = active;
-        return this;
-    }
-
-    /**
-     * A flag to indicate if a Study is currently active and ongoing
-     *
-     * @return active
-     **/
-    @Schema(example = "true", description = "A flag to indicate if a Study is currently active and ongoing")
-    public Boolean isActive() {
-        return active;
-    }
-
-    public void setActive(Boolean active) {
-        this.active = active;
-    }
-
-    public StudySearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public StudySearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public StudySearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public StudySearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public StudySearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public StudySearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public StudySearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public StudySearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public StudySearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public StudySearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public StudySearchRequest germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public StudySearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public StudySearchRequest locationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-        return this;
-    }
-
-    public StudySearchRequest addLocationDbIdsItem(String locationDbIdsItem) {
-        if (this.locationDbIds == null) {
-            this.locationDbIds = new ArrayList<String>();
-        }
-        this.locationDbIds.add(locationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The location ids to search for
-     *
-     * @return locationDbIds
-     **/
-    @Schema(example = "[\"b28911cf\",\"5071d1e4\"]", description = "The location ids to search for")
-    public List<String> getLocationDbIds() {
-        return locationDbIds;
-    }
-
-    public void setLocationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-    }
-
-    public StudySearchRequest locationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-        return this;
-    }
-
-    public StudySearchRequest addLocationNamesItem(String locationNamesItem) {
-        if (this.locationNames == null) {
-            this.locationNames = new ArrayList<String>();
-        }
-        this.locationNames.add(locationNamesItem);
-        return this;
-    }
-
-    /**
-     * A human readable names to search for
-     *
-     * @return locationNames
-     **/
-    @Schema(example = "[\"Location Alpha\",\"The Large Hadron Collider\"]", description = "A human readable names to search for")
-    public List<String> getLocationNames() {
-        return locationNames;
-    }
-
-    public void setLocationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-    }
-
-    public StudySearchRequest observationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-        return this;
-    }
-
-    public StudySearchRequest addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-        if (this.observationVariableDbIds == null) {
-            this.observationVariableDbIds = new ArrayList<String>();
-        }
-        this.observationVariableDbIds.add(observationVariableDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The DbIds of Variables to search for
-     *
-     * @return observationVariableDbIds
-     **/
-    @Schema(example = "[\"a646187d\",\"6d23513b\"]", description = "The DbIds of Variables to search for")
-    public List<String> getObservationVariableDbIds() {
-        return observationVariableDbIds;
-    }
-
-    public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-    }
-
-    public StudySearchRequest observationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-        return this;
-    }
-
-    public StudySearchRequest addObservationVariableNamesItem(String observationVariableNamesItem) {
-        if (this.observationVariableNames == null) {
-            this.observationVariableNames = new ArrayList<String>();
-        }
-        this.observationVariableNames.add(observationVariableNamesItem);
-        return this;
-    }
-
-    /**
-     * The names of Variables to search for
-     *
-     * @return observationVariableNames
-     **/
-    @Schema(example = "[\"Plant Height in meters\",\"Wheat rust score 1-5\"]", description = "The names of Variables to search for")
-    public List<String> getObservationVariableNames() {
-        return observationVariableNames;
-    }
-
-    public void setObservationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-    }
-
-    public StudySearchRequest observationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-        return this;
-    }
-
-    public StudySearchRequest addObservationVariablePUIsItem(String observationVariablePUIsItem) {
-        if (this.observationVariablePUIs == null) {
-            this.observationVariablePUIs = new ArrayList<String>();
-        }
-        this.observationVariablePUIs.add(observationVariablePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI
-     *
-     * @return observationVariablePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008012\",\"http://my-traits.com/trait/CO_123:0007261\"]", description = "The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI")
-    public List<String> getObservationVariablePUIs() {
-        return observationVariablePUIs;
-    }
-
-    public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-    }
-
-    public StudySearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public StudySearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public StudySearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public StudySearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public StudySearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public StudySearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public StudySearchRequest seasonDbIds(List<String> seasonDbIds) {
-        this.seasonDbIds = seasonDbIds;
-        return this;
-    }
-
-    public StudySearchRequest addSeasonDbIdsItem(String seasonDbIdsItem) {
-        if (this.seasonDbIds == null) {
-            this.seasonDbIds = new ArrayList<String>();
-        }
-        this.seasonDbIds.add(seasonDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a season
-     *
-     * @return seasonDbIds
-     **/
-    @Schema(example = "[\"Harvest Two 2017\",\"Summer 2018\"]", description = "The ID which uniquely identifies a season")
-    public List<String> getSeasonDbIds() {
-        return seasonDbIds;
-    }
-
-    public void setSeasonDbIds(List<String> seasonDbIds) {
-        this.seasonDbIds = seasonDbIds;
-    }
-
-    public StudySearchRequest sortBy(SortByEnum sortBy) {
-        this.sortBy = sortBy;
-        return this;
-    }
-
-    /**
-     * Name of one of the fields within the study object on which results can be sorted
-     *
-     * @return sortBy
-     **/
-    @Schema(description = "Name of one of the fields within the study object on which results can be sorted")
-    public SortByEnum getSortBy() {
-        return sortBy;
-    }
-
-    public void setSortBy(SortByEnum sortBy) {
-        this.sortBy = sortBy;
-    }
-
-    public StudySearchRequest sortOrder(SortOrderEnum sortOrder) {
-        this.sortOrder = sortOrder;
-        return this;
-    }
-
-    /**
-     * Order results should be sorted. ex. \&quot;ASC\&quot; or \&quot;DESC\&quot;
-     *
-     * @return sortOrder
-     **/
-    @Schema(description = "Order results should be sorted. ex. \"ASC\" or \"DESC\"")
-    public SortOrderEnum getSortOrder() {
-        return sortOrder;
-    }
-
-    public void setSortOrder(SortOrderEnum sortOrder) {
-        this.sortOrder = sortOrder;
-    }
-
-    public StudySearchRequest studyCodes(List<String> studyCodes) {
-        this.studyCodes = studyCodes;
-        return this;
-    }
-
-    public StudySearchRequest addStudyCodesItem(String studyCodesItem) {
-        if (this.studyCodes == null) {
-            this.studyCodes = new ArrayList<String>();
-        }
-        this.studyCodes.add(studyCodesItem);
-        return this;
-    }
-
-    /**
-     * A short human readable code for a study
-     *
-     * @return studyCodes
-     **/
-    @Schema(example = "[\"Grape_Yield_Spring_2018\",\"Walnut_Kenya\"]", description = "A short human readable code for a study")
-    public List<String> getStudyCodes() {
-        return studyCodes;
-    }
-
-    public void setStudyCodes(List<String> studyCodes) {
-        this.studyCodes = studyCodes;
-    }
-
-    public StudySearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public StudySearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public StudySearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public StudySearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public StudySearchRequest studyPUIs(List<String> studyPUIs) {
-        this.studyPUIs = studyPUIs;
-        return this;
-    }
-
-    public StudySearchRequest addStudyPUIsItem(String studyPUIsItem) {
-        if (this.studyPUIs == null) {
-            this.studyPUIs = new ArrayList<String>();
-        }
-        this.studyPUIs.add(studyPUIsItem);
-        return this;
-    }
-
-    /**
-     * Permanent unique identifier associated with study data. For example, a URI or DOI
-     *
-     * @return studyPUIs
-     **/
-    @Schema(example = "[\"doi:10.155454/12349537312\",\"https://pui.per/d8dd35e1\"]", description = "Permanent unique identifier associated with study data. For example, a URI or DOI")
-    public List<String> getStudyPUIs() {
-        return studyPUIs;
-    }
-
-    public void setStudyPUIs(List<String> studyPUIs) {
-        this.studyPUIs = studyPUIs;
-    }
-
-    public StudySearchRequest studyTypes(List<String> studyTypes) {
-        this.studyTypes = studyTypes;
-        return this;
-    }
-
-    public StudySearchRequest addStudyTypesItem(String studyTypesItem) {
-        if (this.studyTypes == null) {
-            this.studyTypes = new ArrayList<String>();
-        }
-        this.studyTypes.add(studyTypesItem);
-        return this;
-    }
-
-    /**
-     * The type of study being performed. ex. \&quot;Yield Trial\&quot;, etc
-     *
-     * @return studyTypes
-     **/
-    @Schema(example = "[\"Yield Trial\",\"Disease Resistance Trial\"]", description = "The type of study being performed. ex. \"Yield Trial\", etc")
-    public List<String> getStudyTypes() {
-        return studyTypes;
-    }
-
-    public void setStudyTypes(List<String> studyTypes) {
-        this.studyTypes = studyTypes;
-    }
-
-    public StudySearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public StudySearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public StudySearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public StudySearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        StudySearchRequest studySearchRequest = (StudySearchRequest) o;
-        return Objects.equals(this.active, studySearchRequest.active) &&
-                Objects.equals(this.commonCropNames, studySearchRequest.commonCropNames) &&
-                Objects.equals(this.externalReferenceIDs, studySearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, studySearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, studySearchRequest.externalReferenceSources) &&
-                Objects.equals(this.germplasmDbIds, studySearchRequest.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, studySearchRequest.germplasmNames) &&
-                Objects.equals(this.locationDbIds, studySearchRequest.locationDbIds) &&
-                Objects.equals(this.locationNames, studySearchRequest.locationNames) &&
-                Objects.equals(this.observationVariableDbIds, studySearchRequest.observationVariableDbIds) &&
-                Objects.equals(this.observationVariableNames, studySearchRequest.observationVariableNames) &&
-                Objects.equals(this.observationVariablePUIs, studySearchRequest.observationVariablePUIs) &&
-                Objects.equals(this.page, studySearchRequest.page) &&
-                Objects.equals(this.pageSize, studySearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, studySearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, studySearchRequest.programNames) &&
-                Objects.equals(this.seasonDbIds, studySearchRequest.seasonDbIds) &&
-                Objects.equals(this.sortBy, studySearchRequest.sortBy) &&
-                Objects.equals(this.sortOrder, studySearchRequest.sortOrder) &&
-                Objects.equals(this.studyCodes, studySearchRequest.studyCodes) &&
-                Objects.equals(this.studyDbIds, studySearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, studySearchRequest.studyNames) &&
-                Objects.equals(this.studyPUIs, studySearchRequest.studyPUIs) &&
-                Objects.equals(this.studyTypes, studySearchRequest.studyTypes) &&
-                Objects.equals(this.trialDbIds, studySearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, studySearchRequest.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(active, commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds, germplasmNames, locationDbIds, locationNames, observationVariableDbIds, observationVariableNames, observationVariablePUIs, page, pageSize, programDbIds, programNames, seasonDbIds, sortBy, sortOrder, studyCodes, studyDbIds, studyNames, studyPUIs, studyTypes, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class StudySearchRequest {\n");
-
-        sb.append("    active: ").append(toIndentedString(active)).append("\n");
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-        sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-        sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-        sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
-        sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    seasonDbIds: ").append(toIndentedString(seasonDbIds)).append("\n");
-        sb.append("    sortBy: ").append(toIndentedString(sortBy)).append("\n");
-        sb.append("    sortOrder: ").append(toIndentedString(sortOrder)).append("\n");
-        sb.append("    studyCodes: ").append(toIndentedString(studyCodes)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    studyPUIs: ").append(toIndentedString(studyPUIs)).append("\n");
-        sb.append("    studyTypes: ").append(toIndentedString(studyTypes)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudySingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudySingleResponse.java
deleted file mode 100644
index bb03c593..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudySingleResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * StudySingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class StudySingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Study result = null;
-
-    public StudySingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public StudySingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public StudySingleResponse result(Study result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Study getResult() {
-        return result;
-    }
-
-    public void setResult(Study result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        StudySingleResponse studySingleResponse = (StudySingleResponse) o;
-        return Objects.equals(this._atContext, studySingleResponse._atContext) &&
-                Objects.equals(this.metadata, studySingleResponse.metadata) &&
-                Objects.equals(this.result, studySingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class StudySingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyTypesResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyTypesResponse.java
deleted file mode 100644
index f45d9902..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyTypesResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * StudyTypesResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class StudyTypesResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private StudyTypesResponseResult result = null;
-
-    public StudyTypesResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public StudyTypesResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public StudyTypesResponse result(StudyTypesResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public StudyTypesResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(StudyTypesResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        StudyTypesResponse studyTypesResponse = (StudyTypesResponse) o;
-        return Objects.equals(this._atContext, studyTypesResponse._atContext) &&
-                Objects.equals(this.metadata, studyTypesResponse.metadata) &&
-                Objects.equals(this.result, studyTypesResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class StudyTypesResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyTypesResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyTypesResponseResult.java
deleted file mode 100644
index 3bab257d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/StudyTypesResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * StudyTypesResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class StudyTypesResponseResult {
-    @SerializedName("data")
-    private List<String> data = new ArrayList<String>();
-
-    public StudyTypesResponseResult data(List<String> data) {
-        this.data = data;
-        return this;
-    }
-
-    public StudyTypesResponseResult addDataItem(String dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The list of all StudyTypes available on a given server.
-     *
-     * @return data
-     **/
-    @Schema(example = "[\"Crossing Nursery\",\"Yield study\"]", required = true, description = "The list of all StudyTypes available on a given server.")
-    public List<String> getData() {
-        return data;
-    }
-
-    public void setData(List<String> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        StudyTypesResponseResult studyTypesResponseResult = (StudyTypesResponseResult) o;
-        return Objects.equals(this.data, studyTypesResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class StudyTypesResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TokenPagination.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TokenPagination.java
deleted file mode 100644
index e598cd5f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TokenPagination.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The pagination object is applicable only when the payload contains a \&quot;data\&quot; key. It describes the pagination of the data contained in the \&quot;data\&quot; array, as a way to identify which subset of data is being returned.  &lt;br&gt;Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken to construct an additional query and move to the next or previous page respectively.
- */
-@Schema(description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The pagination object is applicable only when the payload contains a \"data\" key. It describes the pagination of the data contained in the \"data\" array, as a way to identify which subset of data is being returned.  <br>Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken to construct an additional query and move to the next or previous page respectively.  ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class TokenPagination {
-    @SerializedName("currentPage")
-    private Integer currentPage = 0;
-
-    @SerializedName("currentPageToken")
-    private String currentPageToken = null;
-
-    @SerializedName("nextPageToken")
-    private String nextPageToken = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = 1000;
-
-    @SerializedName("prevPageToken")
-    private String prevPageToken = null;
-
-    @SerializedName("totalCount")
-    private Integer totalCount = null;
-
-    @SerializedName("totalPages")
-    private Integer totalPages = null;
-
-    public TokenPagination currentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-        return this;
-    }
-
-    /**
-     * The index number for the returned page of data. This should always match the requested page number or the default page (0).
-     *
-     * @return currentPage
-     **/
-    @Schema(example = "0", description = "The index number for the returned page of data. This should always match the requested page number or the default page (0).")
-    public Integer getCurrentPage() {
-        return currentPage;
-    }
-
-    public void setCurrentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-    }
-
-    public TokenPagination currentPageToken(String currentPageToken) {
-        this.currentPageToken = currentPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the current page of data.
-     *
-     * @return currentPageToken
-     **/
-    @Schema(example = "48bc6ac1", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the current page of data.")
-    public String getCurrentPageToken() {
-        return currentPageToken;
-    }
-
-    public void setCurrentPageToken(String currentPageToken) {
-        this.currentPageToken = currentPageToken;
-    }
-
-    public TokenPagination nextPageToken(String nextPageToken) {
-        this.nextPageToken = nextPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the next page of data.
-     *
-     * @return nextPageToken
-     **/
-    @Schema(example = "cb668f63", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the next page of data.")
-    public String getNextPageToken() {
-        return nextPageToken;
-    }
-
-    public void setNextPageToken(String nextPageToken) {
-        this.nextPageToken = nextPageToken;
-    }
-
-    public TokenPagination pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public TokenPagination prevPageToken(String prevPageToken) {
-        this.prevPageToken = prevPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the previous page of data.
-     *
-     * @return prevPageToken
-     **/
-    @Schema(example = "9659857e", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the previous page of data.")
-    public String getPrevPageToken() {
-        return prevPageToken;
-    }
-
-    public void setPrevPageToken(String prevPageToken) {
-        this.prevPageToken = prevPageToken;
-    }
-
-    public TokenPagination totalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-        return this;
-    }
-
-    /**
-     * The total number of elements that are available on the server and match the requested query parameters.
-     *
-     * @return totalCount
-     **/
-    @Schema(example = "10", description = "The total number of elements that are available on the server and match the requested query parameters.")
-    public Integer getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public TokenPagination totalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-        return this;
-    }
-
-    /**
-     * The total number of pages of elements available on the server. This should be calculated with the following formula.  &lt;br&gt; totalPages &#x3D; CEILING( totalCount / requested_page_size)
-     *
-     * @return totalPages
-     **/
-    @Schema(example = "1", description = "The total number of pages of elements available on the server. This should be calculated with the following formula.  <br> totalPages = CEILING( totalCount / requested_page_size)")
-    public Integer getTotalPages() {
-        return totalPages;
-    }
-
-    public void setTotalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TokenPagination tokenPagination = (TokenPagination) o;
-        return Objects.equals(this.currentPage, tokenPagination.currentPage) &&
-                Objects.equals(this.currentPageToken, tokenPagination.currentPageToken) &&
-                Objects.equals(this.nextPageToken, tokenPagination.nextPageToken) &&
-                Objects.equals(this.pageSize, tokenPagination.pageSize) &&
-                Objects.equals(this.prevPageToken, tokenPagination.prevPageToken) &&
-                Objects.equals(this.totalCount, tokenPagination.totalCount) &&
-                Objects.equals(this.totalPages, tokenPagination.totalPages);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(currentPage, currentPageToken, nextPageToken, pageSize, prevPageToken, totalCount, totalPages);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TokenPagination {\n");
-
-        sb.append("    currentPage: ").append(toIndentedString(currentPage)).append("\n");
-        sb.append("    currentPageToken: ").append(toIndentedString(currentPageToken)).append("\n");
-        sb.append("    nextPageToken: ").append(toIndentedString(nextPageToken)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    prevPageToken: ").append(toIndentedString(prevPageToken)).append("\n");
-        sb.append("    totalCount: ").append(toIndentedString(totalCount)).append("\n");
-        sb.append("    totalPages: ").append(toIndentedString(totalPages)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Trait.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Trait.java
deleted file mode 100644
index 119d99d4..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Trait.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A Trait describes what property is being observed.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Trait \&quot;Leaf length\&quot; or \&quot;Flower height\&quot;.
- */
-@Schema(description = "A Trait describes what property is being observed.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Trait \"Leaf length\" or \"Flower height\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Trait {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("alternativeAbbreviations")
-    private List<String> alternativeAbbreviations = null;
-
-    @SerializedName("attribute")
-    private String attribute = null;
-
-    @SerializedName("attributePUI")
-    private String attributePUI = null;
-
-    @SerializedName("entity")
-    private String entity = null;
-
-    @SerializedName("entityPUI")
-    private String entityPUI = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("mainAbbreviation")
-    private String mainAbbreviation = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("traitClass")
-    private String traitClass = null;
-
-    @SerializedName("traitDbId")
-    private String traitDbId = null;
-
-    @SerializedName("traitDescription")
-    private String traitDescription = null;
-
-    @SerializedName("traitName")
-    private String traitName = null;
-
-    @SerializedName("traitPUI")
-    private String traitPUI = null;
-
-    public Trait additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Trait putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Trait alternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-        return this;
-    }
-
-    public Trait addAlternativeAbbreviationsItem(String alternativeAbbreviationsItem) {
-        if (this.alternativeAbbreviations == null) {
-            this.alternativeAbbreviations = new ArrayList<String>();
-        }
-        this.alternativeAbbreviations.add(alternativeAbbreviationsItem);
-        return this;
-    }
-
-    /**
-     * A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.
-     *
-     * @return alternativeAbbreviations
-     **/
-    @Schema(example = "[\"H\",\"PH\",\"H1\"]", description = "A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.")
-    public List<String> getAlternativeAbbreviations() {
-        return alternativeAbbreviations;
-    }
-
-    public void setAlternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-    }
-
-    public Trait attribute(String attribute) {
-        this.attribute = attribute;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attribute
-     **/
-    @Schema(example = "height", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    public Trait attributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attributePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PO:00012345", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttributePUI() {
-        return attributePUI;
-    }
-
-    public void setAttributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-    }
-
-    public Trait entity(String entity) {
-        this.entity = entity;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entity
-     **/
-    @Schema(example = "Stalk", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public String getEntity() {
-        return entity;
-    }
-
-    public void setEntity(String entity) {
-        this.entity = entity;
-    }
-
-    public Trait entityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A Trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the Entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entityPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PATO:00098765", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A Trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the Entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public String getEntityPUI() {
-        return entityPUI;
-    }
-
-    public void setEntityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-    }
-
-    public Trait externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Trait addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Trait mainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Trait
-     *
-     * @return mainAbbreviation
-     **/
-    @Schema(example = "PH", description = "A shortened version of the human readable name for a Trait")
-    public String getMainAbbreviation() {
-        return mainAbbreviation;
-    }
-
-    public void setMainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-    }
-
-    public Trait ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public Trait status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Trait status (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Trait status (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Trait synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public Trait addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other trait names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Height\",\"Plant Height\",\"Stalk Height\",\"Canopy Height\"]", description = "Other trait names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public Trait traitClass(String traitClass) {
-        this.traitClass = traitClass;
-        return this;
-    }
-
-    /**
-     * A classification to describe the type of trait and the context it should be considered in. &lt;br/&gt; examples- \&quot;morphological\&quot;, \&quot;phenological\&quot;, \&quot;agronomical\&quot;, \&quot;physiological\&quot;, \&quot;abiotic stress\&quot;, \&quot;biotic stress\&quot;, \&quot;biochemical\&quot;, \&quot;quality traits\&quot;, \&quot;fertility\&quot;, etc.
-     *
-     * @return traitClass
-     **/
-    @Schema(example = "phenological", description = "A classification to describe the type of trait and the context it should be considered in. <br/> examples- \"morphological\", \"phenological\", \"agronomical\", \"physiological\", \"abiotic stress\", \"biotic stress\", \"biochemical\", \"quality traits\", \"fertility\", etc.")
-    public String getTraitClass() {
-        return traitClass;
-    }
-
-    public void setTraitClass(String traitClass) {
-        this.traitClass = traitClass;
-    }
-
-    public Trait traitDbId(String traitDbId) {
-        this.traitDbId = traitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trait
-     *
-     * @return traitDbId
-     **/
-    @Schema(example = "9b2e34f5", description = "The ID which uniquely identifies a trait")
-    public String getTraitDbId() {
-        return traitDbId;
-    }
-
-    public void setTraitDbId(String traitDbId) {
-        this.traitDbId = traitDbId;
-    }
-
-    public Trait traitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-        return this;
-    }
-
-    /**
-     * The description of a trait
-     *
-     * @return traitDescription
-     **/
-    @Schema(example = "The height of the plant", description = "The description of a trait")
-    public String getTraitDescription() {
-        return traitDescription;
-    }
-
-    public void setTraitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-    }
-
-    public Trait traitName(String traitName) {
-        this.traitName = traitName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitName
-     **/
-    @Schema(example = "Height", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public String getTraitName() {
-        return traitName;
-    }
-
-    public void setTraitName(String traitName) {
-        this.traitName = traitName;
-    }
-
-    public Trait traitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000012", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public String getTraitPUI() {
-        return traitPUI;
-    }
-
-    public void setTraitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Trait trait = (Trait) o;
-        return Objects.equals(this.additionalInfo, trait.additionalInfo) &&
-                Objects.equals(this.alternativeAbbreviations, trait.alternativeAbbreviations) &&
-                Objects.equals(this.attribute, trait.attribute) &&
-                Objects.equals(this.attributePUI, trait.attributePUI) &&
-                Objects.equals(this.entity, trait.entity) &&
-                Objects.equals(this.entityPUI, trait.entityPUI) &&
-                Objects.equals(this.externalReferences, trait.externalReferences) &&
-                Objects.equals(this.mainAbbreviation, trait.mainAbbreviation) &&
-                Objects.equals(this.ontologyReference, trait.ontologyReference) &&
-                Objects.equals(this.status, trait.status) &&
-                Objects.equals(this.synonyms, trait.synonyms) &&
-                Objects.equals(this.traitClass, trait.traitClass) &&
-                Objects.equals(this.traitDbId, trait.traitDbId) &&
-                Objects.equals(this.traitDescription, trait.traitDescription) &&
-                Objects.equals(this.traitName, trait.traitName) &&
-                Objects.equals(this.traitPUI, trait.traitPUI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, alternativeAbbreviations, attribute, attributePUI, entity, entityPUI, externalReferences, mainAbbreviation, ontologyReference, status, synonyms, traitClass, traitDbId, traitDescription, traitName, traitPUI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Trait {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    alternativeAbbreviations: ").append(toIndentedString(alternativeAbbreviations)).append("\n");
-        sb.append("    attribute: ").append(toIndentedString(attribute)).append("\n");
-        sb.append("    attributePUI: ").append(toIndentedString(attributePUI)).append("\n");
-        sb.append("    entity: ").append(toIndentedString(entity)).append("\n");
-        sb.append("    entityPUI: ").append(toIndentedString(entityPUI)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    mainAbbreviation: ").append(toIndentedString(mainAbbreviation)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    traitClass: ").append(toIndentedString(traitClass)).append("\n");
-        sb.append("    traitDbId: ").append(toIndentedString(traitDbId)).append("\n");
-        sb.append("    traitDescription: ").append(toIndentedString(traitDescription)).append("\n");
-        sb.append("    traitName: ").append(toIndentedString(traitName)).append("\n");
-        sb.append("    traitPUI: ").append(toIndentedString(traitPUI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitBaseClass.java
deleted file mode 100644
index 0a87732c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitBaseClass.java
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A Trait describes what property is being observed.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Trait \&quot;Leaf length\&quot; or \&quot;Flower height\&quot;.
- */
-@Schema(description = "A Trait describes what property is being observed.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Trait \"Leaf length\" or \"Flower height\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class TraitBaseClass {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("alternativeAbbreviations")
-    private List<String> alternativeAbbreviations = null;
-
-    @SerializedName("attribute")
-    private String attribute = null;
-
-    @SerializedName("attributePUI")
-    private String attributePUI = null;
-
-    @SerializedName("entity")
-    private String entity = null;
-
-    @SerializedName("entityPUI")
-    private String entityPUI = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("mainAbbreviation")
-    private String mainAbbreviation = null;
-
-    @SerializedName("ontologyReference")
-    private MethodBaseClassOntologyReference ontologyReference = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("traitClass")
-    private String traitClass = null;
-
-    @SerializedName("traitDescription")
-    private String traitDescription = null;
-
-    @SerializedName("traitName")
-    private String traitName = null;
-
-    @SerializedName("traitPUI")
-    private String traitPUI = null;
-
-    public TraitBaseClass additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public TraitBaseClass putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public TraitBaseClass alternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-        return this;
-    }
-
-    public TraitBaseClass addAlternativeAbbreviationsItem(String alternativeAbbreviationsItem) {
-        if (this.alternativeAbbreviations == null) {
-            this.alternativeAbbreviations = new ArrayList<String>();
-        }
-        this.alternativeAbbreviations.add(alternativeAbbreviationsItem);
-        return this;
-    }
-
-    /**
-     * A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.
-     *
-     * @return alternativeAbbreviations
-     **/
-    @Schema(example = "[\"H\",\"PH\",\"H1\"]", description = "A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.")
-    public List<String> getAlternativeAbbreviations() {
-        return alternativeAbbreviations;
-    }
-
-    public void setAlternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-    }
-
-    public TraitBaseClass attribute(String attribute) {
-        this.attribute = attribute;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attribute
-     **/
-    @Schema(example = "height", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    public TraitBaseClass attributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attributePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PO:00012345", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttributePUI() {
-        return attributePUI;
-    }
-
-    public void setAttributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-    }
-
-    public TraitBaseClass entity(String entity) {
-        this.entity = entity;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entity
-     **/
-    @Schema(example = "Stalk", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public String getEntity() {
-        return entity;
-    }
-
-    public void setEntity(String entity) {
-        this.entity = entity;
-    }
-
-    public TraitBaseClass entityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A Trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the Entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entityPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PATO:00098765", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A Trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the Entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public String getEntityPUI() {
-        return entityPUI;
-    }
-
-    public void setEntityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-    }
-
-    public TraitBaseClass externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public TraitBaseClass addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public TraitBaseClass mainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Trait
-     *
-     * @return mainAbbreviation
-     **/
-    @Schema(example = "PH", description = "A shortened version of the human readable name for a Trait")
-    public String getMainAbbreviation() {
-        return mainAbbreviation;
-    }
-
-    public void setMainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-    }
-
-    public TraitBaseClass ontologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodBaseClassOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public TraitBaseClass status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Trait status (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Trait status (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public TraitBaseClass synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public TraitBaseClass addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other trait names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Height\",\"Plant Height\",\"Stalk Height\",\"Canopy Height\"]", description = "Other trait names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public TraitBaseClass traitClass(String traitClass) {
-        this.traitClass = traitClass;
-        return this;
-    }
-
-    /**
-     * A classification to describe the type of trait and the context it should be considered in. &lt;br/&gt; examples- \&quot;morphological\&quot;, \&quot;phenological\&quot;, \&quot;agronomical\&quot;, \&quot;physiological\&quot;, \&quot;abiotic stress\&quot;, \&quot;biotic stress\&quot;, \&quot;biochemical\&quot;, \&quot;quality traits\&quot;, \&quot;fertility\&quot;, etc.
-     *
-     * @return traitClass
-     **/
-    @Schema(example = "phenological", description = "A classification to describe the type of trait and the context it should be considered in. <br/> examples- \"morphological\", \"phenological\", \"agronomical\", \"physiological\", \"abiotic stress\", \"biotic stress\", \"biochemical\", \"quality traits\", \"fertility\", etc.")
-    public String getTraitClass() {
-        return traitClass;
-    }
-
-    public void setTraitClass(String traitClass) {
-        this.traitClass = traitClass;
-    }
-
-    public TraitBaseClass traitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-        return this;
-    }
-
-    /**
-     * The description of a trait
-     *
-     * @return traitDescription
-     **/
-    @Schema(example = "The height of the plant", description = "The description of a trait")
-    public String getTraitDescription() {
-        return traitDescription;
-    }
-
-    public void setTraitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-    }
-
-    public TraitBaseClass traitName(String traitName) {
-        this.traitName = traitName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitName
-     **/
-    @Schema(example = "Height", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public String getTraitName() {
-        return traitName;
-    }
-
-    public void setTraitName(String traitName) {
-        this.traitName = traitName;
-    }
-
-    public TraitBaseClass traitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000012", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public String getTraitPUI() {
-        return traitPUI;
-    }
-
-    public void setTraitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TraitBaseClass traitBaseClass = (TraitBaseClass) o;
-        return Objects.equals(this.additionalInfo, traitBaseClass.additionalInfo) &&
-                Objects.equals(this.alternativeAbbreviations, traitBaseClass.alternativeAbbreviations) &&
-                Objects.equals(this.attribute, traitBaseClass.attribute) &&
-                Objects.equals(this.attributePUI, traitBaseClass.attributePUI) &&
-                Objects.equals(this.entity, traitBaseClass.entity) &&
-                Objects.equals(this.entityPUI, traitBaseClass.entityPUI) &&
-                Objects.equals(this.externalReferences, traitBaseClass.externalReferences) &&
-                Objects.equals(this.mainAbbreviation, traitBaseClass.mainAbbreviation) &&
-                Objects.equals(this.ontologyReference, traitBaseClass.ontologyReference) &&
-                Objects.equals(this.status, traitBaseClass.status) &&
-                Objects.equals(this.synonyms, traitBaseClass.synonyms) &&
-                Objects.equals(this.traitClass, traitBaseClass.traitClass) &&
-                Objects.equals(this.traitDescription, traitBaseClass.traitDescription) &&
-                Objects.equals(this.traitName, traitBaseClass.traitName) &&
-                Objects.equals(this.traitPUI, traitBaseClass.traitPUI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, alternativeAbbreviations, attribute, attributePUI, entity, entityPUI, externalReferences, mainAbbreviation, ontologyReference, status, synonyms, traitClass, traitDescription, traitName, traitPUI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TraitBaseClass {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    alternativeAbbreviations: ").append(toIndentedString(alternativeAbbreviations)).append("\n");
-        sb.append("    attribute: ").append(toIndentedString(attribute)).append("\n");
-        sb.append("    attributePUI: ").append(toIndentedString(attributePUI)).append("\n");
-        sb.append("    entity: ").append(toIndentedString(entity)).append("\n");
-        sb.append("    entityPUI: ").append(toIndentedString(entityPUI)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    mainAbbreviation: ").append(toIndentedString(mainAbbreviation)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    traitClass: ").append(toIndentedString(traitClass)).append("\n");
-        sb.append("    traitDescription: ").append(toIndentedString(traitDescription)).append("\n");
-        sb.append("    traitName: ").append(toIndentedString(traitName)).append("\n");
-        sb.append("    traitPUI: ").append(toIndentedString(traitPUI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitDataType.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitDataType.java
deleted file mode 100644
index 74e8e7ae..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitDataType.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-/**
- * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
- */
-@JsonAdapter(TraitDataType.Adapter.class)
-public enum TraitDataType {
-    CODE("Code"),
-    DATE("Date"),
-    DURATION("Duration"),
-    NOMINAL("Nominal"),
-    NUMERICAL("Numerical"),
-    ORDINAL("Ordinal"),
-    TEXT("Text");
-
-    private final String value;
-
-    TraitDataType(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    public static TraitDataType fromValue(String input) {
-        for (TraitDataType b : TraitDataType.values()) {
-            if (b.value.equals(input)) {
-                return b;
-            }
-        }
-        return null;
-    }
-
-    public static class Adapter extends TypeAdapter<TraitDataType> {
-        @Override
-        public void write(final JsonWriter jsonWriter, final TraitDataType enumeration) throws IOException {
-            jsonWriter.value(String.valueOf(enumeration.getValue()));
-        }
-
-        @Override
-        public TraitDataType read(final JsonReader jsonReader) throws IOException {
-            Object value = jsonReader.nextString();
-            return TraitDataType.fromValue((String) (value));
-        }
-    }
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitListResponse.java
deleted file mode 100644
index 3fbf9de7..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * TraitListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class TraitListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private TraitListResponseResult result = null;
-
-    public TraitListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public TraitListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public TraitListResponse result(TraitListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public TraitListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(TraitListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TraitListResponse traitListResponse = (TraitListResponse) o;
-        return Objects.equals(this._atContext, traitListResponse._atContext) &&
-                Objects.equals(this.metadata, traitListResponse.metadata) &&
-                Objects.equals(this.result, traitListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TraitListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitListResponseResult.java
deleted file mode 100644
index 533bb996..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * TraitListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class TraitListResponseResult {
-    @SerializedName("data")
-    private List<Trait> data = new ArrayList<Trait>();
-
-    public TraitListResponseResult data(List<Trait> data) {
-        this.data = data;
-        return this;
-    }
-
-    public TraitListResponseResult addDataItem(Trait dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Trait> getData() {
-        return data;
-    }
-
-    public void setData(List<Trait> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TraitListResponseResult traitListResponseResult = (TraitListResponseResult) o;
-        return Objects.equals(this.data, traitListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TraitListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitNewRequest.java
deleted file mode 100644
index 6273ddc8..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitNewRequest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import java.util.Objects;
-
-/**
- * TraitNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class TraitNewRequest {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash();
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TraitNewRequest {\n");
-
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitSingleResponse.java
deleted file mode 100644
index 545936a9..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TraitSingleResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * TraitSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class TraitSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Trait result = null;
-
-    public TraitSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public TraitSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public TraitSingleResponse result(Trait result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Trait getResult() {
-        return result;
-    }
-
-    public void setResult(Trait result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TraitSingleResponse traitSingleResponse = (TraitSingleResponse) o;
-        return Objects.equals(this._atContext, traitSingleResponse._atContext) &&
-                Objects.equals(this.metadata, traitSingleResponse.metadata) &&
-                Objects.equals(this.result, traitSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TraitSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Trial.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Trial.java
deleted file mode 100644
index d51fe5af..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/Trial.java
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.LocalDate;
-
-import java.util.*;
-
-/**
- * Trial
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class Trial {
-    @SerializedName("active")
-    private Boolean active = null;
-
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("contacts")
-    private List<StudyContacts> contacts = null;
-
-    @SerializedName("datasetAuthorships")
-    private List<TrialDatasetAuthorships> datasetAuthorships = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("endDate")
-    private LocalDate endDate = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("programDbId")
-    private String programDbId = null;
-
-    @SerializedName("programName")
-    private String programName = null;
-
-    @SerializedName("publications")
-    private List<TrialPublications> publications = null;
-
-    @SerializedName("startDate")
-    private LocalDate startDate = null;
-
-    @SerializedName("trialDbId")
-    private String trialDbId = null;
-
-    @SerializedName("trialDescription")
-    private String trialDescription = null;
-
-    @SerializedName("trialName")
-    private String trialName = null;
-
-    @SerializedName("trialPUI")
-    private String trialPUI = null;
-
-    public Trial active(Boolean active) {
-        this.active = active;
-        return this;
-    }
-
-    /**
-     * A flag to indicate if a Trial is currently active and ongoing
-     *
-     * @return active
-     **/
-    @Schema(example = "true", description = "A flag to indicate if a Trial is currently active and ongoing")
-    public Boolean isActive() {
-        return active;
-    }
-
-    public void setActive(Boolean active) {
-        this.active = active;
-    }
-
-    public Trial additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Trial putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Trial commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Common name for the crop associated with this trial
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Wheat", description = "Common name for the crop associated with this trial")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public Trial contacts(List<StudyContacts> contacts) {
-        this.contacts = contacts;
-        return this;
-    }
-
-    public Trial addContactsItem(StudyContacts contactsItem) {
-        if (this.contacts == null) {
-            this.contacts = new ArrayList<StudyContacts>();
-        }
-        this.contacts.add(contactsItem);
-        return this;
-    }
-
-    /**
-     * List of contact entities associated with this trial
-     *
-     * @return contacts
-     **/
-    @Schema(description = "List of contact entities associated with this trial")
-    public List<StudyContacts> getContacts() {
-        return contacts;
-    }
-
-    public void setContacts(List<StudyContacts> contacts) {
-        this.contacts = contacts;
-    }
-
-    public Trial datasetAuthorships(List<TrialDatasetAuthorships> datasetAuthorships) {
-        this.datasetAuthorships = datasetAuthorships;
-        return this;
-    }
-
-    public Trial addDatasetAuthorshipsItem(TrialDatasetAuthorships datasetAuthorshipsItem) {
-        if (this.datasetAuthorships == null) {
-            this.datasetAuthorships = new ArrayList<TrialDatasetAuthorships>();
-        }
-        this.datasetAuthorships.add(datasetAuthorshipsItem);
-        return this;
-    }
-
-    /**
-     * License and citation information for the data in this trial
-     *
-     * @return datasetAuthorships
-     **/
-    @Schema(description = "License and citation information for the data in this trial")
-    public List<TrialDatasetAuthorships> getDatasetAuthorships() {
-        return datasetAuthorships;
-    }
-
-    public void setDatasetAuthorships(List<TrialDatasetAuthorships> datasetAuthorships) {
-        this.datasetAuthorships = datasetAuthorships;
-    }
-
-    public Trial documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public Trial endDate(LocalDate endDate) {
-        this.endDate = endDate;
-        return this;
-    }
-
-    /**
-     * The date this trial ends
-     *
-     * @return endDate
-     **/
-    @Schema(description = "The date this trial ends")
-    public LocalDate getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(LocalDate endDate) {
-        this.endDate = endDate;
-    }
-
-    public Trial externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Trial addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Trial programDbId(String programDbId) {
-        this.programDbId = programDbId;
-        return this;
-    }
-
-    /**
-     * A program identifier to search for
-     *
-     * @return programDbId
-     **/
-    @Schema(example = "673f378a", description = "A program identifier to search for")
-    public String getProgramDbId() {
-        return programDbId;
-    }
-
-    public void setProgramDbId(String programDbId) {
-        this.programDbId = programDbId;
-    }
-
-    public Trial programName(String programName) {
-        this.programName = programName;
-        return this;
-    }
-
-    /**
-     * Human readable name of the program
-     *
-     * @return programName
-     **/
-    @Schema(example = "Tomatillo_Breeding_Program", description = "Human readable name of the program")
-    public String getProgramName() {
-        return programName;
-    }
-
-    public void setProgramName(String programName) {
-        this.programName = programName;
-    }
-
-    public Trial publications(List<TrialPublications> publications) {
-        this.publications = publications;
-        return this;
-    }
-
-    public Trial addPublicationsItem(TrialPublications publicationsItem) {
-        if (this.publications == null) {
-            this.publications = new ArrayList<TrialPublications>();
-        }
-        this.publications.add(publicationsItem);
-        return this;
-    }
-
-    /**
-     * MIAPPE V1.1 (DM-9) Associated publication - An identifier for a literature publication where the investigation is described. Use of DOIs is recommended.
-     *
-     * @return publications
-     **/
-    @Schema(description = "MIAPPE V1.1 (DM-9) Associated publication - An identifier for a literature publication where the investigation is described. Use of DOIs is recommended.")
-    public List<TrialPublications> getPublications() {
-        return publications;
-    }
-
-    public void setPublications(List<TrialPublications> publications) {
-        this.publications = publications;
-    }
-
-    public Trial startDate(LocalDate startDate) {
-        this.startDate = startDate;
-        return this;
-    }
-
-    /**
-     * The date this trial started
-     *
-     * @return startDate
-     **/
-    @Schema(description = "The date this trial started")
-    public LocalDate getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(LocalDate startDate) {
-        this.startDate = startDate;
-    }
-
-    public Trial trialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial  MIAPPE V1.1 (DM-2) Investigation unique ID - Identifier comprising the unique name of the institution/database hosting the submission of the investigation data, and the accession number of the investigation in that institution.
-     *
-     * @return trialDbId
-     **/
-    @Schema(example = "1883b402", description = "The ID which uniquely identifies a trial  MIAPPE V1.1 (DM-2) Investigation unique ID - Identifier comprising the unique name of the institution/database hosting the submission of the investigation data, and the accession number of the investigation in that institution.")
-    public String getTrialDbId() {
-        return trialDbId;
-    }
-
-    public void setTrialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-    }
-
-    public Trial trialDescription(String trialDescription) {
-        this.trialDescription = trialDescription;
-        return this;
-    }
-
-    /**
-     * The human readable description of a trial  MIAPPE V1.1 (DM-4) Investigation description - Human-readable text describing the investigation in more detail.
-     *
-     * @return trialDescription
-     **/
-    @Schema(example = "General drought resistance trial initiated in Peru before duplication in Africa", description = "The human readable description of a trial  MIAPPE V1.1 (DM-4) Investigation description - Human-readable text describing the investigation in more detail.")
-    public String getTrialDescription() {
-        return trialDescription;
-    }
-
-    public void setTrialDescription(String trialDescription) {
-        this.trialDescription = trialDescription;
-    }
-
-    public Trial trialName(String trialName) {
-        this.trialName = trialName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial  MIAPPE V1.1 (DM-3) Investigation title - Human-readable string summarising the investigation.
-     *
-     * @return trialName
-     **/
-    @Schema(example = "Peru Yield Trial 1", description = "The human readable name of a trial  MIAPPE V1.1 (DM-3) Investigation title - Human-readable string summarising the investigation.")
-    public String getTrialName() {
-        return trialName;
-    }
-
-    public void setTrialName(String trialName) {
-        this.trialName = trialName;
-    }
-
-    public Trial trialPUI(String trialPUI) {
-        this.trialPUI = trialPUI;
-        return this;
-    }
-
-    /**
-     * A permanent identifier for a trial. Could be DOI or other URI formatted identifier.
-     *
-     * @return trialPUI
-     **/
-    @Schema(example = "https://doi.org/101093190", description = "A permanent identifier for a trial. Could be DOI or other URI formatted identifier.")
-    public String getTrialPUI() {
-        return trialPUI;
-    }
-
-    public void setTrialPUI(String trialPUI) {
-        this.trialPUI = trialPUI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Trial trial = (Trial) o;
-        return Objects.equals(this.active, trial.active) &&
-                Objects.equals(this.additionalInfo, trial.additionalInfo) &&
-                Objects.equals(this.commonCropName, trial.commonCropName) &&
-                Objects.equals(this.contacts, trial.contacts) &&
-                Objects.equals(this.datasetAuthorships, trial.datasetAuthorships) &&
-                Objects.equals(this.documentationURL, trial.documentationURL) &&
-                Objects.equals(this.endDate, trial.endDate) &&
-                Objects.equals(this.externalReferences, trial.externalReferences) &&
-                Objects.equals(this.programDbId, trial.programDbId) &&
-                Objects.equals(this.programName, trial.programName) &&
-                Objects.equals(this.publications, trial.publications) &&
-                Objects.equals(this.startDate, trial.startDate) &&
-                Objects.equals(this.trialDbId, trial.trialDbId) &&
-                Objects.equals(this.trialDescription, trial.trialDescription) &&
-                Objects.equals(this.trialName, trial.trialName) &&
-                Objects.equals(this.trialPUI, trial.trialPUI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(active, additionalInfo, commonCropName, contacts, datasetAuthorships, documentationURL, endDate, externalReferences, programDbId, programName, publications, startDate, trialDbId, trialDescription, trialName, trialPUI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Trial {\n");
-
-        sb.append("    active: ").append(toIndentedString(active)).append("\n");
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    contacts: ").append(toIndentedString(contacts)).append("\n");
-        sb.append("    datasetAuthorships: ").append(toIndentedString(datasetAuthorships)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    endDate: ").append(toIndentedString(endDate)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-        sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
-        sb.append("    publications: ").append(toIndentedString(publications)).append("\n");
-        sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-        sb.append("    trialDbId: ").append(toIndentedString(trialDbId)).append("\n");
-        sb.append("    trialDescription: ").append(toIndentedString(trialDescription)).append("\n");
-        sb.append("    trialName: ").append(toIndentedString(trialName)).append("\n");
-        sb.append("    trialPUI: ").append(toIndentedString(trialPUI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialDatasetAuthorships.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialDatasetAuthorships.java
deleted file mode 100644
index c4c60592..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialDatasetAuthorships.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.LocalDate;
-
-import java.util.Objects;
-
-/**
- * TrialDatasetAuthorships
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class TrialDatasetAuthorships {
-    @SerializedName("datasetPUI")
-    private String datasetPUI = null;
-
-    @SerializedName("license")
-    private String license = null;
-
-    @SerializedName("publicReleaseDate")
-    private LocalDate publicReleaseDate = null;
-
-    @SerializedName("submissionDate")
-    private LocalDate submissionDate = null;
-
-    public TrialDatasetAuthorships datasetPUI(String datasetPUI) {
-        this.datasetPUI = datasetPUI;
-        return this;
-    }
-
-    /**
-     * The DOI or other permanent unique idenifier for this published dataset
-     *
-     * @return datasetPUI
-     **/
-    @Schema(example = "doi:10.15454/312953986E3", description = "The DOI or other permanent unique idenifier for this published dataset")
-    public String getDatasetPUI() {
-        return datasetPUI;
-    }
-
-    public void setDatasetPUI(String datasetPUI) {
-        this.datasetPUI = datasetPUI;
-    }
-
-    public TrialDatasetAuthorships license(String license) {
-        this.license = license;
-        return this;
-    }
-
-    /**
-     * MIAPPE V1.1 (DM-7) License - License for the reuse of the data associated with this investigation. The Creative Commons licenses cover most use cases and are recommended.
-     *
-     * @return license
-     **/
-    @Schema(example = "https://CreativeCommons.org/licenses/by/4.0", description = "MIAPPE V1.1 (DM-7) License - License for the reuse of the data associated with this investigation. The Creative Commons licenses cover most use cases and are recommended.")
-    public String getLicense() {
-        return license;
-    }
-
-    public void setLicense(String license) {
-        this.license = license;
-    }
-
-    public TrialDatasetAuthorships publicReleaseDate(LocalDate publicReleaseDate) {
-        this.publicReleaseDate = publicReleaseDate;
-        return this;
-    }
-
-    /**
-     * MIAPPE V1.1 (DM-6) Public release date - Date of first public release of the dataset presently being described.
-     *
-     * @return publicReleaseDate
-     **/
-    @Schema(description = "MIAPPE V1.1 (DM-6) Public release date - Date of first public release of the dataset presently being described.")
-    public LocalDate getPublicReleaseDate() {
-        return publicReleaseDate;
-    }
-
-    public void setPublicReleaseDate(LocalDate publicReleaseDate) {
-        this.publicReleaseDate = publicReleaseDate;
-    }
-
-    public TrialDatasetAuthorships submissionDate(LocalDate submissionDate) {
-        this.submissionDate = submissionDate;
-        return this;
-    }
-
-    /**
-     * MIAPPE V1.1 (DM-5) Submission date - Date of submission of the dataset presently being described to a host repository.
-     *
-     * @return submissionDate
-     **/
-    @Schema(description = "MIAPPE V1.1 (DM-5) Submission date - Date of submission of the dataset presently being described to a host repository.")
-    public LocalDate getSubmissionDate() {
-        return submissionDate;
-    }
-
-    public void setSubmissionDate(LocalDate submissionDate) {
-        this.submissionDate = submissionDate;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TrialDatasetAuthorships trialDatasetAuthorships = (TrialDatasetAuthorships) o;
-        return Objects.equals(this.datasetPUI, trialDatasetAuthorships.datasetPUI) &&
-                Objects.equals(this.license, trialDatasetAuthorships.license) &&
-                Objects.equals(this.publicReleaseDate, trialDatasetAuthorships.publicReleaseDate) &&
-                Objects.equals(this.submissionDate, trialDatasetAuthorships.submissionDate);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(datasetPUI, license, publicReleaseDate, submissionDate);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TrialDatasetAuthorships {\n");
-
-        sb.append("    datasetPUI: ").append(toIndentedString(datasetPUI)).append("\n");
-        sb.append("    license: ").append(toIndentedString(license)).append("\n");
-        sb.append("    publicReleaseDate: ").append(toIndentedString(publicReleaseDate)).append("\n");
-        sb.append("    submissionDate: ").append(toIndentedString(submissionDate)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialListResponse.java
deleted file mode 100644
index 9d68a37f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialListResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * TrialListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class TrialListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private TrialListResponseResult result = null;
-
-    public TrialListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public TrialListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public TrialListResponse result(TrialListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public TrialListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(TrialListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TrialListResponse trialListResponse = (TrialListResponse) o;
-        return Objects.equals(this._atContext, trialListResponse._atContext) &&
-                Objects.equals(this.metadata, trialListResponse.metadata) &&
-                Objects.equals(this.result, trialListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TrialListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialListResponseResult.java
deleted file mode 100644
index dce7a606..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * TrialListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class TrialListResponseResult {
-    @SerializedName("data")
-    private List<Trial> data = new ArrayList<Trial>();
-
-    public TrialListResponseResult data(List<Trial> data) {
-        this.data = data;
-        return this;
-    }
-
-    public TrialListResponseResult addDataItem(Trial dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Trial> getData() {
-        return data;
-    }
-
-    public void setData(List<Trial> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TrialListResponseResult trialListResponseResult = (TrialListResponseResult) o;
-        return Objects.equals(this.data, trialListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TrialListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialNewRequest.java
deleted file mode 100644
index 9949f98b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialNewRequest.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.LocalDate;
-
-import java.util.*;
-
-/**
- * TrialNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class TrialNewRequest {
-    @SerializedName("active")
-    private Boolean active = null;
-
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("contacts")
-    private List<StudyContacts> contacts = null;
-
-    @SerializedName("datasetAuthorships")
-    private List<TrialDatasetAuthorships> datasetAuthorships = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("endDate")
-    private LocalDate endDate = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("programDbId")
-    private String programDbId = null;
-
-    @SerializedName("programName")
-    private String programName = null;
-
-    @SerializedName("publications")
-    private List<TrialPublications> publications = null;
-
-    @SerializedName("startDate")
-    private LocalDate startDate = null;
-
-    @SerializedName("trialDescription")
-    private String trialDescription = null;
-
-    @SerializedName("trialName")
-    private String trialName = null;
-
-    @SerializedName("trialPUI")
-    private String trialPUI = null;
-
-    public TrialNewRequest active(Boolean active) {
-        this.active = active;
-        return this;
-    }
-
-    /**
-     * A flag to indicate if a Trial is currently active and ongoing
-     *
-     * @return active
-     **/
-    @Schema(example = "true", description = "A flag to indicate if a Trial is currently active and ongoing")
-    public Boolean isActive() {
-        return active;
-    }
-
-    public void setActive(Boolean active) {
-        this.active = active;
-    }
-
-    public TrialNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public TrialNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public TrialNewRequest commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Common name for the crop associated with this trial
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Wheat", description = "Common name for the crop associated with this trial")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public TrialNewRequest contacts(List<StudyContacts> contacts) {
-        this.contacts = contacts;
-        return this;
-    }
-
-    public TrialNewRequest addContactsItem(StudyContacts contactsItem) {
-        if (this.contacts == null) {
-            this.contacts = new ArrayList<StudyContacts>();
-        }
-        this.contacts.add(contactsItem);
-        return this;
-    }
-
-    /**
-     * List of contact entities associated with this trial
-     *
-     * @return contacts
-     **/
-    @Schema(description = "List of contact entities associated with this trial")
-    public List<StudyContacts> getContacts() {
-        return contacts;
-    }
-
-    public void setContacts(List<StudyContacts> contacts) {
-        this.contacts = contacts;
-    }
-
-    public TrialNewRequest datasetAuthorships(List<TrialDatasetAuthorships> datasetAuthorships) {
-        this.datasetAuthorships = datasetAuthorships;
-        return this;
-    }
-
-    public TrialNewRequest addDatasetAuthorshipsItem(TrialDatasetAuthorships datasetAuthorshipsItem) {
-        if (this.datasetAuthorships == null) {
-            this.datasetAuthorships = new ArrayList<TrialDatasetAuthorships>();
-        }
-        this.datasetAuthorships.add(datasetAuthorshipsItem);
-        return this;
-    }
-
-    /**
-     * License and citation information for the data in this trial
-     *
-     * @return datasetAuthorships
-     **/
-    @Schema(description = "License and citation information for the data in this trial")
-    public List<TrialDatasetAuthorships> getDatasetAuthorships() {
-        return datasetAuthorships;
-    }
-
-    public void setDatasetAuthorships(List<TrialDatasetAuthorships> datasetAuthorships) {
-        this.datasetAuthorships = datasetAuthorships;
-    }
-
-    public TrialNewRequest documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public TrialNewRequest endDate(LocalDate endDate) {
-        this.endDate = endDate;
-        return this;
-    }
-
-    /**
-     * The date this trial ends
-     *
-     * @return endDate
-     **/
-    @Schema(description = "The date this trial ends")
-    public LocalDate getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(LocalDate endDate) {
-        this.endDate = endDate;
-    }
-
-    public TrialNewRequest externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public TrialNewRequest addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public TrialNewRequest programDbId(String programDbId) {
-        this.programDbId = programDbId;
-        return this;
-    }
-
-    /**
-     * A program identifier to search for
-     *
-     * @return programDbId
-     **/
-    @Schema(example = "673f378a", description = "A program identifier to search for")
-    public String getProgramDbId() {
-        return programDbId;
-    }
-
-    public void setProgramDbId(String programDbId) {
-        this.programDbId = programDbId;
-    }
-
-    public TrialNewRequest programName(String programName) {
-        this.programName = programName;
-        return this;
-    }
-
-    /**
-     * Human readable name of the program
-     *
-     * @return programName
-     **/
-    @Schema(example = "Tomatillo_Breeding_Program", description = "Human readable name of the program")
-    public String getProgramName() {
-        return programName;
-    }
-
-    public void setProgramName(String programName) {
-        this.programName = programName;
-    }
-
-    public TrialNewRequest publications(List<TrialPublications> publications) {
-        this.publications = publications;
-        return this;
-    }
-
-    public TrialNewRequest addPublicationsItem(TrialPublications publicationsItem) {
-        if (this.publications == null) {
-            this.publications = new ArrayList<TrialPublications>();
-        }
-        this.publications.add(publicationsItem);
-        return this;
-    }
-
-    /**
-     * MIAPPE V1.1 (DM-9) Associated publication - An identifier for a literature publication where the investigation is described. Use of DOIs is recommended.
-     *
-     * @return publications
-     **/
-    @Schema(description = "MIAPPE V1.1 (DM-9) Associated publication - An identifier for a literature publication where the investigation is described. Use of DOIs is recommended.")
-    public List<TrialPublications> getPublications() {
-        return publications;
-    }
-
-    public void setPublications(List<TrialPublications> publications) {
-        this.publications = publications;
-    }
-
-    public TrialNewRequest startDate(LocalDate startDate) {
-        this.startDate = startDate;
-        return this;
-    }
-
-    /**
-     * The date this trial started
-     *
-     * @return startDate
-     **/
-    @Schema(description = "The date this trial started")
-    public LocalDate getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(LocalDate startDate) {
-        this.startDate = startDate;
-    }
-
-    public TrialNewRequest trialDescription(String trialDescription) {
-        this.trialDescription = trialDescription;
-        return this;
-    }
-
-    /**
-     * The human readable description of a trial  MIAPPE V1.1 (DM-4) Investigation description - Human-readable text describing the investigation in more detail.
-     *
-     * @return trialDescription
-     **/
-    @Schema(example = "General drought resistance trial initiated in Peru before duplication in Africa", description = "The human readable description of a trial  MIAPPE V1.1 (DM-4) Investigation description - Human-readable text describing the investigation in more detail.")
-    public String getTrialDescription() {
-        return trialDescription;
-    }
-
-    public void setTrialDescription(String trialDescription) {
-        this.trialDescription = trialDescription;
-    }
-
-    public TrialNewRequest trialName(String trialName) {
-        this.trialName = trialName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial  MIAPPE V1.1 (DM-3) Investigation title - Human-readable string summarising the investigation.
-     *
-     * @return trialName
-     **/
-    @Schema(example = "Peru Yield Trial 1", description = "The human readable name of a trial  MIAPPE V1.1 (DM-3) Investigation title - Human-readable string summarising the investigation.")
-    public String getTrialName() {
-        return trialName;
-    }
-
-    public void setTrialName(String trialName) {
-        this.trialName = trialName;
-    }
-
-    public TrialNewRequest trialPUI(String trialPUI) {
-        this.trialPUI = trialPUI;
-        return this;
-    }
-
-    /**
-     * A permanent identifier for a trial. Could be DOI or other URI formatted identifier.
-     *
-     * @return trialPUI
-     **/
-    @Schema(example = "https://doi.org/101093190", description = "A permanent identifier for a trial. Could be DOI or other URI formatted identifier.")
-    public String getTrialPUI() {
-        return trialPUI;
-    }
-
-    public void setTrialPUI(String trialPUI) {
-        this.trialPUI = trialPUI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TrialNewRequest trialNewRequest = (TrialNewRequest) o;
-        return Objects.equals(this.active, trialNewRequest.active) &&
-                Objects.equals(this.additionalInfo, trialNewRequest.additionalInfo) &&
-                Objects.equals(this.commonCropName, trialNewRequest.commonCropName) &&
-                Objects.equals(this.contacts, trialNewRequest.contacts) &&
-                Objects.equals(this.datasetAuthorships, trialNewRequest.datasetAuthorships) &&
-                Objects.equals(this.documentationURL, trialNewRequest.documentationURL) &&
-                Objects.equals(this.endDate, trialNewRequest.endDate) &&
-                Objects.equals(this.externalReferences, trialNewRequest.externalReferences) &&
-                Objects.equals(this.programDbId, trialNewRequest.programDbId) &&
-                Objects.equals(this.programName, trialNewRequest.programName) &&
-                Objects.equals(this.publications, trialNewRequest.publications) &&
-                Objects.equals(this.startDate, trialNewRequest.startDate) &&
-                Objects.equals(this.trialDescription, trialNewRequest.trialDescription) &&
-                Objects.equals(this.trialName, trialNewRequest.trialName) &&
-                Objects.equals(this.trialPUI, trialNewRequest.trialPUI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(active, additionalInfo, commonCropName, contacts, datasetAuthorships, documentationURL, endDate, externalReferences, programDbId, programName, publications, startDate, trialDescription, trialName, trialPUI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TrialNewRequest {\n");
-
-        sb.append("    active: ").append(toIndentedString(active)).append("\n");
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    contacts: ").append(toIndentedString(contacts)).append("\n");
-        sb.append("    datasetAuthorships: ").append(toIndentedString(datasetAuthorships)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    endDate: ").append(toIndentedString(endDate)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-        sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
-        sb.append("    publications: ").append(toIndentedString(publications)).append("\n");
-        sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-        sb.append("    trialDescription: ").append(toIndentedString(trialDescription)).append("\n");
-        sb.append("    trialName: ").append(toIndentedString(trialName)).append("\n");
-        sb.append("    trialPUI: ").append(toIndentedString(trialPUI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialPublications.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialPublications.java
deleted file mode 100644
index 4307ca70..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialPublications.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * TrialPublications
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class TrialPublications {
-    @SerializedName("publicationPUI")
-    private String publicationPUI = null;
-
-    @SerializedName("publicationReference")
-    private String publicationReference = null;
-
-    public TrialPublications publicationPUI(String publicationPUI) {
-        this.publicationPUI = publicationPUI;
-        return this;
-    }
-
-    /**
-     * Get publicationPUI
-     *
-     * @return publicationPUI
-     **/
-    @Schema(example = "doi:10.15454/312953986E3", description = "")
-    public String getPublicationPUI() {
-        return publicationPUI;
-    }
-
-    public void setPublicationPUI(String publicationPUI) {
-        this.publicationPUI = publicationPUI;
-    }
-
-    public TrialPublications publicationReference(String publicationReference) {
-        this.publicationReference = publicationReference;
-        return this;
-    }
-
-    /**
-     * Get publicationReference
-     *
-     * @return publicationReference
-     **/
-    @Schema(example = "Selby, BrAPI - An application programming interface for plant breeding applications, Bioinformatics, https://doi.org/10.1093/bioinformatics/190", description = "")
-    public String getPublicationReference() {
-        return publicationReference;
-    }
-
-    public void setPublicationReference(String publicationReference) {
-        this.publicationReference = publicationReference;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TrialPublications trialPublications = (TrialPublications) o;
-        return Objects.equals(this.publicationPUI, trialPublications.publicationPUI) &&
-                Objects.equals(this.publicationReference, trialPublications.publicationReference);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(publicationPUI, publicationReference);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TrialPublications {\n");
-
-        sb.append("    publicationPUI: ").append(toIndentedString(publicationPUI)).append("\n");
-        sb.append("    publicationReference: ").append(toIndentedString(publicationReference)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialSearchRequest.java
deleted file mode 100644
index 56db55eb..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialSearchRequest.java
+++ /dev/null
@@ -1,635 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.LocalDate;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * TrialSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class TrialSearchRequest {
-    @SerializedName("active")
-    private Boolean active = null;
-
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("contactDbIds")
-    private List<String> contactDbIds = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("locationDbIds")
-    private List<String> locationDbIds = null;
-
-    @SerializedName("locationNames")
-    private List<String> locationNames = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("searchDateRangeEnd")
-    private LocalDate searchDateRangeEnd = null;
-
-    @SerializedName("searchDateRangeStart")
-    private LocalDate searchDateRangeStart = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    @SerializedName("trialPUIs")
-    private List<String> trialPUIs = null;
-
-    public TrialSearchRequest active(Boolean active) {
-        this.active = active;
-        return this;
-    }
-
-    /**
-     * A flag to indicate if a Trial is currently active and ongoing
-     *
-     * @return active
-     **/
-    @Schema(example = "true", description = "A flag to indicate if a Trial is currently active and ongoing")
-    public Boolean isActive() {
-        return active;
-    }
-
-    public void setActive(Boolean active) {
-        this.active = active;
-    }
-
-    public TrialSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public TrialSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public TrialSearchRequest contactDbIds(List<String> contactDbIds) {
-        this.contactDbIds = contactDbIds;
-        return this;
-    }
-
-    public TrialSearchRequest addContactDbIdsItem(String contactDbIdsItem) {
-        if (this.contactDbIds == null) {
-            this.contactDbIds = new ArrayList<String>();
-        }
-        this.contactDbIds.add(contactDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of contact entities associated with this trial
-     *
-     * @return contactDbIds
-     **/
-    @Schema(example = "[\"e0f70c2a\",\"b82f0967\"]", description = "List of contact entities associated with this trial")
-    public List<String> getContactDbIds() {
-        return contactDbIds;
-    }
-
-    public void setContactDbIds(List<String> contactDbIds) {
-        this.contactDbIds = contactDbIds;
-    }
-
-    public TrialSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public TrialSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public TrialSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public TrialSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public TrialSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public TrialSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public TrialSearchRequest locationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-        return this;
-    }
-
-    public TrialSearchRequest addLocationDbIdsItem(String locationDbIdsItem) {
-        if (this.locationDbIds == null) {
-            this.locationDbIds = new ArrayList<String>();
-        }
-        this.locationDbIds.add(locationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The location ids to search for
-     *
-     * @return locationDbIds
-     **/
-    @Schema(example = "[\"b28911cf\",\"5071d1e4\"]", description = "The location ids to search for")
-    public List<String> getLocationDbIds() {
-        return locationDbIds;
-    }
-
-    public void setLocationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-    }
-
-    public TrialSearchRequest locationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-        return this;
-    }
-
-    public TrialSearchRequest addLocationNamesItem(String locationNamesItem) {
-        if (this.locationNames == null) {
-            this.locationNames = new ArrayList<String>();
-        }
-        this.locationNames.add(locationNamesItem);
-        return this;
-    }
-
-    /**
-     * A human readable names to search for
-     *
-     * @return locationNames
-     **/
-    @Schema(example = "[\"Location Alpha\",\"The Large Hadron Collider\"]", description = "A human readable names to search for")
-    public List<String> getLocationNames() {
-        return locationNames;
-    }
-
-    public void setLocationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-    }
-
-    public TrialSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public TrialSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public TrialSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public TrialSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public TrialSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public TrialSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public TrialSearchRequest searchDateRangeEnd(LocalDate searchDateRangeEnd) {
-        this.searchDateRangeEnd = searchDateRangeEnd;
-        return this;
-    }
-
-    /**
-     * The end of the overlapping search date range. &#x60;searchDateRangeStart&#x60; must be before &#x60;searchDateRangeEnd&#x60;.  Return a Trial entity if any of the following cases are true  - &#x60;searchDateRangeStart&#x60; is before &#x60;trial.endDate&#x60; AND &#x60;searchDateRangeEnd&#x60; is null   - &#x60;searchDateRangeStart&#x60; is before &#x60;trial.endDate&#x60; AND &#x60;searchDateRangeEnd&#x60; is after &#x60;trial.startDate&#x60;  - &#x60;searchDateRangeEnd&#x60; is after &#x60;trial.startDate&#x60; AND &#x60;searchDateRangeStart&#x60; is null  - &#x60;searchDateRangeEnd&#x60; is after &#x60;trial.startDate&#x60; AND &#x60;searchDateRangeStart&#x60; is before &#x60;trial.endDate&#x60;
-     *
-     * @return searchDateRangeEnd
-     **/
-    @Schema(description = "The end of the overlapping search date range. `searchDateRangeStart` must be before `searchDateRangeEnd`.  Return a Trial entity if any of the following cases are true  - `searchDateRangeStart` is before `trial.endDate` AND `searchDateRangeEnd` is null   - `searchDateRangeStart` is before `trial.endDate` AND `searchDateRangeEnd` is after `trial.startDate`  - `searchDateRangeEnd` is after `trial.startDate` AND `searchDateRangeStart` is null  - `searchDateRangeEnd` is after `trial.startDate` AND `searchDateRangeStart` is before `trial.endDate`")
-    public LocalDate getSearchDateRangeEnd() {
-        return searchDateRangeEnd;
-    }
-
-    public void setSearchDateRangeEnd(LocalDate searchDateRangeEnd) {
-        this.searchDateRangeEnd = searchDateRangeEnd;
-    }
-
-    public TrialSearchRequest searchDateRangeStart(LocalDate searchDateRangeStart) {
-        this.searchDateRangeStart = searchDateRangeStart;
-        return this;
-    }
-
-    /**
-     * The start of the overlapping search date range. &#x60;searchDateRangeStart&#x60; must be before &#x60;searchDateRangeEnd&#x60;.  Return a Trial entity if any of the following cases are true  - &#x60;searchDateRangeStart&#x60; is before &#x60;trial.endDate&#x60; AND &#x60;searchDateRangeEnd&#x60; is null   - &#x60;searchDateRangeStart&#x60; is before &#x60;trial.endDate&#x60; AND &#x60;searchDateRangeEnd&#x60; is after &#x60;trial.startDate&#x60;  - &#x60;searchDateRangeEnd&#x60; is after &#x60;trial.startDate&#x60; AND &#x60;searchDateRangeStart&#x60; is null  - &#x60;searchDateRangeEnd&#x60; is after &#x60;trial.startDate&#x60; AND &#x60;searchDateRangeStart&#x60; is before &#x60;trial.endDate&#x60;
-     *
-     * @return searchDateRangeStart
-     **/
-    @Schema(description = "The start of the overlapping search date range. `searchDateRangeStart` must be before `searchDateRangeEnd`.  Return a Trial entity if any of the following cases are true  - `searchDateRangeStart` is before `trial.endDate` AND `searchDateRangeEnd` is null   - `searchDateRangeStart` is before `trial.endDate` AND `searchDateRangeEnd` is after `trial.startDate`  - `searchDateRangeEnd` is after `trial.startDate` AND `searchDateRangeStart` is null  - `searchDateRangeEnd` is after `trial.startDate` AND `searchDateRangeStart` is before `trial.endDate`")
-    public LocalDate getSearchDateRangeStart() {
-        return searchDateRangeStart;
-    }
-
-    public void setSearchDateRangeStart(LocalDate searchDateRangeStart) {
-        this.searchDateRangeStart = searchDateRangeStart;
-    }
-
-    public TrialSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public TrialSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public TrialSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public TrialSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public TrialSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public TrialSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public TrialSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public TrialSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-    public TrialSearchRequest trialPUIs(List<String> trialPUIs) {
-        this.trialPUIs = trialPUIs;
-        return this;
-    }
-
-    public TrialSearchRequest addTrialPUIsItem(String trialPUIsItem) {
-        if (this.trialPUIs == null) {
-            this.trialPUIs = new ArrayList<String>();
-        }
-        this.trialPUIs.add(trialPUIsItem);
-        return this;
-    }
-
-    /**
-     * A permanent identifier for a trial. Could be DOI or other URI formatted identifier.
-     *
-     * @return trialPUIs
-     **/
-    @Schema(example = "[\"https://doi.org/01093190\",\"https://doi.org/11192409\"]", description = "A permanent identifier for a trial. Could be DOI or other URI formatted identifier.")
-    public List<String> getTrialPUIs() {
-        return trialPUIs;
-    }
-
-    public void setTrialPUIs(List<String> trialPUIs) {
-        this.trialPUIs = trialPUIs;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TrialSearchRequest trialSearchRequest = (TrialSearchRequest) o;
-        return Objects.equals(this.active, trialSearchRequest.active) &&
-                Objects.equals(this.commonCropNames, trialSearchRequest.commonCropNames) &&
-                Objects.equals(this.contactDbIds, trialSearchRequest.contactDbIds) &&
-                Objects.equals(this.externalReferenceIDs, trialSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, trialSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, trialSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.locationDbIds, trialSearchRequest.locationDbIds) &&
-                Objects.equals(this.locationNames, trialSearchRequest.locationNames) &&
-                Objects.equals(this.page, trialSearchRequest.page) &&
-                Objects.equals(this.pageSize, trialSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, trialSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, trialSearchRequest.programNames) &&
-                Objects.equals(this.searchDateRangeEnd, trialSearchRequest.searchDateRangeEnd) &&
-                Objects.equals(this.searchDateRangeStart, trialSearchRequest.searchDateRangeStart) &&
-                Objects.equals(this.studyDbIds, trialSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, trialSearchRequest.studyNames) &&
-                Objects.equals(this.trialDbIds, trialSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, trialSearchRequest.trialNames) &&
-                Objects.equals(this.trialPUIs, trialSearchRequest.trialPUIs);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(active, commonCropNames, contactDbIds, externalReferenceIDs, externalReferenceIds, externalReferenceSources, locationDbIds, locationNames, page, pageSize, programDbIds, programNames, searchDateRangeEnd, searchDateRangeStart, studyDbIds, studyNames, trialDbIds, trialNames, trialPUIs);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TrialSearchRequest {\n");
-
-        sb.append("    active: ").append(toIndentedString(active)).append("\n");
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    contactDbIds: ").append(toIndentedString(contactDbIds)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-        sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    searchDateRangeEnd: ").append(toIndentedString(searchDateRangeEnd)).append("\n");
-        sb.append("    searchDateRangeStart: ").append(toIndentedString(searchDateRangeStart)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("    trialPUIs: ").append(toIndentedString(trialPUIs)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialSingleResponse.java
deleted file mode 100644
index 1a1d72c7..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/TrialSingleResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * TrialSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class TrialSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Trial result = null;
-
-    public TrialSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public TrialSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public TrialSingleResponse result(Trial result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Trial getResult() {
-        return result;
-    }
-
-    public void setResult(Trial result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TrialSingleResponse trialSingleResponse = (TrialSingleResponse) o;
-        return Objects.equals(this._atContext, trialSingleResponse._atContext) &&
-                Objects.equals(this.metadata, trialSingleResponse.metadata) &&
-                Objects.equals(this.result, trialSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TrialSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/VariableBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/VariableBaseClass.java
deleted file mode 100644
index 8eb9a40e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/VariableBaseClass.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * VariableBaseClass
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class VariableBaseClass {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("contextOfUse")
-    private List<String> contextOfUse = null;
-
-    @SerializedName("defaultValue")
-    private String defaultValue = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("externalReferences")
-    private ExternalReferences externalReferences = null;
-
-    @SerializedName("growthStage")
-    private String growthStage = null;
-
-    @SerializedName("institution")
-    private String institution = null;
-
-    @SerializedName("language")
-    private String language = null;
-
-    @SerializedName("method")
-    private VariableBaseClassMethod method = null;
-
-    @SerializedName("ontologyReference")
-    private OntologyReference ontologyReference = null;
-
-    @SerializedName("scale")
-    private VariableBaseClassScale scale = null;
-
-    @SerializedName("scientist")
-    private String scientist = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("submissionTimestamp")
-    private OffsetDateTime submissionTimestamp = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("trait")
-    private VariableBaseClassTrait trait = null;
-
-    public VariableBaseClass additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public VariableBaseClass putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public VariableBaseClass commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Crop name (examples: \&quot;Maize\&quot;, \&quot;Wheat\&quot;)
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Maize", description = "Crop name (examples: \"Maize\", \"Wheat\")")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public VariableBaseClass contextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-        return this;
-    }
-
-    public VariableBaseClass addContextOfUseItem(String contextOfUseItem) {
-        if (this.contextOfUse == null) {
-            this.contextOfUse = new ArrayList<String>();
-        }
-        this.contextOfUse.add(contextOfUseItem);
-        return this;
-    }
-
-    /**
-     * Indication of how trait is routinely used. (examples: [\&quot;Trial evaluation\&quot;, \&quot;Nursery evaluation\&quot;])
-     *
-     * @return contextOfUse
-     **/
-    @Schema(example = "[\"Trial evaluation\",\"Nursery evaluation\"]", description = "Indication of how trait is routinely used. (examples: [\"Trial evaluation\", \"Nursery evaluation\"])")
-    public List<String> getContextOfUse() {
-        return contextOfUse;
-    }
-
-    public void setContextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-    }
-
-    public VariableBaseClass defaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-        return this;
-    }
-
-    /**
-     * Variable default value. (examples: \&quot;red\&quot;, \&quot;2.3\&quot;, etc.)
-     *
-     * @return defaultValue
-     **/
-    @Schema(example = "2.0", description = "Variable default value. (examples: \"red\", \"2.3\", etc.)")
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    public void setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    public VariableBaseClass documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/documentation.html", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public VariableBaseClass externalReferences(ExternalReferences externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    /**
-     * Get externalReferences
-     *
-     * @return externalReferences
-     **/
-    @Schema(description = "")
-    public ExternalReferences getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(ExternalReferences externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public VariableBaseClass growthStage(String growthStage) {
-        this.growthStage = growthStage;
-        return this;
-    }
-
-    /**
-     * Growth stage at which measurement is made (examples: \&quot;flowering\&quot;)
-     *
-     * @return growthStage
-     **/
-    @Schema(example = "flowering", description = "Growth stage at which measurement is made (examples: \"flowering\")")
-    public String getGrowthStage() {
-        return growthStage;
-    }
-
-    public void setGrowthStage(String growthStage) {
-        this.growthStage = growthStage;
-    }
-
-    public VariableBaseClass institution(String institution) {
-        this.institution = institution;
-        return this;
-    }
-
-    /**
-     * Name of institution submitting the variable
-     *
-     * @return institution
-     **/
-    @Schema(example = "The BrAPI Institute", description = "Name of institution submitting the variable")
-    public String getInstitution() {
-        return institution;
-    }
-
-    public void setInstitution(String institution) {
-        this.institution = institution;
-    }
-
-    public VariableBaseClass language(String language) {
-        this.language = language;
-        return this;
-    }
-
-    /**
-     * 2 letter ISO 639-1 code for the language of submission of the variable.
-     *
-     * @return language
-     **/
-    @Schema(example = "en", description = "2 letter ISO 639-1 code for the language of submission of the variable.")
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public VariableBaseClass method(VariableBaseClassMethod method) {
-        this.method = method;
-        return this;
-    }
-
-    /**
-     * Get method
-     *
-     * @return method
-     **/
-    @Schema(required = true, description = "")
-    public VariableBaseClassMethod getMethod() {
-        return method;
-    }
-
-    public void setMethod(VariableBaseClassMethod method) {
-        this.method = method;
-    }
-
-    public VariableBaseClass ontologyReference(OntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public OntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(OntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public VariableBaseClass scale(VariableBaseClassScale scale) {
-        this.scale = scale;
-        return this;
-    }
-
-    /**
-     * Get scale
-     *
-     * @return scale
-     **/
-    @Schema(required = true, description = "")
-    public VariableBaseClassScale getScale() {
-        return scale;
-    }
-
-    public void setScale(VariableBaseClassScale scale) {
-        this.scale = scale;
-    }
-
-    public VariableBaseClass scientist(String scientist) {
-        this.scientist = scientist;
-        return this;
-    }
-
-    /**
-     * Name of scientist submitting the variable.
-     *
-     * @return scientist
-     **/
-    @Schema(example = "Dr. Bob Robertson", description = "Name of scientist submitting the variable.")
-    public String getScientist() {
-        return scientist;
-    }
-
-    public void setScientist(String scientist) {
-        this.scientist = scientist;
-    }
-
-    public VariableBaseClass status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Variable status. (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Variable status. (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public VariableBaseClass submissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-        return this;
-    }
-
-    /**
-     * Timestamp when the Variable was added (ISO 8601)
-     *
-     * @return submissionTimestamp
-     **/
-    @Schema(description = "Timestamp when the Variable was added (ISO 8601)")
-    public OffsetDateTime getSubmissionTimestamp() {
-        return submissionTimestamp;
-    }
-
-    public void setSubmissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-    }
-
-    public VariableBaseClass synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public VariableBaseClass addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other variable names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Maize Height\",\"Stalk Height\",\"Corn Height\"]", description = "Other variable names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public VariableBaseClass trait(VariableBaseClassTrait trait) {
-        this.trait = trait;
-        return this;
-    }
-
-    /**
-     * Get trait
-     *
-     * @return trait
-     **/
-    @Schema(required = true, description = "")
-    public VariableBaseClassTrait getTrait() {
-        return trait;
-    }
-
-    public void setTrait(VariableBaseClassTrait trait) {
-        this.trait = trait;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariableBaseClass variableBaseClass = (VariableBaseClass) o;
-        return Objects.equals(this.additionalInfo, variableBaseClass.additionalInfo) &&
-                Objects.equals(this.commonCropName, variableBaseClass.commonCropName) &&
-                Objects.equals(this.contextOfUse, variableBaseClass.contextOfUse) &&
-                Objects.equals(this.defaultValue, variableBaseClass.defaultValue) &&
-                Objects.equals(this.documentationURL, variableBaseClass.documentationURL) &&
-                Objects.equals(this.externalReferences, variableBaseClass.externalReferences) &&
-                Objects.equals(this.growthStage, variableBaseClass.growthStage) &&
-                Objects.equals(this.institution, variableBaseClass.institution) &&
-                Objects.equals(this.language, variableBaseClass.language) &&
-                Objects.equals(this.method, variableBaseClass.method) &&
-                Objects.equals(this.ontologyReference, variableBaseClass.ontologyReference) &&
-                Objects.equals(this.scale, variableBaseClass.scale) &&
-                Objects.equals(this.scientist, variableBaseClass.scientist) &&
-                Objects.equals(this.status, variableBaseClass.status) &&
-                Objects.equals(this.submissionTimestamp, variableBaseClass.submissionTimestamp) &&
-                Objects.equals(this.synonyms, variableBaseClass.synonyms) &&
-                Objects.equals(this.trait, variableBaseClass.trait);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, commonCropName, contextOfUse, defaultValue, documentationURL, externalReferences, growthStage, institution, language, method, ontologyReference, scale, scientist, status, submissionTimestamp, synonyms, trait);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariableBaseClass {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    contextOfUse: ").append(toIndentedString(contextOfUse)).append("\n");
-        sb.append("    defaultValue: ").append(toIndentedString(defaultValue)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    growthStage: ").append(toIndentedString(growthStage)).append("\n");
-        sb.append("    institution: ").append(toIndentedString(institution)).append("\n");
-        sb.append("    language: ").append(toIndentedString(language)).append("\n");
-        sb.append("    method: ").append(toIndentedString(method)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scale: ").append(toIndentedString(scale)).append("\n");
-        sb.append("    scientist: ").append(toIndentedString(scientist)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    submissionTimestamp: ").append(toIndentedString(submissionTimestamp)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    trait: ").append(toIndentedString(trait)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/VariableBaseClassMethod.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/VariableBaseClassMethod.java
deleted file mode 100644
index 5c1340da..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/VariableBaseClassMethod.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A description of the way an Observation should be collected.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Method \&quot;estimation\&quot; or \&quot;drone image processing\&quot;.
- */
-@Schema(description = "A description of the way an Observation should be collected.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Method \"estimation\" or \"drone image processing\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class VariableBaseClassMethod {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("bibliographicalReference")
-    private String bibliographicalReference = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("formula")
-    private String formula = null;
-
-    @SerializedName("methodClass")
-    private String methodClass = null;
-
-    @SerializedName("methodDbId")
-    private String methodDbId = null;
-
-    @SerializedName("methodName")
-    private String methodName = null;
-
-    @SerializedName("methodPUI")
-    private String methodPUI = null;
-
-    @SerializedName("ontologyReference")
-    private MethodBaseClassOntologyReference ontologyReference = null;
-
-    public VariableBaseClassMethod additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public VariableBaseClassMethod putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public VariableBaseClassMethod bibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-        return this;
-    }
-
-    /**
-     * Bibliographical reference describing the method. &lt;br/&gt;MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.
-     *
-     * @return bibliographicalReference
-     **/
-    @Schema(example = "Smith, 1893, Really Cool Paper, Popular Journal", description = "Bibliographical reference describing the method. <br/>MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.")
-    public String getBibliographicalReference() {
-        return bibliographicalReference;
-    }
-
-    public void setBibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-    }
-
-    public VariableBaseClassMethod description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Method description &lt;br/&gt;MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)
-     *
-     * @return description
-     **/
-    @Schema(example = "A measuring tape was used", description = "Method description <br/>MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public VariableBaseClassMethod externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public VariableBaseClassMethod addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public VariableBaseClassMethod formula(String formula) {
-        this.formula = formula;
-        return this;
-    }
-
-    /**
-     * For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation
-     *
-     * @return formula
-     **/
-    @Schema(example = "a^2 + b^2 = c^2", description = "For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation")
-    public String getFormula() {
-        return formula;
-    }
-
-    public void setFormula(String formula) {
-        this.formula = formula;
-    }
-
-    public VariableBaseClassMethod methodClass(String methodClass) {
-        this.methodClass = methodClass;
-        return this;
-    }
-
-    /**
-     * Method class (examples: \&quot;Measurement\&quot;, \&quot;Counting\&quot;, \&quot;Estimation\&quot;, \&quot;Computation\&quot;, etc.)
-     *
-     * @return methodClass
-     **/
-    @Schema(example = "Measurement", description = "Method class (examples: \"Measurement\", \"Counting\", \"Estimation\", \"Computation\", etc.)")
-    public String getMethodClass() {
-        return methodClass;
-    }
-
-    public void setMethodClass(String methodClass) {
-        this.methodClass = methodClass;
-    }
-
-    public VariableBaseClassMethod methodDbId(String methodDbId) {
-        this.methodDbId = methodDbId;
-        return this;
-    }
-
-    /**
-     * Method unique identifier
-     *
-     * @return methodDbId
-     **/
-    @Schema(example = "0adb2764", description = "Method unique identifier")
-    public String getMethodDbId() {
-        return methodDbId;
-    }
-
-    public void setMethodDbId(String methodDbId) {
-        this.methodDbId = methodDbId;
-    }
-
-    public VariableBaseClassMethod methodName(String methodName) {
-        this.methodName = methodName;
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodName
-     **/
-    @Schema(example = "Measuring Tape", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public String getMethodName() {
-        return methodName;
-    }
-
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
-    public VariableBaseClassMethod methodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000212", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public String getMethodPUI() {
-        return methodPUI;
-    }
-
-    public void setMethodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-    }
-
-    public VariableBaseClassMethod ontologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodBaseClassOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariableBaseClassMethod variableBaseClassMethod = (VariableBaseClassMethod) o;
-        return Objects.equals(this.additionalInfo, variableBaseClassMethod.additionalInfo) &&
-                Objects.equals(this.bibliographicalReference, variableBaseClassMethod.bibliographicalReference) &&
-                Objects.equals(this.description, variableBaseClassMethod.description) &&
-                Objects.equals(this.externalReferences, variableBaseClassMethod.externalReferences) &&
-                Objects.equals(this.formula, variableBaseClassMethod.formula) &&
-                Objects.equals(this.methodClass, variableBaseClassMethod.methodClass) &&
-                Objects.equals(this.methodDbId, variableBaseClassMethod.methodDbId) &&
-                Objects.equals(this.methodName, variableBaseClassMethod.methodName) &&
-                Objects.equals(this.methodPUI, variableBaseClassMethod.methodPUI) &&
-                Objects.equals(this.ontologyReference, variableBaseClassMethod.ontologyReference);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, bibliographicalReference, description, externalReferences, formula, methodClass, methodDbId, methodName, methodPUI, ontologyReference);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariableBaseClassMethod {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    bibliographicalReference: ").append(toIndentedString(bibliographicalReference)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    formula: ").append(toIndentedString(formula)).append("\n");
-        sb.append("    methodClass: ").append(toIndentedString(methodClass)).append("\n");
-        sb.append("    methodDbId: ").append(toIndentedString(methodDbId)).append("\n");
-        sb.append("    methodName: ").append(toIndentedString(methodName)).append("\n");
-        sb.append("    methodPUI: ").append(toIndentedString(methodPUI)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/VariableBaseClassScale.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/VariableBaseClassScale.java
deleted file mode 100644
index 69199ed1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/VariableBaseClassScale.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * A Scale describes the units and acceptable values for an ObservationVariable.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Scale \&quot;inches\&quot; or \&quot;pixels\&quot;.
- */
-@Schema(description = "A Scale describes the units and acceptable values for an ObservationVariable.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Scale \"inches\" or \"pixels\".")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class VariableBaseClassScale {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypeEnum.Adapter.class)
-    public enum DataTypeEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypeEnum fromValue(String input) {
-            for (DataTypeEnum b : DataTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataType")
-    private DataTypeEnum dataType = null;
-
-    @SerializedName("decimalPlaces")
-    private Integer decimalPlaces = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("ontologyReference")
-    private MethodBaseClassOntologyReference ontologyReference = null;
-
-    @SerializedName("scaleDbId")
-    private String scaleDbId = null;
-
-    @SerializedName("scaleName")
-    private String scaleName = null;
-
-    @SerializedName("scalePUI")
-    private String scalePUI = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    @SerializedName("validValues")
-    private ScaleBaseClassValidValues validValues = null;
-
-    public VariableBaseClassScale additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public VariableBaseClassScale putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public VariableBaseClassScale dataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-        return this;
-    }
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     *
-     * @return dataType
-     **/
-    @Schema(example = "Numerical", description = "<p>Class of the scale, entries can be</p> <p>\"Code\" -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \"75VD\" means \"75 %\" of the plant is infected and the plant is very delayed.</p> <p>\"Date\" - The date class is for events expressed in a time format, See ISO 8601</p> <p>\"Duration\" - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months</p> <p>\"Nominal\" - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories</p> <p>\"Numerical\" - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches</p> <p>\"Ordinal\" - Ordinal scales are scales composed of ordered categories</p> <p>\"Text\" - A free text is used to express the trait.</p>")
-    public DataTypeEnum getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-    }
-
-    public VariableBaseClassScale decimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-        return this;
-    }
-
-    /**
-     * For numerical, number of decimal places to be reported
-     *
-     * @return decimalPlaces
-     **/
-    @Schema(example = "2", description = "For numerical, number of decimal places to be reported")
-    public Integer getDecimalPlaces() {
-        return decimalPlaces;
-    }
-
-    public void setDecimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-    }
-
-    public VariableBaseClassScale externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public VariableBaseClassScale addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public VariableBaseClassScale ontologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodBaseClassOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public VariableBaseClassScale scaleDbId(String scaleDbId) {
-        this.scaleDbId = scaleDbId;
-        return this;
-    }
-
-    /**
-     * Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.
-     *
-     * @return scaleDbId
-     **/
-    @Schema(example = "af730171", description = "Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.")
-    public String getScaleDbId() {
-        return scaleDbId;
-    }
-
-    public void setScaleDbId(String scaleDbId) {
-        this.scaleDbId = scaleDbId;
-    }
-
-    public VariableBaseClassScale scaleName(String scaleName) {
-        this.scaleName = scaleName;
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleName
-     **/
-    @Schema(example = "Meters", description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public String getScaleName() {
-        return scaleName;
-    }
-
-    public void setScaleName(String scaleName) {
-        this.scaleName = scaleName;
-    }
-
-    public VariableBaseClassScale scalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000112", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public String getScalePUI() {
-        return scalePUI;
-    }
-
-    public void setScalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-    }
-
-    public VariableBaseClassScale units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when &#x60;dataType&#x60; is Numeric, but could also be included for other dataTypes when applicable.
-     *
-     * @return units
-     **/
-    @Schema(example = "m", description = "This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when `dataType` is Numeric, but could also be included for other dataTypes when applicable.")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    public VariableBaseClassScale validValues(ScaleBaseClassValidValues validValues) {
-        this.validValues = validValues;
-        return this;
-    }
-
-    /**
-     * Get validValues
-     *
-     * @return validValues
-     **/
-    @Schema(description = "")
-    public ScaleBaseClassValidValues getValidValues() {
-        return validValues;
-    }
-
-    public void setValidValues(ScaleBaseClassValidValues validValues) {
-        this.validValues = validValues;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariableBaseClassScale variableBaseClassScale = (VariableBaseClassScale) o;
-        return Objects.equals(this.additionalInfo, variableBaseClassScale.additionalInfo) &&
-                Objects.equals(this.dataType, variableBaseClassScale.dataType) &&
-                Objects.equals(this.decimalPlaces, variableBaseClassScale.decimalPlaces) &&
-                Objects.equals(this.externalReferences, variableBaseClassScale.externalReferences) &&
-                Objects.equals(this.ontologyReference, variableBaseClassScale.ontologyReference) &&
-                Objects.equals(this.scaleDbId, variableBaseClassScale.scaleDbId) &&
-                Objects.equals(this.scaleName, variableBaseClassScale.scaleName) &&
-                Objects.equals(this.scalePUI, variableBaseClassScale.scalePUI) &&
-                Objects.equals(this.units, variableBaseClassScale.units) &&
-                Objects.equals(this.validValues, variableBaseClassScale.validValues);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, dataType, decimalPlaces, externalReferences, ontologyReference, scaleDbId, scaleName, scalePUI, units, validValues);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariableBaseClassScale {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
-        sb.append("    decimalPlaces: ").append(toIndentedString(decimalPlaces)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scaleDbId: ").append(toIndentedString(scaleDbId)).append("\n");
-        sb.append("    scaleName: ").append(toIndentedString(scaleName)).append("\n");
-        sb.append("    scalePUI: ").append(toIndentedString(scalePUI)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("    validValues: ").append(toIndentedString(validValues)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/VariableBaseClassTrait.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/VariableBaseClassTrait.java
deleted file mode 100644
index ea0f9aec..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/core/VariableBaseClassTrait.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * BrAPI-Core
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"version-number\">V2.0</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.0/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.0\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore20.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.core;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A Trait describes what property is being observed.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Trait \&quot;Leaf length\&quot; or \&quot;Flower height\&quot;.
- */
-@Schema(description = "A Trait describes what property is being observed.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Trait \"Leaf length\" or \"Flower height\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:03.583Z[GMT]")
-public class VariableBaseClassTrait {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("alternativeAbbreviations")
-    private List<String> alternativeAbbreviations = null;
-
-    @SerializedName("attribute")
-    private String attribute = null;
-
-    @SerializedName("attributePUI")
-    private String attributePUI = null;
-
-    @SerializedName("entity")
-    private String entity = null;
-
-    @SerializedName("entityPUI")
-    private String entityPUI = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("mainAbbreviation")
-    private String mainAbbreviation = null;
-
-    @SerializedName("ontologyReference")
-    private MethodBaseClassOntologyReference ontologyReference = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("traitClass")
-    private String traitClass = null;
-
-    @SerializedName("traitDbId")
-    private String traitDbId = null;
-
-    @SerializedName("traitDescription")
-    private String traitDescription = null;
-
-    @SerializedName("traitName")
-    private String traitName = null;
-
-    @SerializedName("traitPUI")
-    private String traitPUI = null;
-
-    public VariableBaseClassTrait additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public VariableBaseClassTrait putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public VariableBaseClassTrait alternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-        return this;
-    }
-
-    public VariableBaseClassTrait addAlternativeAbbreviationsItem(String alternativeAbbreviationsItem) {
-        if (this.alternativeAbbreviations == null) {
-            this.alternativeAbbreviations = new ArrayList<String>();
-        }
-        this.alternativeAbbreviations.add(alternativeAbbreviationsItem);
-        return this;
-    }
-
-    /**
-     * A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.
-     *
-     * @return alternativeAbbreviations
-     **/
-    @Schema(example = "[\"H\",\"PH\",\"H1\"]", description = "A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.")
-    public List<String> getAlternativeAbbreviations() {
-        return alternativeAbbreviations;
-    }
-
-    public void setAlternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-    }
-
-    public VariableBaseClassTrait attribute(String attribute) {
-        this.attribute = attribute;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attribute
-     **/
-    @Schema(example = "height", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    public VariableBaseClassTrait attributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attributePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PO:00012345", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttributePUI() {
-        return attributePUI;
-    }
-
-    public void setAttributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-    }
-
-    public VariableBaseClassTrait entity(String entity) {
-        this.entity = entity;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entity
-     **/
-    @Schema(example = "Stalk", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public String getEntity() {
-        return entity;
-    }
-
-    public void setEntity(String entity) {
-        this.entity = entity;
-    }
-
-    public VariableBaseClassTrait entityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A Trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the Entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entityPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PATO:00098765", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A Trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the Entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public String getEntityPUI() {
-        return entityPUI;
-    }
-
-    public void setEntityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-    }
-
-    public VariableBaseClassTrait externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public VariableBaseClassTrait addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public VariableBaseClassTrait mainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Trait
-     *
-     * @return mainAbbreviation
-     **/
-    @Schema(example = "PH", description = "A shortened version of the human readable name for a Trait")
-    public String getMainAbbreviation() {
-        return mainAbbreviation;
-    }
-
-    public void setMainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-    }
-
-    public VariableBaseClassTrait ontologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodBaseClassOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public VariableBaseClassTrait status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Trait status (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Trait status (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public VariableBaseClassTrait synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public VariableBaseClassTrait addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other trait names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Height\",\"Plant Height\",\"Stalk Height\",\"Canopy Height\"]", description = "Other trait names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public VariableBaseClassTrait traitClass(String traitClass) {
-        this.traitClass = traitClass;
-        return this;
-    }
-
-    /**
-     * A classification to describe the type of trait and the context it should be considered in. &lt;br/&gt; examples- \&quot;morphological\&quot;, \&quot;phenological\&quot;, \&quot;agronomical\&quot;, \&quot;physiological\&quot;, \&quot;abiotic stress\&quot;, \&quot;biotic stress\&quot;, \&quot;biochemical\&quot;, \&quot;quality traits\&quot;, \&quot;fertility\&quot;, etc.
-     *
-     * @return traitClass
-     **/
-    @Schema(example = "phenological", description = "A classification to describe the type of trait and the context it should be considered in. <br/> examples- \"morphological\", \"phenological\", \"agronomical\", \"physiological\", \"abiotic stress\", \"biotic stress\", \"biochemical\", \"quality traits\", \"fertility\", etc.")
-    public String getTraitClass() {
-        return traitClass;
-    }
-
-    public void setTraitClass(String traitClass) {
-        this.traitClass = traitClass;
-    }
-
-    public VariableBaseClassTrait traitDbId(String traitDbId) {
-        this.traitDbId = traitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trait
-     *
-     * @return traitDbId
-     **/
-    @Schema(example = "9b2e34f5", description = "The ID which uniquely identifies a trait")
-    public String getTraitDbId() {
-        return traitDbId;
-    }
-
-    public void setTraitDbId(String traitDbId) {
-        this.traitDbId = traitDbId;
-    }
-
-    public VariableBaseClassTrait traitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-        return this;
-    }
-
-    /**
-     * The description of a trait
-     *
-     * @return traitDescription
-     **/
-    @Schema(example = "The height of the plant", description = "The description of a trait")
-    public String getTraitDescription() {
-        return traitDescription;
-    }
-
-    public void setTraitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-    }
-
-    public VariableBaseClassTrait traitName(String traitName) {
-        this.traitName = traitName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitName
-     **/
-    @Schema(example = "Height", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public String getTraitName() {
-        return traitName;
-    }
-
-    public void setTraitName(String traitName) {
-        this.traitName = traitName;
-    }
-
-    public VariableBaseClassTrait traitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000012", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public String getTraitPUI() {
-        return traitPUI;
-    }
-
-    public void setTraitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariableBaseClassTrait variableBaseClassTrait = (VariableBaseClassTrait) o;
-        return Objects.equals(this.additionalInfo, variableBaseClassTrait.additionalInfo) &&
-                Objects.equals(this.alternativeAbbreviations, variableBaseClassTrait.alternativeAbbreviations) &&
-                Objects.equals(this.attribute, variableBaseClassTrait.attribute) &&
-                Objects.equals(this.attributePUI, variableBaseClassTrait.attributePUI) &&
-                Objects.equals(this.entity, variableBaseClassTrait.entity) &&
-                Objects.equals(this.entityPUI, variableBaseClassTrait.entityPUI) &&
-                Objects.equals(this.externalReferences, variableBaseClassTrait.externalReferences) &&
-                Objects.equals(this.mainAbbreviation, variableBaseClassTrait.mainAbbreviation) &&
-                Objects.equals(this.ontologyReference, variableBaseClassTrait.ontologyReference) &&
-                Objects.equals(this.status, variableBaseClassTrait.status) &&
-                Objects.equals(this.synonyms, variableBaseClassTrait.synonyms) &&
-                Objects.equals(this.traitClass, variableBaseClassTrait.traitClass) &&
-                Objects.equals(this.traitDbId, variableBaseClassTrait.traitDbId) &&
-                Objects.equals(this.traitDescription, variableBaseClassTrait.traitDescription) &&
-                Objects.equals(this.traitName, variableBaseClassTrait.traitName) &&
-                Objects.equals(this.traitPUI, variableBaseClassTrait.traitPUI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, alternativeAbbreviations, attribute, attributePUI, entity, entityPUI, externalReferences, mainAbbreviation, ontologyReference, status, synonyms, traitClass, traitDbId, traitDescription, traitName, traitPUI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariableBaseClassTrait {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    alternativeAbbreviations: ").append(toIndentedString(alternativeAbbreviations)).append("\n");
-        sb.append("    attribute: ").append(toIndentedString(attribute)).append("\n");
-        sb.append("    attributePUI: ").append(toIndentedString(attributePUI)).append("\n");
-        sb.append("    entity: ").append(toIndentedString(entity)).append("\n");
-        sb.append("    entityPUI: ").append(toIndentedString(entityPUI)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    mainAbbreviation: ").append(toIndentedString(mainAbbreviation)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    traitClass: ").append(toIndentedString(traitClass)).append("\n");
-        sb.append("    traitDbId: ").append(toIndentedString(traitDbId)).append("\n");
-        sb.append("    traitDescription: ").append(toIndentedString(traitDescription)).append("\n");
-        sb.append("    traitName: ").append(toIndentedString(traitName)).append("\n");
-        sb.append("    traitPUI: ").append(toIndentedString(traitPUI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrix.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrix.java
deleted file mode 100644
index 269d021a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrix.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * AlleleMatrix
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class AlleleMatrix {
-    @SerializedName("callSetDbIds")
-    private List<String> callSetDbIds = null;
-
-    @SerializedName("dataMatrices")
-    private List<AlleleMatrixDataMatrices> dataMatrices = null;
-
-    @SerializedName("expandHomozygotes")
-    private Boolean expandHomozygotes = null;
-
-    @SerializedName("pagination")
-    private List<AlleleMatrixPagination> pagination = null;
-
-    @SerializedName("sepPhased")
-    private String sepPhased = null;
-
-    @SerializedName("sepUnphased")
-    private String sepUnphased = null;
-
-    @SerializedName("unknownString")
-    private String unknownString = null;
-
-    @SerializedName("variantDbIds")
-    private List<String> variantDbIds = null;
-
-    @SerializedName("variantSetDbIds")
-    private List<String> variantSetDbIds = null;
-
-    public AlleleMatrix callSetDbIds(List<String> callSetDbIds) {
-        this.callSetDbIds = callSetDbIds;
-        return this;
-    }
-
-    public AlleleMatrix addCallSetDbIdsItem(String callSetDbIdsItem) {
-        if (this.callSetDbIds == null) {
-            this.callSetDbIds = new ArrayList<String>();
-        }
-        this.callSetDbIds.add(callSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of unique identifiers for the CallSets contained in the matrix response. This array should match the ordering for columns in the matrix. A CallSet is a unique combination of a Sample and a sequencing event. CallSets often have a 1-to-1 relationship with Samples, but this is not always the case.
-     *
-     * @return callSetDbIds
-     **/
-    @Schema(example = "[\"aca00001\",\"aca00002\",\"aca00003\"]", description = "A list of unique identifiers for the CallSets contained in the matrix response. This array should match the ordering for columns in the matrix. A CallSet is a unique combination of a Sample and a sequencing event. CallSets often have a 1-to-1 relationship with Samples, but this is not always the case.")
-    public List<String> getCallSetDbIds() {
-        return callSetDbIds;
-    }
-
-    public void setCallSetDbIds(List<String> callSetDbIds) {
-        this.callSetDbIds = callSetDbIds;
-    }
-
-    public AlleleMatrix dataMatrices(List<AlleleMatrixDataMatrices> dataMatrices) {
-        this.dataMatrices = dataMatrices;
-        return this;
-    }
-
-    public AlleleMatrix addDataMatricesItem(AlleleMatrixDataMatrices dataMatricesItem) {
-        if (this.dataMatrices == null) {
-            this.dataMatrices = new ArrayList<AlleleMatrixDataMatrices>();
-        }
-        this.dataMatrices.add(dataMatricesItem);
-        return this;
-    }
-
-    /**
-     * The &#x27;dataMatrices&#x27; are an array of matrix objects that hold the allele data and associated metadata. Each matrix should be the same size and orientation, aligned with the \&quot;callSetDbIds\&quot; as columns and the \&quot;variantDbIds\&quot; as rows.
-     *
-     * @return dataMatrices
-     **/
-    @Schema(example = "[{\"dataMatrix\":[[\"0|0\",\"1|0\",\"1/1\"],[\"0|0\",\"1|0\",\"1/1\"],[\"0|0\",\"1|0\",\"1/1\"]],\"dataMatrixAbbreviation\":\"GT\",\"dataMatrixName\":\"Genotype\",\"dataType\":\"string\"},{\"dataMatrix\":[[\"48\",\"48\",\"43\"],[\"49\",\"3\",\"41\"],[\"21\",\"2\",\"35\"]],\"dataMatrixAbbreviation\":\"GQ\",\"dataMatrixName\":\"Genotype Quality\",\"dataType\":\"integer\"}]", description = "The 'dataMatrices' are an array of matrix objects that hold the allele data and associated metadata. Each matrix should be the same size and orientation, aligned with the \"callSetDbIds\" as columns and the \"variantDbIds\" as rows.")
-    public List<AlleleMatrixDataMatrices> getDataMatrices() {
-        return dataMatrices;
-    }
-
-    public void setDataMatrices(List<AlleleMatrixDataMatrices> dataMatrices) {
-        this.dataMatrices = dataMatrices;
-    }
-
-    public AlleleMatrix expandHomozygotes(Boolean expandHomozygotes) {
-        this.expandHomozygotes = expandHomozygotes;
-        return this;
-    }
-
-    /**
-     * Should homozygotes be expanded (true) or collapsed into a single occurrence (false)
-     *
-     * @return expandHomozygotes
-     **/
-    @Schema(example = "true", description = "Should homozygotes be expanded (true) or collapsed into a single occurrence (false)")
-    public Boolean isExpandHomozygotes() {
-        return expandHomozygotes;
-    }
-
-    public void setExpandHomozygotes(Boolean expandHomozygotes) {
-        this.expandHomozygotes = expandHomozygotes;
-    }
-
-    public AlleleMatrix pagination(List<AlleleMatrixPagination> pagination) {
-        this.pagination = pagination;
-        return this;
-    }
-
-    public AlleleMatrix addPaginationItem(AlleleMatrixPagination paginationItem) {
-        if (this.pagination == null) {
-            this.pagination = new ArrayList<AlleleMatrixPagination>();
-        }
-        this.pagination.add(paginationItem);
-        return this;
-    }
-
-    /**
-     * Pagination for the matrix
-     *
-     * @return pagination
-     **/
-    @Schema(example = "[{\"dimension\":\"VARIANTS\",\"page\":0,\"pageSize\":500,\"totalCount\":10000,\"totalPages\":20},{\"dimension\":\"CALLSETS\",\"page\":4,\"pageSize\":1000,\"totalCount\":10000,\"totalPages\":10}]", description = "Pagination for the matrix")
-    public List<AlleleMatrixPagination> getPagination() {
-        return pagination;
-    }
-
-    public void setPagination(List<AlleleMatrixPagination> pagination) {
-        this.pagination = pagination;
-    }
-
-    public AlleleMatrix sepPhased(String sepPhased) {
-        this.sepPhased = sepPhased;
-        return this;
-    }
-
-    /**
-     * The string used as a separator for phased allele calls.
-     *
-     * @return sepPhased
-     **/
-    @Schema(example = "|", description = "The string used as a separator for phased allele calls.")
-    public String getSepPhased() {
-        return sepPhased;
-    }
-
-    public void setSepPhased(String sepPhased) {
-        this.sepPhased = sepPhased;
-    }
-
-    public AlleleMatrix sepUnphased(String sepUnphased) {
-        this.sepUnphased = sepUnphased;
-        return this;
-    }
-
-    /**
-     * The string used as a separator for unphased allele calls.
-     *
-     * @return sepUnphased
-     **/
-    @Schema(example = "/", description = "The string used as a separator for unphased allele calls.")
-    public String getSepUnphased() {
-        return sepUnphased;
-    }
-
-    public void setSepUnphased(String sepUnphased) {
-        this.sepUnphased = sepUnphased;
-    }
-
-    public AlleleMatrix unknownString(String unknownString) {
-        this.unknownString = unknownString;
-        return this;
-    }
-
-    /**
-     * The string used as a representation for missing data.
-     *
-     * @return unknownString
-     **/
-    @Schema(example = ".", description = "The string used as a representation for missing data.")
-    public String getUnknownString() {
-        return unknownString;
-    }
-
-    public void setUnknownString(String unknownString) {
-        this.unknownString = unknownString;
-    }
-
-    public AlleleMatrix variantDbIds(List<String> variantDbIds) {
-        this.variantDbIds = variantDbIds;
-        return this;
-    }
-
-    public AlleleMatrix addVariantDbIdsItem(String variantDbIdsItem) {
-        if (this.variantDbIds == null) {
-            this.variantDbIds = new ArrayList<String>();
-        }
-        this.variantDbIds.add(variantDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of unique identifiers for the Variants contained in the matrix response. This array should match the ordering for rows in the matrix.
-     *
-     * @return variantDbIds
-     **/
-    @Schema(example = "[\"feb54257\",\"feb40355\",\"feb40323\"]", description = "A list of unique identifiers for the Variants contained in the matrix response. This array should match the ordering for rows in the matrix.")
-    public List<String> getVariantDbIds() {
-        return variantDbIds;
-    }
-
-    public void setVariantDbIds(List<String> variantDbIds) {
-        this.variantDbIds = variantDbIds;
-    }
-
-    public AlleleMatrix variantSetDbIds(List<String> variantSetDbIds) {
-        this.variantSetDbIds = variantSetDbIds;
-        return this;
-    }
-
-    public AlleleMatrix addVariantSetDbIdsItem(String variantSetDbIdsItem) {
-        if (this.variantSetDbIds == null) {
-            this.variantSetDbIds = new ArrayList<String>();
-        }
-        this.variantSetDbIds.add(variantSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of unique identifiers for the VariantSets contained in the matrix response. A VariantSet is a data set originating from a sequencing event. Often, users will only be interested in data from a single VariantSet, but in some cases a user might be interested in a matrix with data from multiple VariantSets.
-     *
-     * @return variantSetDbIds
-     **/
-    @Schema(example = "[\"cfde3944\",\"cfde2077\",\"cfde4424\"]", description = "A list of unique identifiers for the VariantSets contained in the matrix response. A VariantSet is a data set originating from a sequencing event. Often, users will only be interested in data from a single VariantSet, but in some cases a user might be interested in a matrix with data from multiple VariantSets.")
-    public List<String> getVariantSetDbIds() {
-        return variantSetDbIds;
-    }
-
-    public void setVariantSetDbIds(List<String> variantSetDbIds) {
-        this.variantSetDbIds = variantSetDbIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        AlleleMatrix alleleMatrix = (AlleleMatrix) o;
-        return Objects.equals(this.callSetDbIds, alleleMatrix.callSetDbIds) &&
-                Objects.equals(this.dataMatrices, alleleMatrix.dataMatrices) &&
-                Objects.equals(this.expandHomozygotes, alleleMatrix.expandHomozygotes) &&
-                Objects.equals(this.pagination, alleleMatrix.pagination) &&
-                Objects.equals(this.sepPhased, alleleMatrix.sepPhased) &&
-                Objects.equals(this.sepUnphased, alleleMatrix.sepUnphased) &&
-                Objects.equals(this.unknownString, alleleMatrix.unknownString) &&
-                Objects.equals(this.variantDbIds, alleleMatrix.variantDbIds) &&
-                Objects.equals(this.variantSetDbIds, alleleMatrix.variantSetDbIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(callSetDbIds, dataMatrices, expandHomozygotes, pagination, sepPhased, sepUnphased, unknownString, variantDbIds, variantSetDbIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class AlleleMatrix {\n");
-
-        sb.append("    callSetDbIds: ").append(toIndentedString(callSetDbIds)).append("\n");
-        sb.append("    dataMatrices: ").append(toIndentedString(dataMatrices)).append("\n");
-        sb.append("    expandHomozygotes: ").append(toIndentedString(expandHomozygotes)).append("\n");
-        sb.append("    pagination: ").append(toIndentedString(pagination)).append("\n");
-        sb.append("    sepPhased: ").append(toIndentedString(sepPhased)).append("\n");
-        sb.append("    sepUnphased: ").append(toIndentedString(sepUnphased)).append("\n");
-        sb.append("    unknownString: ").append(toIndentedString(unknownString)).append("\n");
-        sb.append("    variantDbIds: ").append(toIndentedString(variantDbIds)).append("\n");
-        sb.append("    variantSetDbIds: ").append(toIndentedString(variantSetDbIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixDataMatrices.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixDataMatrices.java
deleted file mode 100644
index 61990bf0..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixDataMatrices.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * This is a single data matrix. It could be the allele matrix or an additional layer of metadata associated with each genotype value.
- */
-@Schema(description = "This is a single data matrix. It could be the allele matrix or an additional layer of metadata associated with each genotype value.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class AlleleMatrixDataMatrices {
-    @SerializedName("dataMatrix")
-    private List<List<String>> dataMatrix = null;
-
-    @SerializedName("dataMatrixAbbreviation")
-    private String dataMatrixAbbreviation = null;
-
-    @SerializedName("dataMatrixName")
-    private String dataMatrixName = null;
-
-    /**
-     * The type of field represented in this data matrix. This is intended to help parse the data out of JSON.
-     */
-    @JsonAdapter(DataTypeEnum.Adapter.class)
-    public enum DataTypeEnum {
-        STRING("string"),
-        INTEGER("integer"),
-        FLOAT("float"),
-        BOOLEAN("boolean");
-
-        private String value;
-
-        DataTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypeEnum fromValue(String input) {
-            for (DataTypeEnum b : DataTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataType")
-    private DataTypeEnum dataType = null;
-
-    public AlleleMatrixDataMatrices dataMatrix(List<List<String>> dataMatrix) {
-        this.dataMatrix = dataMatrix;
-        return this;
-    }
-
-    public AlleleMatrixDataMatrices addDataMatrixItem(List<String> dataMatrixItem) {
-        if (this.dataMatrix == null) {
-            this.dataMatrix = new ArrayList<List<String>>();
-        }
-        this.dataMatrix.add(dataMatrixItem);
-        return this;
-    }
-
-    /**
-     * The two dimensional array of data, providing the allele matrix or an additional layer of metadata associated with each genotype value. Each matrix should be the same size and orientation, aligned with the \&quot;callSetDbIds\&quot; as columns and the \&quot;variantDbIds\&quot; as rows.
-     *
-     * @return dataMatrix
-     **/
-    @Schema(example = "[[\"0|0\",\"1|0\",\"1/1\"],[\"0|0\",\"1|0\",\"1/1\"],[\"0|0\",\"1|0\",\"1/1\"]]", description = "The two dimensional array of data, providing the allele matrix or an additional layer of metadata associated with each genotype value. Each matrix should be the same size and orientation, aligned with the \"callSetDbIds\" as columns and the \"variantDbIds\" as rows.")
-    public List<List<String>> getDataMatrix() {
-        return dataMatrix;
-    }
-
-    public void setDataMatrix(List<List<String>> dataMatrix) {
-        this.dataMatrix = dataMatrix;
-    }
-
-    public AlleleMatrixDataMatrices dataMatrixAbbreviation(String dataMatrixAbbreviation) {
-        this.dataMatrixAbbreviation = dataMatrixAbbreviation;
-        return this;
-    }
-
-    /**
-     * The abbreviated code of the field represented in this data matrix. These codes should match the VCF standard when possible and the key word \&quot;GT\&quot; is reserved for the allele matrix. Examples of other metadata matrices include: \&quot;GQ\&quot;, \&quot;RD\&quot;, and \&quot;HQ\&quot; &lt;br&gt; This maps to a FORMAT field in the VCF file standard.
-     *
-     * @return dataMatrixAbbreviation
-     **/
-    @Schema(example = "GT", description = "The abbreviated code of the field represented in this data matrix. These codes should match the VCF standard when possible and the key word \"GT\" is reserved for the allele matrix. Examples of other metadata matrices include: \"GQ\", \"RD\", and \"HQ\" <br> This maps to a FORMAT field in the VCF file standard.")
-    public String getDataMatrixAbbreviation() {
-        return dataMatrixAbbreviation;
-    }
-
-    public void setDataMatrixAbbreviation(String dataMatrixAbbreviation) {
-        this.dataMatrixAbbreviation = dataMatrixAbbreviation;
-    }
-
-    public AlleleMatrixDataMatrices dataMatrixName(String dataMatrixName) {
-        this.dataMatrixName = dataMatrixName;
-        return this;
-    }
-
-    /**
-     * The name of the field represented in this data matrix. The key word \&quot;Genotype\&quot; is reserved for the allele matrix. Examples of other metadata matrices include: \&quot;Genotype Quality\&quot;, \&quot;Read Depth\&quot;, and \&quot;Haplotype Quality\&quot; &lt;br&gt; This maps to a FORMAT field in the VCF file standard.
-     *
-     * @return dataMatrixName
-     **/
-    @Schema(example = "Genotype", description = "The name of the field represented in this data matrix. The key word \"Genotype\" is reserved for the allele matrix. Examples of other metadata matrices include: \"Genotype Quality\", \"Read Depth\", and \"Haplotype Quality\" <br> This maps to a FORMAT field in the VCF file standard.")
-    public String getDataMatrixName() {
-        return dataMatrixName;
-    }
-
-    public void setDataMatrixName(String dataMatrixName) {
-        this.dataMatrixName = dataMatrixName;
-    }
-
-    public AlleleMatrixDataMatrices dataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-        return this;
-    }
-
-    /**
-     * The type of field represented in this data matrix. This is intended to help parse the data out of JSON.
-     *
-     * @return dataType
-     **/
-    @Schema(example = "string", description = "The type of field represented in this data matrix. This is intended to help parse the data out of JSON.")
-    public DataTypeEnum getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        AlleleMatrixDataMatrices alleleMatrixDataMatrices = (AlleleMatrixDataMatrices) o;
-        return Objects.equals(this.dataMatrix, alleleMatrixDataMatrices.dataMatrix) &&
-                Objects.equals(this.dataMatrixAbbreviation, alleleMatrixDataMatrices.dataMatrixAbbreviation) &&
-                Objects.equals(this.dataMatrixName, alleleMatrixDataMatrices.dataMatrixName) &&
-                Objects.equals(this.dataType, alleleMatrixDataMatrices.dataType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(dataMatrix, dataMatrixAbbreviation, dataMatrixName, dataType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class AlleleMatrixDataMatrices {\n");
-
-        sb.append("    dataMatrix: ").append(toIndentedString(dataMatrix)).append("\n");
-        sb.append("    dataMatrixAbbreviation: ").append(toIndentedString(dataMatrixAbbreviation)).append("\n");
-        sb.append("    dataMatrixName: ").append(toIndentedString(dataMatrixName)).append("\n");
-        sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixPagination.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixPagination.java
deleted file mode 100644
index 8f32252c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixPagination.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * AlleleMatrixPagination
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class AlleleMatrixPagination {
-    /**
-     * The dimension of the matrix being paginated
-     */
-    @JsonAdapter(DimensionEnum.Adapter.class)
-    public enum DimensionEnum {
-        CALLSETS("CALLSETS"),
-        VARIANTS("VARIANTS");
-
-        private String value;
-
-        DimensionEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DimensionEnum fromValue(String input) {
-            for (DimensionEnum b : DimensionEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DimensionEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DimensionEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DimensionEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DimensionEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dimension")
-    private DimensionEnum dimension = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("totalCount")
-    private Integer totalCount = null;
-
-    @SerializedName("totalPages")
-    private Integer totalPages = null;
-
-    public AlleleMatrixPagination dimension(DimensionEnum dimension) {
-        this.dimension = dimension;
-        return this;
-    }
-
-    /**
-     * The dimension of the matrix being paginated
-     *
-     * @return dimension
-     **/
-    @Schema(example = "VARIANTS", description = "The dimension of the matrix being paginated")
-    public DimensionEnum getDimension() {
-        return dimension;
-    }
-
-    public void setDimension(DimensionEnum dimension) {
-        this.dimension = dimension;
-    }
-
-    public AlleleMatrixPagination page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * the requested page number (zero indexed)
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "the requested page number (zero indexed)")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public AlleleMatrixPagination pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * the maximum number of elements per page in this dimension of the matrix
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "500", description = "the maximum number of elements per page in this dimension of the matrix")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public AlleleMatrixPagination totalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-        return this;
-    }
-
-    /**
-     * The total number of elements that are available on the server and match the requested query parameters.
-     *
-     * @return totalCount
-     **/
-    @Schema(example = "10000", description = "The total number of elements that are available on the server and match the requested query parameters.")
-    public Integer getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public AlleleMatrixPagination totalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-        return this;
-    }
-
-    /**
-     * The total number of pages of elements available on the server. This should be calculated with the following formula.  &lt;br/&gt;totalPages &#x3D; CEILING( totalCount / requested_page_size)
-     *
-     * @return totalPages
-     **/
-    @Schema(example = "20", description = "The total number of pages of elements available on the server. This should be calculated with the following formula.  <br/>totalPages = CEILING( totalCount / requested_page_size)")
-    public Integer getTotalPages() {
-        return totalPages;
-    }
-
-    public void setTotalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        AlleleMatrixPagination alleleMatrixPagination = (AlleleMatrixPagination) o;
-        return Objects.equals(this.dimension, alleleMatrixPagination.dimension) &&
-                Objects.equals(this.page, alleleMatrixPagination.page) &&
-                Objects.equals(this.pageSize, alleleMatrixPagination.pageSize) &&
-                Objects.equals(this.totalCount, alleleMatrixPagination.totalCount) &&
-                Objects.equals(this.totalPages, alleleMatrixPagination.totalPages);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(dimension, page, pageSize, totalCount, totalPages);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class AlleleMatrixPagination {\n");
-
-        sb.append("    dimension: ").append(toIndentedString(dimension)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    totalCount: ").append(toIndentedString(totalCount)).append("\n");
-        sb.append("    totalPages: ").append(toIndentedString(totalPages)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixResponse.java
deleted file mode 100644
index 91a899a4..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * AlleleMatrixResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class AlleleMatrixResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private AlleleMatrix result = null;
-
-    public AlleleMatrixResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public AlleleMatrixResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public AlleleMatrixResponse result(AlleleMatrix result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public AlleleMatrix getResult() {
-        return result;
-    }
-
-    public void setResult(AlleleMatrix result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        AlleleMatrixResponse alleleMatrixResponse = (AlleleMatrixResponse) o;
-        return Objects.equals(this._atContext, alleleMatrixResponse._atContext) &&
-                Objects.equals(this.metadata, alleleMatrixResponse.metadata) &&
-                Objects.equals(this.result, alleleMatrixResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class AlleleMatrixResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixSearchRequest.java
deleted file mode 100644
index 0827c2be..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixSearchRequest.java
+++ /dev/null
@@ -1,538 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * AlleleMatrixSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class AlleleMatrixSearchRequest {
-    @SerializedName("callSetDbIds")
-    private List<String> callSetDbIds = null;
-
-    @SerializedName("dataMatrixAbbreviations")
-    private List<String> dataMatrixAbbreviations = null;
-
-    @SerializedName("dataMatrixNames")
-    private List<String> dataMatrixNames = null;
-
-    @SerializedName("expandHomozygotes")
-    private Boolean expandHomozygotes = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("germplasmPUIs")
-    private List<String> germplasmPUIs = null;
-
-    @SerializedName("pagination")
-    private List<AlleleMatrixSearchRequestPagination> pagination = null;
-
-    @SerializedName("positionRanges")
-    private List<String> positionRanges = null;
-
-    @SerializedName("preview")
-    private Boolean preview = false;
-
-    @SerializedName("sampleDbIds")
-    private List<String> sampleDbIds = null;
-
-    @SerializedName("sepPhased")
-    private String sepPhased = null;
-
-    @SerializedName("sepUnphased")
-    private String sepUnphased = null;
-
-    @SerializedName("unknownString")
-    private String unknownString = null;
-
-    @SerializedName("variantDbIds")
-    private List<String> variantDbIds = null;
-
-    @SerializedName("variantSetDbIds")
-    private List<String> variantSetDbIds = null;
-
-    public AlleleMatrixSearchRequest callSetDbIds(List<String> callSetDbIds) {
-        this.callSetDbIds = callSetDbIds;
-        return this;
-    }
-
-    public AlleleMatrixSearchRequest addCallSetDbIdsItem(String callSetDbIdsItem) {
-        if (this.callSetDbIds == null) {
-            this.callSetDbIds = new ArrayList<String>();
-        }
-        this.callSetDbIds.add(callSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;CallSets&#x60; within the given database server
-     *
-     * @return callSetDbIds
-     **/
-    @Schema(example = "[\"a03202ec\",\"274e4f63\"]", description = "A list of IDs which uniquely identify `CallSets` within the given database server")
-    public List<String> getCallSetDbIds() {
-        return callSetDbIds;
-    }
-
-    public void setCallSetDbIds(List<String> callSetDbIds) {
-        this.callSetDbIds = callSetDbIds;
-    }
-
-    public AlleleMatrixSearchRequest dataMatrixAbbreviations(List<String> dataMatrixAbbreviations) {
-        this.dataMatrixAbbreviations = dataMatrixAbbreviations;
-        return this;
-    }
-
-    public AlleleMatrixSearchRequest addDataMatrixAbbreviationsItem(String dataMatrixAbbreviationsItem) {
-        if (this.dataMatrixAbbreviations == null) {
-            this.dataMatrixAbbreviations = new ArrayList<String>();
-        }
-        this.dataMatrixAbbreviations.add(dataMatrixAbbreviationsItem);
-        return this;
-    }
-
-    /**
-     * &#x60;dataMatrixAbbreviations&#x60; is a comma seperated list of abbreviations (ie &#x27;GT&#x27;, &#x27;RD&#x27; etc). This list controls which data matrices are returned in the response.
-     *
-     * @return dataMatrixAbbreviations
-     **/
-    @Schema(example = "[\"GT\",\"RD\"]", description = "`dataMatrixAbbreviations` is a comma seperated list of abbreviations (ie 'GT', 'RD' etc). This list controls which data matrices are returned in the response.")
-    public List<String> getDataMatrixAbbreviations() {
-        return dataMatrixAbbreviations;
-    }
-
-    public void setDataMatrixAbbreviations(List<String> dataMatrixAbbreviations) {
-        this.dataMatrixAbbreviations = dataMatrixAbbreviations;
-    }
-
-    public AlleleMatrixSearchRequest dataMatrixNames(List<String> dataMatrixNames) {
-        this.dataMatrixNames = dataMatrixNames;
-        return this;
-    }
-
-    public AlleleMatrixSearchRequest addDataMatrixNamesItem(String dataMatrixNamesItem) {
-        if (this.dataMatrixNames == null) {
-            this.dataMatrixNames = new ArrayList<String>();
-        }
-        this.dataMatrixNames.add(dataMatrixNamesItem);
-        return this;
-    }
-
-    /**
-     * &#x60;dataMatrixNames&#x60; is a list of names (ie &#x27;Genotype&#x27;, &#x27;Read Depth&#x27; etc). This list controls which data matrices are returned in the response.
-     *
-     * @return dataMatrixNames
-     **/
-    @Schema(example = "[\"Genotype\",\"Read Depth\"]", description = "`dataMatrixNames` is a list of names (ie 'Genotype', 'Read Depth' etc). This list controls which data matrices are returned in the response.")
-    public List<String> getDataMatrixNames() {
-        return dataMatrixNames;
-    }
-
-    public void setDataMatrixNames(List<String> dataMatrixNames) {
-        this.dataMatrixNames = dataMatrixNames;
-    }
-
-    public AlleleMatrixSearchRequest expandHomozygotes(Boolean expandHomozygotes) {
-        this.expandHomozygotes = expandHomozygotes;
-        return this;
-    }
-
-    /**
-     * Should homozygotes be expanded (true) or collapsed into a single occurrence (false)
-     *
-     * @return expandHomozygotes
-     **/
-    @Schema(example = "true", description = "Should homozygotes be expanded (true) or collapsed into a single occurrence (false)")
-    public Boolean isExpandHomozygotes() {
-        return expandHomozygotes;
-    }
-
-    public void setExpandHomozygotes(Boolean expandHomozygotes) {
-        this.expandHomozygotes = expandHomozygotes;
-    }
-
-    public AlleleMatrixSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public AlleleMatrixSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;Germplasm&#x60; within the given database server
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"a03202ec\",\"274e4f63\"]", description = "A list of IDs which uniquely identify `Germplasm` within the given database server")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public AlleleMatrixSearchRequest germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public AlleleMatrixSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * A list of human readable &#x60;Germplasm&#x60; names
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"a03202ec\",\"274e4f63\"]", description = "A list of human readable `Germplasm` names")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public AlleleMatrixSearchRequest germplasmPUIs(List<String> germplasmPUIs) {
-        this.germplasmPUIs = germplasmPUIs;
-        return this;
-    }
-
-    public AlleleMatrixSearchRequest addGermplasmPUIsItem(String germplasmPUIsItem) {
-        if (this.germplasmPUIs == null) {
-            this.germplasmPUIs = new ArrayList<String>();
-        }
-        this.germplasmPUIs.add(germplasmPUIsItem);
-        return this;
-    }
-
-    /**
-     * A list of premenant unique identifiers associated with &#x60;Germplasm&#x60;
-     *
-     * @return germplasmPUIs
-     **/
-    @Schema(example = "[\"a03202ec\",\"274e4f63\"]", description = "A list of premenant unique identifiers associated with `Germplasm`")
-    public List<String> getGermplasmPUIs() {
-        return germplasmPUIs;
-    }
-
-    public void setGermplasmPUIs(List<String> germplasmPUIs) {
-        this.germplasmPUIs = germplasmPUIs;
-    }
-
-    public AlleleMatrixSearchRequest pagination(List<AlleleMatrixSearchRequestPagination> pagination) {
-        this.pagination = pagination;
-        return this;
-    }
-
-    public AlleleMatrixSearchRequest addPaginationItem(AlleleMatrixSearchRequestPagination paginationItem) {
-        if (this.pagination == null) {
-            this.pagination = new ArrayList<AlleleMatrixSearchRequestPagination>();
-        }
-        this.pagination.add(paginationItem);
-        return this;
-    }
-
-    /**
-     * Pagination for the matrix
-     *
-     * @return pagination
-     **/
-    @Schema(example = "[{\"dimension\":\"variants\",\"page\":0,\"pageSize\":500},{\"dimension\":\"callsets\",\"page\":4,\"pageSize\":1000}]", description = "Pagination for the matrix")
-    public List<AlleleMatrixSearchRequestPagination> getPagination() {
-        return pagination;
-    }
-
-    public void setPagination(List<AlleleMatrixSearchRequestPagination> pagination) {
-        this.pagination = pagination;
-    }
-
-    public AlleleMatrixSearchRequest positionRanges(List<String> positionRanges) {
-        this.positionRanges = positionRanges;
-        return this;
-    }
-
-    public AlleleMatrixSearchRequest addPositionRangesItem(String positionRangesItem) {
-        if (this.positionRanges == null) {
-            this.positionRanges = new ArrayList<String>();
-        }
-        this.positionRanges.add(positionRangesItem);
-        return this;
-    }
-
-    /**
-     * The postion range to search &lt;br/&gt; Uses the format \&quot;&lt;chrom&gt;:&lt;start&gt;-&lt;end&gt;\&quot; where &lt;chrom&gt; is the chromosome name, &lt;start&gt; is  the starting position of the range, and &lt;end&gt; is the ending position of the range
-     *
-     * @return positionRanges
-     **/
-    @Schema(example = "[\"20:1000-35000\",\"20:87000-125000\"]", description = "The postion range to search <br/> Uses the format \"<chrom>:<start>-<end>\" where <chrom> is the chromosome name, <start> is  the starting position of the range, and <end> is the ending position of the range")
-    public List<String> getPositionRanges() {
-        return positionRanges;
-    }
-
-    public void setPositionRanges(List<String> positionRanges) {
-        this.positionRanges = positionRanges;
-    }
-
-    public AlleleMatrixSearchRequest preview(Boolean preview) {
-        this.preview = preview;
-        return this;
-    }
-
-    /**
-     * Default Value &#x3D; false &lt;br/&gt; If &#x27;preview&#x27; is set to true, then the server should only return the lists of &#x27;callSetDbIds&#x27;,  &#x27;variantDbIds&#x27;, and &#x27;variantSetDbIds&#x27;. The server should not return any matrix data. This is intended to be a preview and give the client a sense of how large the matrix returned will be &lt;br/&gt; If &#x27;preview&#x27; is set to false or not set (default), then the server should return all the matrix data as requested.
-     *
-     * @return preview
-     **/
-    @Schema(example = "true", description = "Default Value = false <br/> If 'preview' is set to true, then the server should only return the lists of 'callSetDbIds',  'variantDbIds', and 'variantSetDbIds'. The server should not return any matrix data. This is intended to be a preview and give the client a sense of how large the matrix returned will be <br/> If 'preview' is set to false or not set (default), then the server should return all the matrix data as requested.")
-    public Boolean isPreview() {
-        return preview;
-    }
-
-    public void setPreview(Boolean preview) {
-        this.preview = preview;
-    }
-
-    public AlleleMatrixSearchRequest sampleDbIds(List<String> sampleDbIds) {
-        this.sampleDbIds = sampleDbIds;
-        return this;
-    }
-
-    public AlleleMatrixSearchRequest addSampleDbIdsItem(String sampleDbIdsItem) {
-        if (this.sampleDbIds == null) {
-            this.sampleDbIds = new ArrayList<String>();
-        }
-        this.sampleDbIds.add(sampleDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;Samples&#x60; within the given database server
-     *
-     * @return sampleDbIds
-     **/
-    @Schema(example = "[\"a03202ec\",\"274e4f63\"]", description = "A list of IDs which uniquely identify `Samples` within the given database server")
-    public List<String> getSampleDbIds() {
-        return sampleDbIds;
-    }
-
-    public void setSampleDbIds(List<String> sampleDbIds) {
-        this.sampleDbIds = sampleDbIds;
-    }
-
-    public AlleleMatrixSearchRequest sepPhased(String sepPhased) {
-        this.sepPhased = sepPhased;
-        return this;
-    }
-
-    /**
-     * The string used as a separator for phased allele calls.
-     *
-     * @return sepPhased
-     **/
-    @Schema(example = "|", description = "The string used as a separator for phased allele calls.")
-    public String getSepPhased() {
-        return sepPhased;
-    }
-
-    public void setSepPhased(String sepPhased) {
-        this.sepPhased = sepPhased;
-    }
-
-    public AlleleMatrixSearchRequest sepUnphased(String sepUnphased) {
-        this.sepUnphased = sepUnphased;
-        return this;
-    }
-
-    /**
-     * The string used as a separator for unphased allele calls.
-     *
-     * @return sepUnphased
-     **/
-    @Schema(example = "/", description = "The string used as a separator for unphased allele calls.")
-    public String getSepUnphased() {
-        return sepUnphased;
-    }
-
-    public void setSepUnphased(String sepUnphased) {
-        this.sepUnphased = sepUnphased;
-    }
-
-    public AlleleMatrixSearchRequest unknownString(String unknownString) {
-        this.unknownString = unknownString;
-        return this;
-    }
-
-    /**
-     * The string used as a representation for missing data.
-     *
-     * @return unknownString
-     **/
-    @Schema(example = ".", description = "The string used as a representation for missing data.")
-    public String getUnknownString() {
-        return unknownString;
-    }
-
-    public void setUnknownString(String unknownString) {
-        this.unknownString = unknownString;
-    }
-
-    public AlleleMatrixSearchRequest variantDbIds(List<String> variantDbIds) {
-        this.variantDbIds = variantDbIds;
-        return this;
-    }
-
-    public AlleleMatrixSearchRequest addVariantDbIdsItem(String variantDbIdsItem) {
-        if (this.variantDbIds == null) {
-            this.variantDbIds = new ArrayList<String>();
-        }
-        this.variantDbIds.add(variantDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;Variants&#x60; within the given database server
-     *
-     * @return variantDbIds
-     **/
-    @Schema(example = "[\"bba0b258\",\"ff97d4f0\"]", description = "A list of IDs which uniquely identify `Variants` within the given database server")
-    public List<String> getVariantDbIds() {
-        return variantDbIds;
-    }
-
-    public void setVariantDbIds(List<String> variantDbIds) {
-        this.variantDbIds = variantDbIds;
-    }
-
-    public AlleleMatrixSearchRequest variantSetDbIds(List<String> variantSetDbIds) {
-        this.variantSetDbIds = variantSetDbIds;
-        return this;
-    }
-
-    public AlleleMatrixSearchRequest addVariantSetDbIdsItem(String variantSetDbIdsItem) {
-        if (this.variantSetDbIds == null) {
-            this.variantSetDbIds = new ArrayList<String>();
-        }
-        this.variantSetDbIds.add(variantSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;VariantSets&#x60; within the given database server
-     *
-     * @return variantSetDbIds
-     **/
-    @Schema(example = "[\"407c0508\",\"49e24dfc\"]", description = "A list of IDs which uniquely identify `VariantSets` within the given database server")
-    public List<String> getVariantSetDbIds() {
-        return variantSetDbIds;
-    }
-
-    public void setVariantSetDbIds(List<String> variantSetDbIds) {
-        this.variantSetDbIds = variantSetDbIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        AlleleMatrixSearchRequest alleleMatrixSearchRequest = (AlleleMatrixSearchRequest) o;
-        return Objects.equals(this.callSetDbIds, alleleMatrixSearchRequest.callSetDbIds) &&
-                Objects.equals(this.dataMatrixAbbreviations, alleleMatrixSearchRequest.dataMatrixAbbreviations) &&
-                Objects.equals(this.dataMatrixNames, alleleMatrixSearchRequest.dataMatrixNames) &&
-                Objects.equals(this.expandHomozygotes, alleleMatrixSearchRequest.expandHomozygotes) &&
-                Objects.equals(this.germplasmDbIds, alleleMatrixSearchRequest.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, alleleMatrixSearchRequest.germplasmNames) &&
-                Objects.equals(this.germplasmPUIs, alleleMatrixSearchRequest.germplasmPUIs) &&
-                Objects.equals(this.pagination, alleleMatrixSearchRequest.pagination) &&
-                Objects.equals(this.positionRanges, alleleMatrixSearchRequest.positionRanges) &&
-                Objects.equals(this.preview, alleleMatrixSearchRequest.preview) &&
-                Objects.equals(this.sampleDbIds, alleleMatrixSearchRequest.sampleDbIds) &&
-                Objects.equals(this.sepPhased, alleleMatrixSearchRequest.sepPhased) &&
-                Objects.equals(this.sepUnphased, alleleMatrixSearchRequest.sepUnphased) &&
-                Objects.equals(this.unknownString, alleleMatrixSearchRequest.unknownString) &&
-                Objects.equals(this.variantDbIds, alleleMatrixSearchRequest.variantDbIds) &&
-                Objects.equals(this.variantSetDbIds, alleleMatrixSearchRequest.variantSetDbIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(callSetDbIds, dataMatrixAbbreviations, dataMatrixNames, expandHomozygotes, germplasmDbIds, germplasmNames, germplasmPUIs, pagination, positionRanges, preview, sampleDbIds, sepPhased, sepUnphased, unknownString, variantDbIds, variantSetDbIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class AlleleMatrixSearchRequest {\n");
-
-        sb.append("    callSetDbIds: ").append(toIndentedString(callSetDbIds)).append("\n");
-        sb.append("    dataMatrixAbbreviations: ").append(toIndentedString(dataMatrixAbbreviations)).append("\n");
-        sb.append("    dataMatrixNames: ").append(toIndentedString(dataMatrixNames)).append("\n");
-        sb.append("    expandHomozygotes: ").append(toIndentedString(expandHomozygotes)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    germplasmPUIs: ").append(toIndentedString(germplasmPUIs)).append("\n");
-        sb.append("    pagination: ").append(toIndentedString(pagination)).append("\n");
-        sb.append("    positionRanges: ").append(toIndentedString(positionRanges)).append("\n");
-        sb.append("    preview: ").append(toIndentedString(preview)).append("\n");
-        sb.append("    sampleDbIds: ").append(toIndentedString(sampleDbIds)).append("\n");
-        sb.append("    sepPhased: ").append(toIndentedString(sepPhased)).append("\n");
-        sb.append("    sepUnphased: ").append(toIndentedString(sepUnphased)).append("\n");
-        sb.append("    unknownString: ").append(toIndentedString(unknownString)).append("\n");
-        sb.append("    variantDbIds: ").append(toIndentedString(variantDbIds)).append("\n");
-        sb.append("    variantSetDbIds: ").append(toIndentedString(variantSetDbIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixSearchRequestPagination.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixSearchRequestPagination.java
deleted file mode 100644
index 338fac24..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AlleleMatrixSearchRequestPagination.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * AlleleMatrixSearchRequestPagination
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class AlleleMatrixSearchRequestPagination {
-    /**
-     * the dimension of the matrix being paginated
-     */
-    @JsonAdapter(DimensionEnum.Adapter.class)
-    public enum DimensionEnum {
-        CALLSETS("CALLSETS"),
-        VARIANTS("VARIANTS");
-
-        private String value;
-
-        DimensionEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DimensionEnum fromValue(String input) {
-            for (DimensionEnum b : DimensionEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DimensionEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DimensionEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DimensionEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DimensionEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dimension")
-    private DimensionEnum dimension = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    public AlleleMatrixSearchRequestPagination dimension(DimensionEnum dimension) {
-        this.dimension = dimension;
-        return this;
-    }
-
-    /**
-     * the dimension of the matrix being paginated
-     *
-     * @return dimension
-     **/
-    @Schema(example = "VARIANTS", description = "the dimension of the matrix being paginated")
-    public DimensionEnum getDimension() {
-        return dimension;
-    }
-
-    public void setDimension(DimensionEnum dimension) {
-        this.dimension = dimension;
-    }
-
-    public AlleleMatrixSearchRequestPagination page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * the requested page number (zero indexed)
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "the requested page number (zero indexed)")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public AlleleMatrixSearchRequestPagination pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * the maximum number of elements per page in this dimension of the matrix
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "500", description = "the maximum number of elements per page in this dimension of the matrix")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        AlleleMatrixSearchRequestPagination alleleMatrixSearchRequestPagination = (AlleleMatrixSearchRequestPagination) o;
-        return Objects.equals(this.dimension, alleleMatrixSearchRequestPagination.dimension) &&
-                Objects.equals(this.page, alleleMatrixSearchRequestPagination.page) &&
-                Objects.equals(this.pageSize, alleleMatrixSearchRequestPagination.pageSize);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(dimension, page, pageSize);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class AlleleMatrixSearchRequestPagination {\n");
-
-        sb.append("    dimension: ").append(toIndentedString(dimension)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Analysis.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Analysis.java
deleted file mode 100644
index 78f8f3c7..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Analysis.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An analysis contains an interpretation of one or several experiments. (e.g. SNVs, copy number variations, methylation status) together with information about the methodology used.
- */
-@Schema(description = "An analysis contains an interpretation of one or several experiments. (e.g. SNVs, copy number variations, methylation status) together with information about the methodology used.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class Analysis {
-    @SerializedName("analysisDbId")
-    private String analysisDbId = null;
-
-    @SerializedName("analysisName")
-    private String analysisName = null;
-
-    @SerializedName("created")
-    private OffsetDateTime created = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("software")
-    private List<String> software = null;
-
-    @SerializedName("type")
-    private String type = null;
-
-    @SerializedName("updated")
-    private OffsetDateTime updated = null;
-
-    public Analysis analysisDbId(String analysisDbId) {
-        this.analysisDbId = analysisDbId;
-        return this;
-    }
-
-    /**
-     * Unique identifier for this analysis description
-     *
-     * @return analysisDbId
-     **/
-    @Schema(example = "6191a6bd", description = "Unique identifier for this analysis description")
-    public String getAnalysisDbId() {
-        return analysisDbId;
-    }
-
-    public void setAnalysisDbId(String analysisDbId) {
-        this.analysisDbId = analysisDbId;
-    }
-
-    public Analysis analysisName(String analysisName) {
-        this.analysisName = analysisName;
-        return this;
-    }
-
-    /**
-     * A human readable name for this analysis
-     *
-     * @return analysisName
-     **/
-    @Schema(example = "Standard QC", description = "A human readable name for this analysis")
-    public String getAnalysisName() {
-        return analysisName;
-    }
-
-    public void setAnalysisName(String analysisName) {
-        this.analysisName = analysisName;
-    }
-
-    public Analysis created(OffsetDateTime created) {
-        this.created = created;
-        return this;
-    }
-
-    /**
-     * The time at which this record was created, in ISO 8601 format.
-     *
-     * @return created
-     **/
-    @Schema(description = "The time at which this record was created, in ISO 8601 format.")
-    public OffsetDateTime getCreated() {
-        return created;
-    }
-
-    public void setCreated(OffsetDateTime created) {
-        this.created = created;
-    }
-
-    public Analysis description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * A human readable description of the analysis
-     *
-     * @return description
-     **/
-    @Schema(example = "This is a formal description of a QC methodology. Blah blah blah ...", description = "A human readable description of the analysis")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Analysis software(List<String> software) {
-        this.software = software;
-        return this;
-    }
-
-    public Analysis addSoftwareItem(String softwareItem) {
-        if (this.software == null) {
-            this.software = new ArrayList<String>();
-        }
-        this.software.add(softwareItem);
-        return this;
-    }
-
-    /**
-     * The software run to generate this analysis.
-     *
-     * @return software
-     **/
-    @Schema(example = "[\"https://github.com/genotyping/QC\"]", description = "The software run to generate this analysis.")
-    public List<String> getSoftware() {
-        return software;
-    }
-
-    public void setSoftware(List<String> software) {
-        this.software = software;
-    }
-
-    public Analysis type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The type of analysis.
-     *
-     * @return type
-     **/
-    @Schema(example = "QC", description = "The type of analysis.")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public Analysis updated(OffsetDateTime updated) {
-        this.updated = updated;
-        return this;
-    }
-
-    /**
-     * The time at which this record was last updated, in ISO 8601 format.
-     *
-     * @return updated
-     **/
-    @Schema(description = "The time at which this record was last updated, in ISO 8601 format.")
-    public OffsetDateTime getUpdated() {
-        return updated;
-    }
-
-    public void setUpdated(OffsetDateTime updated) {
-        this.updated = updated;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Analysis analysis = (Analysis) o;
-        return Objects.equals(this.analysisDbId, analysis.analysisDbId) &&
-                Objects.equals(this.analysisName, analysis.analysisName) &&
-                Objects.equals(this.created, analysis.created) &&
-                Objects.equals(this.description, analysis.description) &&
-                Objects.equals(this.software, analysis.software) &&
-                Objects.equals(this.type, analysis.type) &&
-                Objects.equals(this.updated, analysis.updated);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(analysisDbId, analysisName, created, description, software, type, updated);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Analysis {\n");
-
-        sb.append("    analysisDbId: ").append(toIndentedString(analysisDbId)).append("\n");
-        sb.append("    analysisName: ").append(toIndentedString(analysisName)).append("\n");
-        sb.append("    created: ").append(toIndentedString(created)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    software: ").append(toIndentedString(software)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("    updated: ").append(toIndentedString(updated)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AvailableFormat.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AvailableFormat.java
deleted file mode 100644
index 6ab054be..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/AvailableFormat.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * Each &#x27;availableFormat&#x27; object is a pairing of dataFormat and fileFormat. These must be communicated in pairs because they are not independant parameters and sometimes one influences the other.
- */
-@Schema(description = "Each 'availableFormat' object is a pairing of dataFormat and fileFormat. These must be communicated in pairs because they are not independant parameters and sometimes one influences the other.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class AvailableFormat {
-    /**
-     * dataFormat defines the structure of the data within a file (ie DartSeq, VCF, Hapmap, tabular, etc)
-     */
-    @JsonAdapter(DataFormatEnum.Adapter.class)
-    public enum DataFormatEnum {
-        DARTSEQ("DartSeq"),
-        VCF("VCF"),
-        HAPMAP("Hapmap"),
-        TABULAR("tabular"),
-        JSON("JSON");
-
-        private String value;
-
-        DataFormatEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataFormatEnum fromValue(String input) {
-            for (DataFormatEnum b : DataFormatEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataFormatEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataFormatEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataFormatEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataFormatEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataFormat")
-    private DataFormatEnum dataFormat = null;
-
-    @SerializedName("expandHomozygotes")
-    private Boolean expandHomozygotes = null;
-
-    /**
-     * fileFormat defines the MIME type of the file (ie text/csv, application/excel, application/zip). This should also be reflected in the Accept and ContentType HTTP headers for every relevant request and response.
-     */
-    @JsonAdapter(FileFormatEnum.Adapter.class)
-    public enum FileFormatEnum {
-        TEXT_CSV("text/csv"),
-        TEXT_TSV("text/tsv"),
-        APPLICATION_EXCEL("application/excel"),
-        APPLICATION_ZIP("application/zip"),
-        APPLICATION_JSON("application/json");
-
-        private String value;
-
-        FileFormatEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static FileFormatEnum fromValue(String input) {
-            for (FileFormatEnum b : FileFormatEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<FileFormatEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final FileFormatEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public FileFormatEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return FileFormatEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("fileFormat")
-    private FileFormatEnum fileFormat = null;
-
-    @SerializedName("fileURL")
-    private String fileURL = null;
-
-    @SerializedName("sepPhased")
-    private String sepPhased = null;
-
-    @SerializedName("sepUnphased")
-    private String sepUnphased = null;
-
-    @SerializedName("unknownString")
-    private String unknownString = null;
-
-    public AvailableFormat dataFormat(DataFormatEnum dataFormat) {
-        this.dataFormat = dataFormat;
-        return this;
-    }
-
-    /**
-     * dataFormat defines the structure of the data within a file (ie DartSeq, VCF, Hapmap, tabular, etc)
-     *
-     * @return dataFormat
-     **/
-    @Schema(description = "dataFormat defines the structure of the data within a file (ie DartSeq, VCF, Hapmap, tabular, etc)")
-    public DataFormatEnum getDataFormat() {
-        return dataFormat;
-    }
-
-    public void setDataFormat(DataFormatEnum dataFormat) {
-        this.dataFormat = dataFormat;
-    }
-
-    public AvailableFormat expandHomozygotes(Boolean expandHomozygotes) {
-        this.expandHomozygotes = expandHomozygotes;
-        return this;
-    }
-
-    /**
-     * Should homozygotes be expanded (true) or collapsed into a single occurrence (false)
-     *
-     * @return expandHomozygotes
-     **/
-    @Schema(example = "true", description = "Should homozygotes be expanded (true) or collapsed into a single occurrence (false)")
-    public Boolean isExpandHomozygotes() {
-        return expandHomozygotes;
-    }
-
-    public void setExpandHomozygotes(Boolean expandHomozygotes) {
-        this.expandHomozygotes = expandHomozygotes;
-    }
-
-    public AvailableFormat fileFormat(FileFormatEnum fileFormat) {
-        this.fileFormat = fileFormat;
-        return this;
-    }
-
-    /**
-     * fileFormat defines the MIME type of the file (ie text/csv, application/excel, application/zip). This should also be reflected in the Accept and ContentType HTTP headers for every relevant request and response.
-     *
-     * @return fileFormat
-     **/
-    @Schema(description = "fileFormat defines the MIME type of the file (ie text/csv, application/excel, application/zip). This should also be reflected in the Accept and ContentType HTTP headers for every relevant request and response.")
-    public FileFormatEnum getFileFormat() {
-        return fileFormat;
-    }
-
-    public void setFileFormat(FileFormatEnum fileFormat) {
-        this.fileFormat = fileFormat;
-    }
-
-    public AvailableFormat fileURL(String fileURL) {
-        this.fileURL = fileURL;
-        return this;
-    }
-
-    /**
-     * A URL which indicates the location of the file version of this VariantSet. Could be a static file URL or an API endpoint which generates the file.
-     *
-     * @return fileURL
-     **/
-    @Schema(description = "A URL which indicates the location of the file version of this VariantSet. Could be a static file URL or an API endpoint which generates the file.")
-    public String getFileURL() {
-        return fileURL;
-    }
-
-    public void setFileURL(String fileURL) {
-        this.fileURL = fileURL;
-    }
-
-    public AvailableFormat sepPhased(String sepPhased) {
-        this.sepPhased = sepPhased;
-        return this;
-    }
-
-    /**
-     * The string used as a separator for phased allele calls.
-     *
-     * @return sepPhased
-     **/
-    @Schema(example = "|", description = "The string used as a separator for phased allele calls.")
-    public String getSepPhased() {
-        return sepPhased;
-    }
-
-    public void setSepPhased(String sepPhased) {
-        this.sepPhased = sepPhased;
-    }
-
-    public AvailableFormat sepUnphased(String sepUnphased) {
-        this.sepUnphased = sepUnphased;
-        return this;
-    }
-
-    /**
-     * The string used as a separator for unphased allele calls.
-     *
-     * @return sepUnphased
-     **/
-    @Schema(example = "/", description = "The string used as a separator for unphased allele calls.")
-    public String getSepUnphased() {
-        return sepUnphased;
-    }
-
-    public void setSepUnphased(String sepUnphased) {
-        this.sepUnphased = sepUnphased;
-    }
-
-    public AvailableFormat unknownString(String unknownString) {
-        this.unknownString = unknownString;
-        return this;
-    }
-
-    /**
-     * The string used as a representation for missing data.
-     *
-     * @return unknownString
-     **/
-    @Schema(example = ".", description = "The string used as a representation for missing data.")
-    public String getUnknownString() {
-        return unknownString;
-    }
-
-    public void setUnknownString(String unknownString) {
-        this.unknownString = unknownString;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        AvailableFormat availableFormat = (AvailableFormat) o;
-        return Objects.equals(this.dataFormat, availableFormat.dataFormat) &&
-                Objects.equals(this.expandHomozygotes, availableFormat.expandHomozygotes) &&
-                Objects.equals(this.fileFormat, availableFormat.fileFormat) &&
-                Objects.equals(this.fileURL, availableFormat.fileURL) &&
-                Objects.equals(this.sepPhased, availableFormat.sepPhased) &&
-                Objects.equals(this.sepUnphased, availableFormat.sepUnphased) &&
-                Objects.equals(this.unknownString, availableFormat.unknownString);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(dataFormat, expandHomozygotes, fileFormat, fileURL, sepPhased, sepUnphased, unknownString);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class AvailableFormat {\n");
-
-        sb.append("    dataFormat: ").append(toIndentedString(dataFormat)).append("\n");
-        sb.append("    expandHomozygotes: ").append(toIndentedString(expandHomozygotes)).append("\n");
-        sb.append("    fileFormat: ").append(toIndentedString(fileFormat)).append("\n");
-        sb.append("    fileURL: ").append(toIndentedString(fileURL)).append("\n");
-        sb.append("    sepPhased: ").append(toIndentedString(sepPhased)).append("\n");
-        sb.append("    sepUnphased: ").append(toIndentedString(sepUnphased)).append("\n");
-        sb.append("    unknownString: ").append(toIndentedString(unknownString)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/BasePagination.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/BasePagination.java
deleted file mode 100644
index b3c683d8..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/BasePagination.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * The pagination object is applicable only when the payload contains a \&quot;data\&quot; key. It describes the pagination of the data contained in the \&quot;data\&quot; array, as a way to identify which subset of data is being returned.  &lt;br&gt; Pages are zero indexed, so the first page will be page 0 (zero).
- */
-@Schema(description = "The pagination object is applicable only when the payload contains a \"data\" key. It describes the pagination of the data contained in the \"data\" array, as a way to identify which subset of data is being returned.  <br> Pages are zero indexed, so the first page will be page 0 (zero).")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class BasePagination {
-    @SerializedName("currentPage")
-    private Integer currentPage = 0;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = 1000;
-
-    @SerializedName("totalCount")
-    private Integer totalCount = null;
-
-    @SerializedName("totalPages")
-    private Integer totalPages = null;
-
-    public BasePagination currentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-        return this;
-    }
-
-    /**
-     * The index number for the returned page of data. This should always match the requested page number or the default page (0).
-     *
-     * @return currentPage
-     **/
-    @Schema(example = "0", required = true, description = "The index number for the returned page of data. This should always match the requested page number or the default page (0).")
-    public Integer getCurrentPage() {
-        return currentPage;
-    }
-
-    public void setCurrentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-    }
-
-    public BasePagination pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", required = true, description = "The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public BasePagination totalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-        return this;
-    }
-
-    /**
-     * The total number of elements that are available on the server and match the requested query parameters.
-     *
-     * @return totalCount
-     **/
-    @Schema(example = "10", description = "The total number of elements that are available on the server and match the requested query parameters.")
-    public Integer getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public BasePagination totalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-        return this;
-    }
-
-    /**
-     * The total number of pages of elements available on the server. This should be calculated with the following formula.  &lt;br&gt; totalPages &#x3D; CEILING( totalCount / requested_page_size)
-     *
-     * @return totalPages
-     **/
-    @Schema(example = "1", description = "The total number of pages of elements available on the server. This should be calculated with the following formula.  <br> totalPages = CEILING( totalCount / requested_page_size)")
-    public Integer getTotalPages() {
-        return totalPages;
-    }
-
-    public void setTotalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        BasePagination basePagination = (BasePagination) o;
-        return Objects.equals(this.currentPage, basePagination.currentPage) &&
-                Objects.equals(this.pageSize, basePagination.pageSize) &&
-                Objects.equals(this.totalCount, basePagination.totalCount) &&
-                Objects.equals(this.totalPages, basePagination.totalPages);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(currentPage, pageSize, totalCount, totalPages);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class BasePagination {\n");
-
-        sb.append("    currentPage: ").append(toIndentedString(currentPage)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    totalCount: ").append(toIndentedString(totalCount)).append("\n");
-        sb.append("    totalPages: ").append(toIndentedString(totalPages)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Call.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Call.java
deleted file mode 100644
index 9367e35c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Call.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A &#x60;Call&#x60; represents the determination of genotype with respect to a particular &#x60;Variant&#x60;.  It may include associated information such as quality and phasing. For example, a call might assign a probability of 0.32 to the occurrence of a SNP named RS_1234 in a call set with the name NA_12345.
- */
-@Schema(description = "A `Call` represents the determination of genotype with respect to a particular `Variant`.  It may include associated information such as quality and phasing. For example, a call might assign a probability of 0.32 to the occurrence of a SNP named RS_1234 in a call set with the name NA_12345.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class Call {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("callSetDbId")
-    private String callSetDbId = null;
-
-    @SerializedName("callSetName")
-    private String callSetName = null;
-
-    @SerializedName("genotype")
-    private ListValue genotype = null;
-
-    @SerializedName("genotypeMetadata")
-    private List<CallGenotypeMetadata> genotypeMetadata = null;
-
-    @SerializedName("genotypeValue")
-    private String genotypeValue = null;
-
-    @SerializedName("genotype_likelihood")
-    private List<Double> genotypeLikelihood = null;
-
-    @SerializedName("phaseSet")
-    private String phaseSet = null;
-
-    @SerializedName("variantDbId")
-    private String variantDbId = null;
-
-    @SerializedName("variantName")
-    private String variantName = null;
-
-    @SerializedName("variantSetDbId")
-    private String variantSetDbId = null;
-
-    @SerializedName("variantSetName")
-    private String variantSetName = null;
-
-    public Call additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Call putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Call callSetDbId(String callSetDbId) {
-        this.callSetDbId = callSetDbId;
-        return this;
-    }
-
-    /**
-     * The ID of the call set this variant call belongs to.  If this field is not present, the ordering of the call sets from a &#x60;SearchCallSetsRequest&#x60; over this &#x60;VariantSet&#x60; is guaranteed to match the ordering of the calls on this &#x60;Variant&#x60;. The number of results will also be the same.
-     *
-     * @return callSetDbId
-     **/
-    @Schema(example = "16466f55", description = "The ID of the call set this variant call belongs to.  If this field is not present, the ordering of the call sets from a `SearchCallSetsRequest` over this `VariantSet` is guaranteed to match the ordering of the calls on this `Variant`. The number of results will also be the same.")
-    public String getCallSetDbId() {
-        return callSetDbId;
-    }
-
-    public void setCallSetDbId(String callSetDbId) {
-        this.callSetDbId = callSetDbId;
-    }
-
-    public Call callSetName(String callSetName) {
-        this.callSetName = callSetName;
-        return this;
-    }
-
-    /**
-     * The name of the call set this variant call belongs to. If this field is not present, the ordering of the call sets from a &#x60;SearchCallSetsRequest&#x60; over this &#x60;VariantSet&#x60; is guaranteed to match the ordering of the calls on this &#x60;Variant&#x60;. The number of results will also be the same.
-     *
-     * @return callSetName
-     **/
-    @Schema(example = "Sample_123_DNA_Run_456", description = "The name of the call set this variant call belongs to. If this field is not present, the ordering of the call sets from a `SearchCallSetsRequest` over this `VariantSet` is guaranteed to match the ordering of the calls on this `Variant`. The number of results will also be the same.")
-    public String getCallSetName() {
-        return callSetName;
-    }
-
-    public void setCallSetName(String callSetName) {
-        this.callSetName = callSetName;
-    }
-
-    public Call genotype(ListValue genotype) {
-        this.genotype = genotype;
-        return this;
-    }
-
-    /**
-     * Get genotype
-     *
-     * @return genotype
-     **/
-    @Schema(description = "")
-    public ListValue getGenotype() {
-        return genotype;
-    }
-
-    public void setGenotype(ListValue genotype) {
-        this.genotype = genotype;
-    }
-
-    public Call genotypeMetadata(List<CallGenotypeMetadata> genotypeMetadata) {
-        this.genotypeMetadata = genotypeMetadata;
-        return this;
-    }
-
-    public Call addGenotypeMetadataItem(CallGenotypeMetadata genotypeMetadataItem) {
-        if (this.genotypeMetadata == null) {
-            this.genotypeMetadata = new ArrayList<CallGenotypeMetadata>();
-        }
-        this.genotypeMetadata.add(genotypeMetadataItem);
-        return this;
-    }
-
-    /**
-     * Genotype Metadata are additional layers of metadata associated with each genotype.
-     *
-     * @return genotypeMetadata
-     **/
-    @Schema(description = "Genotype Metadata are additional layers of metadata associated with each genotype.")
-    public List<CallGenotypeMetadata> getGenotypeMetadata() {
-        return genotypeMetadata;
-    }
-
-    public void setGenotypeMetadata(List<CallGenotypeMetadata> genotypeMetadata) {
-        this.genotypeMetadata = genotypeMetadata;
-    }
-
-    public Call genotypeValue(String genotypeValue) {
-        this.genotypeValue = genotypeValue;
-        return this;
-    }
-
-    /**
-     * The value of this genotype call
-     *
-     * @return genotypeValue
-     **/
-    @Schema(example = "1/1", description = "The value of this genotype call")
-    public String getGenotypeValue() {
-        return genotypeValue;
-    }
-
-    public void setGenotypeValue(String genotypeValue) {
-        this.genotypeValue = genotypeValue;
-    }
-
-    public Call genotypeLikelihood(List<Double> genotypeLikelihood) {
-        this.genotypeLikelihood = genotypeLikelihood;
-        return this;
-    }
-
-    public Call addGenotypeLikelihoodItem(Double genotypeLikelihoodItem) {
-        if (this.genotypeLikelihood == null) {
-            this.genotypeLikelihood = new ArrayList<Double>();
-        }
-        this.genotypeLikelihood.add(genotypeLikelihoodItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;genotypeMetadata&#x60;. Github issue number #491              &lt;br&gt;The genotype likelihood for this variant call. Each array entry represents how likely a specific genotype is for this call as log10(P(data | genotype)), analogous to the GL tag in the VCF spec. The value ordering is defined by the GL tag in the VCF spec.
-     *
-     * @return genotypeLikelihood
-     **/
-    @Schema(example = "[1]", description = "**Deprecated in v2.1** Please use `genotypeMetadata`. Github issue number #491              <br>The genotype likelihood for this variant call. Each array entry represents how likely a specific genotype is for this call as log10(P(data | genotype)), analogous to the GL tag in the VCF spec. The value ordering is defined by the GL tag in the VCF spec.")
-    public List<Double> getGenotypeLikelihood() {
-        return genotypeLikelihood;
-    }
-
-    public void setGenotypeLikelihood(List<Double> genotypeLikelihood) {
-        this.genotypeLikelihood = genotypeLikelihood;
-    }
-
-    public Call phaseSet(String phaseSet) {
-        this.phaseSet = phaseSet;
-        return this;
-    }
-
-    /**
-     * If this field is populated, this variant call&#x27;s genotype ordering implies the phase of the bases and  is consistent with any other variant calls on the same contig which have the same phase set string.
-     *
-     * @return phaseSet
-     **/
-    @Schema(example = "6410afc5", description = "If this field is populated, this variant call's genotype ordering implies the phase of the bases and  is consistent with any other variant calls on the same contig which have the same phase set string.")
-    public String getPhaseSet() {
-        return phaseSet;
-    }
-
-    public void setPhaseSet(String phaseSet) {
-        this.phaseSet = phaseSet;
-    }
-
-    public Call variantDbId(String variantDbId) {
-        this.variantDbId = variantDbId;
-        return this;
-    }
-
-    /**
-     * The ID of the variant this call belongs to.
-     *
-     * @return variantDbId
-     **/
-    @Schema(example = "538c8ecf", description = "The ID of the variant this call belongs to.")
-    public String getVariantDbId() {
-        return variantDbId;
-    }
-
-    public void setVariantDbId(String variantDbId) {
-        this.variantDbId = variantDbId;
-    }
-
-    public Call variantName(String variantName) {
-        this.variantName = variantName;
-        return this;
-    }
-
-    /**
-     * The name of the variant this call belongs to.
-     *
-     * @return variantName
-     **/
-    @Schema(example = "Marker A", description = "The name of the variant this call belongs to.")
-    public String getVariantName() {
-        return variantName;
-    }
-
-    public void setVariantName(String variantName) {
-        this.variantName = variantName;
-    }
-
-    public Call variantSetDbId(String variantSetDbId) {
-        this.variantSetDbId = variantSetDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a VariantSet
-     *
-     * @return variantSetDbId
-     **/
-    @Schema(example = "87a6ac1e", description = "The unique identifier for a VariantSet")
-    public String getVariantSetDbId() {
-        return variantSetDbId;
-    }
-
-    public void setVariantSetDbId(String variantSetDbId) {
-        this.variantSetDbId = variantSetDbId;
-    }
-
-    public Call variantSetName(String variantSetName) {
-        this.variantSetName = variantSetName;
-        return this;
-    }
-
-    /**
-     * The human readable name for a VariantSet
-     *
-     * @return variantSetName
-     **/
-    @Schema(example = "Maize QC DataSet 002334", description = "The human readable name for a VariantSet")
-    public String getVariantSetName() {
-        return variantSetName;
-    }
-
-    public void setVariantSetName(String variantSetName) {
-        this.variantSetName = variantSetName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Call call = (Call) o;
-        return Objects.equals(this.additionalInfo, call.additionalInfo) &&
-                Objects.equals(this.callSetDbId, call.callSetDbId) &&
-                Objects.equals(this.callSetName, call.callSetName) &&
-                Objects.equals(this.genotype, call.genotype) &&
-                Objects.equals(this.genotypeMetadata, call.genotypeMetadata) &&
-                Objects.equals(this.genotypeValue, call.genotypeValue) &&
-                Objects.equals(this.genotypeLikelihood, call.genotypeLikelihood) &&
-                Objects.equals(this.phaseSet, call.phaseSet) &&
-                Objects.equals(this.variantDbId, call.variantDbId) &&
-                Objects.equals(this.variantName, call.variantName) &&
-                Objects.equals(this.variantSetDbId, call.variantSetDbId) &&
-                Objects.equals(this.variantSetName, call.variantSetName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, callSetDbId, callSetName, genotype, genotypeMetadata, genotypeValue, genotypeLikelihood, phaseSet, variantDbId, variantName, variantSetDbId, variantSetName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Call {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    callSetDbId: ").append(toIndentedString(callSetDbId)).append("\n");
-        sb.append("    callSetName: ").append(toIndentedString(callSetName)).append("\n");
-        sb.append("    genotype: ").append(toIndentedString(genotype)).append("\n");
-        sb.append("    genotypeMetadata: ").append(toIndentedString(genotypeMetadata)).append("\n");
-        sb.append("    genotypeValue: ").append(toIndentedString(genotypeValue)).append("\n");
-        sb.append("    genotypeLikelihood: ").append(toIndentedString(genotypeLikelihood)).append("\n");
-        sb.append("    phaseSet: ").append(toIndentedString(phaseSet)).append("\n");
-        sb.append("    variantDbId: ").append(toIndentedString(variantDbId)).append("\n");
-        sb.append("    variantName: ").append(toIndentedString(variantName)).append("\n");
-        sb.append("    variantSetDbId: ").append(toIndentedString(variantSetDbId)).append("\n");
-        sb.append("    variantSetName: ").append(toIndentedString(variantSetName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallGenotypeMetadata.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallGenotypeMetadata.java
deleted file mode 100644
index 8e66bf48..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallGenotypeMetadata.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * CallGenotypeMetadata
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class CallGenotypeMetadata {
-    /**
-     * The type of field represented in this Genotype Field. This is intended to help parse the data out of JSON.
-     */
-    @JsonAdapter(DataTypeEnum.Adapter.class)
-    public enum DataTypeEnum {
-        STRING("string"),
-        INTEGER("integer"),
-        FLOAT("float"),
-        BOOLEAN("boolean");
-
-        private String value;
-
-        DataTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypeEnum fromValue(String input) {
-            for (DataTypeEnum b : DataTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataType")
-    private DataTypeEnum dataType = null;
-
-    @SerializedName("fieldAbbreviation")
-    private String fieldAbbreviation = null;
-
-    @SerializedName("fieldName")
-    private String fieldName = null;
-
-    @SerializedName("fieldValue")
-    private String fieldValue = null;
-
-    public CallGenotypeMetadata dataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-        return this;
-    }
-
-    /**
-     * The type of field represented in this Genotype Field. This is intended to help parse the data out of JSON.
-     *
-     * @return dataType
-     **/
-    @Schema(example = "integer", description = "The type of field represented in this Genotype Field. This is intended to help parse the data out of JSON.")
-    public DataTypeEnum getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-    }
-
-    public CallGenotypeMetadata fieldAbbreviation(String fieldAbbreviation) {
-        this.fieldAbbreviation = fieldAbbreviation;
-        return this;
-    }
-
-    /**
-     * The abbreviated code of the field represented in this Genotype Field. These codes should match the VCF standard when possible. Examples include: \&quot;GQ\&quot;, \&quot;RD\&quot;, and \&quot;HQ\&quot; &lt;br&gt; This maps to a FORMAT field in the VCF file standard.
-     *
-     * @return fieldAbbreviation
-     **/
-    @Schema(example = "GQ", description = "The abbreviated code of the field represented in this Genotype Field. These codes should match the VCF standard when possible. Examples include: \"GQ\", \"RD\", and \"HQ\" <br> This maps to a FORMAT field in the VCF file standard.")
-    public String getFieldAbbreviation() {
-        return fieldAbbreviation;
-    }
-
-    public void setFieldAbbreviation(String fieldAbbreviation) {
-        this.fieldAbbreviation = fieldAbbreviation;
-    }
-
-    public CallGenotypeMetadata fieldName(String fieldName) {
-        this.fieldName = fieldName;
-        return this;
-    }
-
-    /**
-     * The name of the field represented in this Genotype Field. Examples include: \&quot;Genotype Quality\&quot;, \&quot;Read Depth\&quot;, and \&quot;Haplotype Quality\&quot; &lt;br&gt; This maps to a FORMAT field in the VCF file standard.
-     *
-     * @return fieldName
-     **/
-    @Schema(example = "Genotype Quality", description = "The name of the field represented in this Genotype Field. Examples include: \"Genotype Quality\", \"Read Depth\", and \"Haplotype Quality\" <br> This maps to a FORMAT field in the VCF file standard.")
-    public String getFieldName() {
-        return fieldName;
-    }
-
-    public void setFieldName(String fieldName) {
-        this.fieldName = fieldName;
-    }
-
-    public CallGenotypeMetadata fieldValue(String fieldValue) {
-        this.fieldValue = fieldValue;
-        return this;
-    }
-
-    /**
-     * The additional metadata value associated with this genotype call
-     *
-     * @return fieldValue
-     **/
-    @Schema(example = "45.2", description = "The additional metadata value associated with this genotype call")
-    public String getFieldValue() {
-        return fieldValue;
-    }
-
-    public void setFieldValue(String fieldValue) {
-        this.fieldValue = fieldValue;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CallGenotypeMetadata callGenotypeMetadata = (CallGenotypeMetadata) o;
-        return Objects.equals(this.dataType, callGenotypeMetadata.dataType) &&
-                Objects.equals(this.fieldAbbreviation, callGenotypeMetadata.fieldAbbreviation) &&
-                Objects.equals(this.fieldName, callGenotypeMetadata.fieldName) &&
-                Objects.equals(this.fieldValue, callGenotypeMetadata.fieldValue);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(dataType, fieldAbbreviation, fieldName, fieldValue);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CallGenotypeMetadata {\n");
-
-        sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
-        sb.append("    fieldAbbreviation: ").append(toIndentedString(fieldAbbreviation)).append("\n");
-        sb.append("    fieldName: ").append(toIndentedString(fieldName)).append("\n");
-        sb.append("    fieldValue: ").append(toIndentedString(fieldValue)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSet.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSet.java
deleted file mode 100644
index ed427343..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSet.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * A CallSet is a collection of Calls that were generated by the same analysis of the same Sample
- */
-@Schema(description = "A CallSet is a collection of Calls that were generated by the same analysis of the same Sample")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class CallSet {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("callSetDbId")
-    private String callSetDbId = null;
-
-    @SerializedName("callSetName")
-    private String callSetName = null;
-
-    @SerializedName("created")
-    private OffsetDateTime created = null;
-
-    @SerializedName("externalReferences")
-    private ExternalReferences externalReferences = null;
-
-    @SerializedName("sampleDbId")
-    private String sampleDbId = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("updated")
-    private OffsetDateTime updated = null;
-
-    @SerializedName("variantSetDbIds")
-    private List<String> variantSetDbIds = null;
-
-    public CallSet additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public CallSet putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public CallSet callSetDbId(String callSetDbId) {
-        this.callSetDbId = callSetDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a CallSet within the given database server
-     *
-     * @return callSetDbId
-     **/
-    @Schema(example = "eb2bfd3d", description = "The ID which uniquely identifies a CallSet within the given database server")
-    public String getCallSetDbId() {
-        return callSetDbId;
-    }
-
-    public void setCallSetDbId(String callSetDbId) {
-        this.callSetDbId = callSetDbId;
-    }
-
-    public CallSet callSetName(String callSetName) {
-        this.callSetName = callSetName;
-        return this;
-    }
-
-    /**
-     * The human readable name which identifies a germplasm within the given database server
-     *
-     * @return callSetName
-     **/
-    @Schema(example = "Sample_123_DNA_Run_456", description = "The human readable name which identifies a germplasm within the given database server")
-    public String getCallSetName() {
-        return callSetName;
-    }
-
-    public void setCallSetName(String callSetName) {
-        this.callSetName = callSetName;
-    }
-
-    public CallSet created(OffsetDateTime created) {
-        this.created = created;
-        return this;
-    }
-
-    /**
-     * The date this call set was created
-     *
-     * @return created
-     **/
-    @Schema(description = "The date this call set was created")
-    public OffsetDateTime getCreated() {
-        return created;
-    }
-
-    public void setCreated(OffsetDateTime created) {
-        this.created = created;
-    }
-
-    public CallSet externalReferences(ExternalReferences externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    /**
-     * Get externalReferences
-     *
-     * @return externalReferences
-     **/
-    @Schema(description = "")
-    public ExternalReferences getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(ExternalReferences externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public CallSet sampleDbId(String sampleDbId) {
-        this.sampleDbId = sampleDbId;
-        return this;
-    }
-
-    /**
-     * The Biosample entity the call set data was generated from.
-     *
-     * @return sampleDbId
-     **/
-    @Schema(example = "5e50e11d", description = "The Biosample entity the call set data was generated from.")
-    public String getSampleDbId() {
-        return sampleDbId;
-    }
-
-    public void setSampleDbId(String sampleDbId) {
-        this.sampleDbId = sampleDbId;
-    }
-
-    public CallSet studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a study within the given database server
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "708149c1", description = "The ID which uniquely identifies a study within the given database server")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public CallSet updated(OffsetDateTime updated) {
-        this.updated = updated;
-        return this;
-    }
-
-    /**
-     * The time at which this call set was last updated
-     *
-     * @return updated
-     **/
-    @Schema(description = "The time at which this call set was last updated")
-    public OffsetDateTime getUpdated() {
-        return updated;
-    }
-
-    public void setUpdated(OffsetDateTime updated) {
-        this.updated = updated;
-    }
-
-    public CallSet variantSetDbIds(List<String> variantSetDbIds) {
-        this.variantSetDbIds = variantSetDbIds;
-        return this;
-    }
-
-    public CallSet addVariantSetDbIdsItem(String variantSetDbIdsItem) {
-        if (this.variantSetDbIds == null) {
-            this.variantSetDbIds = new ArrayList<String>();
-        }
-        this.variantSetDbIds.add(variantSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The IDs of the variantSets this callSet has calls in.
-     *
-     * @return variantSetDbIds
-     **/
-    @Schema(example = "[\"cfd3d60f\",\"a4e8bfe9\"]", description = "The IDs of the variantSets this callSet has calls in.")
-    public List<String> getVariantSetDbIds() {
-        return variantSetDbIds;
-    }
-
-    public void setVariantSetDbIds(List<String> variantSetDbIds) {
-        this.variantSetDbIds = variantSetDbIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CallSet callSet = (CallSet) o;
-        return Objects.equals(this.additionalInfo, callSet.additionalInfo) &&
-                Objects.equals(this.callSetDbId, callSet.callSetDbId) &&
-                Objects.equals(this.callSetName, callSet.callSetName) &&
-                Objects.equals(this.created, callSet.created) &&
-                Objects.equals(this.externalReferences, callSet.externalReferences) &&
-                Objects.equals(this.sampleDbId, callSet.sampleDbId) &&
-                Objects.equals(this.studyDbId, callSet.studyDbId) &&
-                Objects.equals(this.updated, callSet.updated) &&
-                Objects.equals(this.variantSetDbIds, callSet.variantSetDbIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, callSetDbId, callSetName, created, externalReferences, sampleDbId, studyDbId, updated, variantSetDbIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CallSet {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    callSetDbId: ").append(toIndentedString(callSetDbId)).append("\n");
-        sb.append("    callSetName: ").append(toIndentedString(callSetName)).append("\n");
-        sb.append("    created: ").append(toIndentedString(created)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    sampleDbId: ").append(toIndentedString(sampleDbId)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    updated: ").append(toIndentedString(updated)).append("\n");
-        sb.append("    variantSetDbIds: ").append(toIndentedString(variantSetDbIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSetResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSetResponse.java
deleted file mode 100644
index ec4e015d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSetResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * CallSetResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class CallSetResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private CallSet result = null;
-
-    public CallSetResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public CallSetResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public CallSetResponse result(CallSet result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public CallSet getResult() {
-        return result;
-    }
-
-    public void setResult(CallSet result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CallSetResponse callSetResponse = (CallSetResponse) o;
-        return Objects.equals(this._atContext, callSetResponse._atContext) &&
-                Objects.equals(this.metadata, callSetResponse.metadata) &&
-                Objects.equals(this.result, callSetResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CallSetResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSetsListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSetsListResponse.java
deleted file mode 100644
index 71551506..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSetsListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * CallSetsListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class CallSetsListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private CallSetsListResponseResult result = null;
-
-    public CallSetsListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public CallSetsListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public CallSetsListResponse result(CallSetsListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public CallSetsListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(CallSetsListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CallSetsListResponse callSetsListResponse = (CallSetsListResponse) o;
-        return Objects.equals(this._atContext, callSetsListResponse._atContext) &&
-                Objects.equals(this.metadata, callSetsListResponse.metadata) &&
-                Objects.equals(this.result, callSetsListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CallSetsListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSetsListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSetsListResponseResult.java
deleted file mode 100644
index b504a48f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSetsListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * CallSetsListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class CallSetsListResponseResult {
-    @SerializedName("data")
-    private List<CallSet> data = new ArrayList<CallSet>();
-
-    public CallSetsListResponseResult data(List<CallSet> data) {
-        this.data = data;
-        return this;
-    }
-
-    public CallSetsListResponseResult addDataItem(CallSet dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<CallSet> getData() {
-        return data;
-    }
-
-    public void setData(List<CallSet> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CallSetsListResponseResult callSetsListResponseResult = (CallSetsListResponseResult) o;
-        return Objects.equals(this.data, callSetsListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CallSetsListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSetsSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSetsSearchRequest.java
deleted file mode 100644
index acb00d7c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallSetsSearchRequest.java
+++ /dev/null
@@ -1,658 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * CallSetsSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class CallSetsSearchRequest {
-    @SerializedName("callSetDbIds")
-    private List<String> callSetDbIds = null;
-
-    @SerializedName("callSetNames")
-    private List<String> callSetNames = null;
-
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("sampleDbIds")
-    private List<String> sampleDbIds = null;
-
-    @SerializedName("sampleNames")
-    private List<String> sampleNames = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    @SerializedName("variantSetDbIds")
-    private List<String> variantSetDbIds = null;
-
-    public CallSetsSearchRequest callSetDbIds(List<String> callSetDbIds) {
-        this.callSetDbIds = callSetDbIds;
-        return this;
-    }
-
-    public CallSetsSearchRequest addCallSetDbIdsItem(String callSetDbIdsItem) {
-        if (this.callSetDbIds == null) {
-            this.callSetDbIds = new ArrayList<String>();
-        }
-        this.callSetDbIds.add(callSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;CallSets&#x60; within the given database server
-     *
-     * @return callSetDbIds
-     **/
-    @Schema(example = "[\"6c7486b2\",\"49c36a73\"]", description = "A list of IDs which uniquely identify `CallSets` within the given database server")
-    public List<String> getCallSetDbIds() {
-        return callSetDbIds;
-    }
-
-    public void setCallSetDbIds(List<String> callSetDbIds) {
-        this.callSetDbIds = callSetDbIds;
-    }
-
-    public CallSetsSearchRequest callSetNames(List<String> callSetNames) {
-        this.callSetNames = callSetNames;
-        return this;
-    }
-
-    public CallSetsSearchRequest addCallSetNamesItem(String callSetNamesItem) {
-        if (this.callSetNames == null) {
-            this.callSetNames = new ArrayList<String>();
-        }
-        this.callSetNames.add(callSetNamesItem);
-        return this;
-    }
-
-    /**
-     * A list of human readable names associated with &#x60;CallSets&#x60;
-     *
-     * @return callSetNames
-     **/
-    @Schema(example = "[\"Sample_123_DNA_Run_456\",\"Sample_789_DNA_Run_101\"]", description = "A list of human readable names associated with `CallSets`")
-    public List<String> getCallSetNames() {
-        return callSetNames;
-    }
-
-    public void setCallSetNames(List<String> callSetNames) {
-        this.callSetNames = callSetNames;
-    }
-
-    public CallSetsSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public CallSetsSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public CallSetsSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public CallSetsSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public CallSetsSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public CallSetsSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public CallSetsSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public CallSetsSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public CallSetsSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public CallSetsSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public CallSetsSearchRequest germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public CallSetsSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public CallSetsSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public CallSetsSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public CallSetsSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public CallSetsSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public CallSetsSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public CallSetsSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public CallSetsSearchRequest sampleDbIds(List<String> sampleDbIds) {
-        this.sampleDbIds = sampleDbIds;
-        return this;
-    }
-
-    public CallSetsSearchRequest addSampleDbIdsItem(String sampleDbIdsItem) {
-        if (this.sampleDbIds == null) {
-            this.sampleDbIds = new ArrayList<String>();
-        }
-        this.sampleDbIds.add(sampleDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;Samples&#x60; within the given database server
-     *
-     * @return sampleDbIds
-     **/
-    @Schema(example = "[\"758d3f6d\",\"39c0a3f7\"]", description = "A list of IDs which uniquely identify `Samples` within the given database server")
-    public List<String> getSampleDbIds() {
-        return sampleDbIds;
-    }
-
-    public void setSampleDbIds(List<String> sampleDbIds) {
-        this.sampleDbIds = sampleDbIds;
-    }
-
-    public CallSetsSearchRequest sampleNames(List<String> sampleNames) {
-        this.sampleNames = sampleNames;
-        return this;
-    }
-
-    public CallSetsSearchRequest addSampleNamesItem(String sampleNamesItem) {
-        if (this.sampleNames == null) {
-            this.sampleNames = new ArrayList<String>();
-        }
-        this.sampleNames.add(sampleNamesItem);
-        return this;
-    }
-
-    /**
-     * A list of human readable names associated with &#x60;Samples&#x60;
-     *
-     * @return sampleNames
-     **/
-    @Schema(example = "[\"Sample_123\",\"Sample_789\"]", description = "A list of human readable names associated with `Samples`")
-    public List<String> getSampleNames() {
-        return sampleNames;
-    }
-
-    public void setSampleNames(List<String> sampleNames) {
-        this.sampleNames = sampleNames;
-    }
-
-    public CallSetsSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public CallSetsSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public CallSetsSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public CallSetsSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public CallSetsSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public CallSetsSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public CallSetsSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public CallSetsSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-    public CallSetsSearchRequest variantSetDbIds(List<String> variantSetDbIds) {
-        this.variantSetDbIds = variantSetDbIds;
-        return this;
-    }
-
-    public CallSetsSearchRequest addVariantSetDbIdsItem(String variantSetDbIdsItem) {
-        if (this.variantSetDbIds == null) {
-            this.variantSetDbIds = new ArrayList<String>();
-        }
-        this.variantSetDbIds.add(variantSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;VariantSets&#x60; within the given database server
-     *
-     * @return variantSetDbIds
-     **/
-    @Schema(example = "[\"8a9a8972\",\"32a2649a\"]", description = "A list of IDs which uniquely identify `VariantSets` within the given database server")
-    public List<String> getVariantSetDbIds() {
-        return variantSetDbIds;
-    }
-
-    public void setVariantSetDbIds(List<String> variantSetDbIds) {
-        this.variantSetDbIds = variantSetDbIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CallSetsSearchRequest callSetsSearchRequest = (CallSetsSearchRequest) o;
-        return Objects.equals(this.callSetDbIds, callSetsSearchRequest.callSetDbIds) &&
-                Objects.equals(this.callSetNames, callSetsSearchRequest.callSetNames) &&
-                Objects.equals(this.commonCropNames, callSetsSearchRequest.commonCropNames) &&
-                Objects.equals(this.externalReferenceIDs, callSetsSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, callSetsSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, callSetsSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.germplasmDbIds, callSetsSearchRequest.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, callSetsSearchRequest.germplasmNames) &&
-                Objects.equals(this.page, callSetsSearchRequest.page) &&
-                Objects.equals(this.pageSize, callSetsSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, callSetsSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, callSetsSearchRequest.programNames) &&
-                Objects.equals(this.sampleDbIds, callSetsSearchRequest.sampleDbIds) &&
-                Objects.equals(this.sampleNames, callSetsSearchRequest.sampleNames) &&
-                Objects.equals(this.studyDbIds, callSetsSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, callSetsSearchRequest.studyNames) &&
-                Objects.equals(this.trialDbIds, callSetsSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, callSetsSearchRequest.trialNames) &&
-                Objects.equals(this.variantSetDbIds, callSetsSearchRequest.variantSetDbIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(callSetDbIds, callSetNames, commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds, germplasmNames, page, pageSize, programDbIds, programNames, sampleDbIds, sampleNames, studyDbIds, studyNames, trialDbIds, trialNames, variantSetDbIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CallSetsSearchRequest {\n");
-
-        sb.append("    callSetDbIds: ").append(toIndentedString(callSetDbIds)).append("\n");
-        sb.append("    callSetNames: ").append(toIndentedString(callSetNames)).append("\n");
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    sampleDbIds: ").append(toIndentedString(sampleDbIds)).append("\n");
-        sb.append("    sampleNames: ").append(toIndentedString(sampleNames)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("    variantSetDbIds: ").append(toIndentedString(variantSetDbIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallsListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallsListResponse.java
deleted file mode 100644
index c5e97045..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallsListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.MetadataTokenPagination;
-
-import java.util.Objects;
-
-/**
- * CallsListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class CallsListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private MetadataTokenPagination metadata = null;
-
-    @SerializedName("result")
-    private CallsListResponseResult result = null;
-
-    public CallsListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public CallsListResponse metadata(MetadataTokenPagination metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public MetadataTokenPagination getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(MetadataTokenPagination metadata) {
-        this.metadata = metadata;
-    }
-
-    public CallsListResponse result(CallsListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public CallsListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(CallsListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CallsListResponse callsListResponse = (CallsListResponse) o;
-        return Objects.equals(this._atContext, callsListResponse._atContext) &&
-                Objects.equals(this.metadata, callsListResponse.metadata) &&
-                Objects.equals(this.result, callsListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CallsListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallsListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallsListResponseResult.java
deleted file mode 100644
index 53f2b5a2..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallsListResponseResult.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * CallsListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class CallsListResponseResult {
-    @SerializedName("data")
-    private List<Call> data = new ArrayList<Call>();
-
-    @SerializedName("expandHomozygotes")
-    private Boolean expandHomozygotes = null;
-
-    @SerializedName("sepPhased")
-    private String sepPhased = null;
-
-    @SerializedName("sepUnphased")
-    private String sepUnphased = null;
-
-    @SerializedName("unknownString")
-    private String unknownString = null;
-
-    public CallsListResponseResult data(List<Call> data) {
-        this.data = data;
-        return this;
-    }
-
-    public CallsListResponseResult addDataItem(Call dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Call> getData() {
-        return data;
-    }
-
-    public void setData(List<Call> data) {
-        this.data = data;
-    }
-
-    public CallsListResponseResult expandHomozygotes(Boolean expandHomozygotes) {
-        this.expandHomozygotes = expandHomozygotes;
-        return this;
-    }
-
-    /**
-     * Should homozygotes be expanded (true) or collapsed into a single occurrence (false)
-     *
-     * @return expandHomozygotes
-     **/
-    @Schema(example = "true", description = "Should homozygotes be expanded (true) or collapsed into a single occurrence (false)")
-    public Boolean isExpandHomozygotes() {
-        return expandHomozygotes;
-    }
-
-    public void setExpandHomozygotes(Boolean expandHomozygotes) {
-        this.expandHomozygotes = expandHomozygotes;
-    }
-
-    public CallsListResponseResult sepPhased(String sepPhased) {
-        this.sepPhased = sepPhased;
-        return this;
-    }
-
-    /**
-     * The string used as a separator for phased allele calls.
-     *
-     * @return sepPhased
-     **/
-    @Schema(example = "|", description = "The string used as a separator for phased allele calls.")
-    public String getSepPhased() {
-        return sepPhased;
-    }
-
-    public void setSepPhased(String sepPhased) {
-        this.sepPhased = sepPhased;
-    }
-
-    public CallsListResponseResult sepUnphased(String sepUnphased) {
-        this.sepUnphased = sepUnphased;
-        return this;
-    }
-
-    /**
-     * The string used as a separator for unphased allele calls.
-     *
-     * @return sepUnphased
-     **/
-    @Schema(example = "/", description = "The string used as a separator for unphased allele calls.")
-    public String getSepUnphased() {
-        return sepUnphased;
-    }
-
-    public void setSepUnphased(String sepUnphased) {
-        this.sepUnphased = sepUnphased;
-    }
-
-    public CallsListResponseResult unknownString(String unknownString) {
-        this.unknownString = unknownString;
-        return this;
-    }
-
-    /**
-     * The string used as a representation for missing data.
-     *
-     * @return unknownString
-     **/
-    @Schema(example = ".", description = "The string used as a representation for missing data.")
-    public String getUnknownString() {
-        return unknownString;
-    }
-
-    public void setUnknownString(String unknownString) {
-        this.unknownString = unknownString;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CallsListResponseResult callsListResponseResult = (CallsListResponseResult) o;
-        return Objects.equals(this.data, callsListResponseResult.data) &&
-                Objects.equals(this.expandHomozygotes, callsListResponseResult.expandHomozygotes) &&
-                Objects.equals(this.sepPhased, callsListResponseResult.sepPhased) &&
-                Objects.equals(this.sepUnphased, callsListResponseResult.sepUnphased) &&
-                Objects.equals(this.unknownString, callsListResponseResult.unknownString);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data, expandHomozygotes, sepPhased, sepUnphased, unknownString);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CallsListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("    expandHomozygotes: ").append(toIndentedString(expandHomozygotes)).append("\n");
-        sb.append("    sepPhased: ").append(toIndentedString(sepPhased)).append("\n");
-        sb.append("    sepUnphased: ").append(toIndentedString(sepUnphased)).append("\n");
-        sb.append("    unknownString: ").append(toIndentedString(unknownString)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallsSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallsSearchRequest.java
deleted file mode 100644
index 3dd28d46..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/CallsSearchRequest.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * CallsSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class CallsSearchRequest {
-    @SerializedName("callSetDbIds")
-    private List<String> callSetDbIds = null;
-
-    @SerializedName("expandHomozygotes")
-    private Boolean expandHomozygotes = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("pageToken")
-    private String pageToken = null;
-
-    @SerializedName("sepPhased")
-    private String sepPhased = null;
-
-    @SerializedName("sepUnphased")
-    private String sepUnphased = null;
-
-    @SerializedName("unknownString")
-    private String unknownString = null;
-
-    @SerializedName("variantDbIds")
-    private List<String> variantDbIds = null;
-
-    @SerializedName("variantSetDbIds")
-    private List<String> variantSetDbIds = null;
-
-    public CallsSearchRequest callSetDbIds(List<String> callSetDbIds) {
-        this.callSetDbIds = callSetDbIds;
-        return this;
-    }
-
-    public CallsSearchRequest addCallSetDbIdsItem(String callSetDbIdsItem) {
-        if (this.callSetDbIds == null) {
-            this.callSetDbIds = new ArrayList<String>();
-        }
-        this.callSetDbIds.add(callSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;CallSets&#x60; within the given database server
-     *
-     * @return callSetDbIds
-     **/
-    @Schema(example = "[\"a03202ec\",\"274e4f63\"]", description = "A list of IDs which uniquely identify `CallSets` within the given database server")
-    public List<String> getCallSetDbIds() {
-        return callSetDbIds;
-    }
-
-    public void setCallSetDbIds(List<String> callSetDbIds) {
-        this.callSetDbIds = callSetDbIds;
-    }
-
-    public CallsSearchRequest expandHomozygotes(Boolean expandHomozygotes) {
-        this.expandHomozygotes = expandHomozygotes;
-        return this;
-    }
-
-    /**
-     * Should homozygotes be expanded (true) or collapsed into a single occurrence (false)
-     *
-     * @return expandHomozygotes
-     **/
-    @Schema(example = "true", description = "Should homozygotes be expanded (true) or collapsed into a single occurrence (false)")
-    public Boolean isExpandHomozygotes() {
-        return expandHomozygotes;
-    }
-
-    public void setExpandHomozygotes(Boolean expandHomozygotes) {
-        this.expandHomozygotes = expandHomozygotes;
-    }
-
-    public CallsSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public CallsSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public CallsSearchRequest pageToken(String pageToken) {
-        this.pageToken = pageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;Used to request a specific page of data to be returned. &lt;br&gt;Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.
-     *
-     * @return pageToken
-     **/
-    @Schema(example = "33c27874", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>Used to request a specific page of data to be returned. <br>Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively. ")
-    public String getPageToken() {
-        return pageToken;
-    }
-
-    public void setPageToken(String pageToken) {
-        this.pageToken = pageToken;
-    }
-
-    public CallsSearchRequest sepPhased(String sepPhased) {
-        this.sepPhased = sepPhased;
-        return this;
-    }
-
-    /**
-     * The string used as a separator for phased allele calls.
-     *
-     * @return sepPhased
-     **/
-    @Schema(example = "|", description = "The string used as a separator for phased allele calls.")
-    public String getSepPhased() {
-        return sepPhased;
-    }
-
-    public void setSepPhased(String sepPhased) {
-        this.sepPhased = sepPhased;
-    }
-
-    public CallsSearchRequest sepUnphased(String sepUnphased) {
-        this.sepUnphased = sepUnphased;
-        return this;
-    }
-
-    /**
-     * The string used as a separator for unphased allele calls.
-     *
-     * @return sepUnphased
-     **/
-    @Schema(example = "/", description = "The string used as a separator for unphased allele calls.")
-    public String getSepUnphased() {
-        return sepUnphased;
-    }
-
-    public void setSepUnphased(String sepUnphased) {
-        this.sepUnphased = sepUnphased;
-    }
-
-    public CallsSearchRequest unknownString(String unknownString) {
-        this.unknownString = unknownString;
-        return this;
-    }
-
-    /**
-     * The string used as a representation for missing data.
-     *
-     * @return unknownString
-     **/
-    @Schema(example = ".", description = "The string used as a representation for missing data.")
-    public String getUnknownString() {
-        return unknownString;
-    }
-
-    public void setUnknownString(String unknownString) {
-        this.unknownString = unknownString;
-    }
-
-    public CallsSearchRequest variantDbIds(List<String> variantDbIds) {
-        this.variantDbIds = variantDbIds;
-        return this;
-    }
-
-    public CallsSearchRequest addVariantDbIdsItem(String variantDbIdsItem) {
-        if (this.variantDbIds == null) {
-            this.variantDbIds = new ArrayList<String>();
-        }
-        this.variantDbIds.add(variantDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;Variant&#x60; within the given database server
-     *
-     * @return variantDbIds
-     **/
-    @Schema(example = "[\"bba0b258\",\"ff97d4f0\"]", description = "A list of IDs which uniquely identify `Variant` within the given database server")
-    public List<String> getVariantDbIds() {
-        return variantDbIds;
-    }
-
-    public void setVariantDbIds(List<String> variantDbIds) {
-        this.variantDbIds = variantDbIds;
-    }
-
-    public CallsSearchRequest variantSetDbIds(List<String> variantSetDbIds) {
-        this.variantSetDbIds = variantSetDbIds;
-        return this;
-    }
-
-    public CallsSearchRequest addVariantSetDbIdsItem(String variantSetDbIdsItem) {
-        if (this.variantSetDbIds == null) {
-            this.variantSetDbIds = new ArrayList<String>();
-        }
-        this.variantSetDbIds.add(variantSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;VariantSets&#x60; within the given database server
-     *
-     * @return variantSetDbIds
-     **/
-    @Schema(example = "[\"407c0508\",\"49e24dfc\"]", description = "A list of IDs which uniquely identify `VariantSets` within the given database server")
-    public List<String> getVariantSetDbIds() {
-        return variantSetDbIds;
-    }
-
-    public void setVariantSetDbIds(List<String> variantSetDbIds) {
-        this.variantSetDbIds = variantSetDbIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CallsSearchRequest callsSearchRequest = (CallsSearchRequest) o;
-        return Objects.equals(this.callSetDbIds, callsSearchRequest.callSetDbIds) &&
-                Objects.equals(this.expandHomozygotes, callsSearchRequest.expandHomozygotes) &&
-                Objects.equals(this.page, callsSearchRequest.page) &&
-                Objects.equals(this.pageSize, callsSearchRequest.pageSize) &&
-                Objects.equals(this.pageToken, callsSearchRequest.pageToken) &&
-                Objects.equals(this.sepPhased, callsSearchRequest.sepPhased) &&
-                Objects.equals(this.sepUnphased, callsSearchRequest.sepUnphased) &&
-                Objects.equals(this.unknownString, callsSearchRequest.unknownString) &&
-                Objects.equals(this.variantDbIds, callsSearchRequest.variantDbIds) &&
-                Objects.equals(this.variantSetDbIds, callsSearchRequest.variantSetDbIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(callSetDbIds, expandHomozygotes, page, pageSize, pageToken, sepPhased, sepUnphased, unknownString, variantDbIds, variantSetDbIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CallsSearchRequest {\n");
-
-        sb.append("    callSetDbIds: ").append(toIndentedString(callSetDbIds)).append("\n");
-        sb.append("    expandHomozygotes: ").append(toIndentedString(expandHomozygotes)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    pageToken: ").append(toIndentedString(pageToken)).append("\n");
-        sb.append("    sepPhased: ").append(toIndentedString(sepPhased)).append("\n");
-        sb.append("    sepUnphased: ").append(toIndentedString(sepUnphased)).append("\n");
-        sb.append("    unknownString: ").append(toIndentedString(unknownString)).append("\n");
-        sb.append("    variantDbIds: ").append(toIndentedString(variantDbIds)).append("\n");
-        sb.append("    variantSetDbIds: ").append(toIndentedString(variantSetDbIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ContentTypes.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ContentTypes.java
deleted file mode 100644
index d4ed3556..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ContentTypes.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-/**
- * Gets or Sets ContentTypes
- */
-@JsonAdapter(ContentTypes.Adapter.class)
-public enum ContentTypes {
-    APPLICATION_JSON("application/json"),
-    TEXT_CSV("text/csv"),
-    TEXT_TSV("text/tsv"),
-    APPLICATION_FLAPJACK("application/flapjack");
-
-    private final String value;
-
-    ContentTypes(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    public static ContentTypes fromValue(String input) {
-        for (ContentTypes b : ContentTypes.values()) {
-            if (b.value.equals(input)) {
-                return b;
-            }
-        }
-        return null;
-    }
-
-    public static class Adapter extends TypeAdapter<ContentTypes> {
-        @Override
-        public void write(final JsonWriter jsonWriter, final ContentTypes enumeration) throws IOException {
-            jsonWriter.value(String.valueOf(enumeration.getValue()));
-        }
-
-        @Override
-        public ContentTypes read(final JsonReader jsonReader) throws IOException {
-            Object value = jsonReader.nextString();
-            return ContentTypes.fromValue((String) (value));
-        }
-    }
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Context.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Context.java
deleted file mode 100644
index fd43a2b0..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Context.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.Objects;
-
-/**
- * The JSON-LD Context is used to provide JSON-LD definitions to each field in a JSON object. By providing an array of context file urls, a BrAPI response object becomes JSON-LD compatible.    For more information, see https://w3c.github.io/json-ld-syntax/#the-context
- */
-@Schema(description = "The JSON-LD Context is used to provide JSON-LD definitions to each field in a JSON object. By providing an array of context file urls, a BrAPI response object becomes JSON-LD compatible.    For more information, see https://w3c.github.io/json-ld-syntax/#the-context")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class Context extends ArrayList<String> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Context {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/DataFile.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/DataFile.java
deleted file mode 100644
index 5b6721da..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/DataFile.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * A dataFile contains a URL and the relevant file metadata to represent a file
- */
-@Schema(description = "A dataFile contains a URL and the relevant file metadata to represent a file")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class DataFile {
-    @SerializedName("fileDescription")
-    private String fileDescription = null;
-
-    @SerializedName("fileMD5Hash")
-    private String fileMD5Hash = null;
-
-    @SerializedName("fileName")
-    private String fileName = null;
-
-    @SerializedName("fileSize")
-    private Integer fileSize = null;
-
-    @SerializedName("fileType")
-    private String fileType = null;
-
-    @SerializedName("fileURL")
-    private String fileURL = null;
-
-    public DataFile fileDescription(String fileDescription) {
-        this.fileDescription = fileDescription;
-        return this;
-    }
-
-    /**
-     * A human readable description of the file contents
-     *
-     * @return fileDescription
-     **/
-    @Schema(example = "This is an Excel data file", description = "A human readable description of the file contents")
-    public String getFileDescription() {
-        return fileDescription;
-    }
-
-    public void setFileDescription(String fileDescription) {
-        this.fileDescription = fileDescription;
-    }
-
-    public DataFile fileMD5Hash(String fileMD5Hash) {
-        this.fileMD5Hash = fileMD5Hash;
-        return this;
-    }
-
-    /**
-     * The MD5 Hash of the file contents to be used as a check sum
-     *
-     * @return fileMD5Hash
-     **/
-    @Schema(example = "c2365e900c81a89cf74d83dab60df146", description = "The MD5 Hash of the file contents to be used as a check sum")
-    public String getFileMD5Hash() {
-        return fileMD5Hash;
-    }
-
-    public void setFileMD5Hash(String fileMD5Hash) {
-        this.fileMD5Hash = fileMD5Hash;
-    }
-
-    public DataFile fileName(String fileName) {
-        this.fileName = fileName;
-        return this;
-    }
-
-    /**
-     * The name of the file
-     *
-     * @return fileName
-     **/
-    @Schema(example = "datafile.xlsx", description = "The name of the file")
-    public String getFileName() {
-        return fileName;
-    }
-
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
-    public DataFile fileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-        return this;
-    }
-
-    /**
-     * The size of the file in bytes
-     *
-     * @return fileSize
-     **/
-    @Schema(example = "4398", description = "The size of the file in bytes")
-    public Integer getFileSize() {
-        return fileSize;
-    }
-
-    public void setFileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-    }
-
-    public DataFile fileType(String fileType) {
-        this.fileType = fileType;
-        return this;
-    }
-
-    /**
-     * The type or format of the file. Preferably MIME Type.
-     *
-     * @return fileType
-     **/
-    @Schema(example = "application/vnd.ms-excel", description = "The type or format of the file. Preferably MIME Type.")
-    public String getFileType() {
-        return fileType;
-    }
-
-    public void setFileType(String fileType) {
-        this.fileType = fileType;
-    }
-
-    public DataFile fileURL(String fileURL) {
-        this.fileURL = fileURL;
-        return this;
-    }
-
-    /**
-     * The absolute URL where the file is located
-     *
-     * @return fileURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/examples/datafile.xlsx", required = true, description = "The absolute URL where the file is located")
-    public String getFileURL() {
-        return fileURL;
-    }
-
-    public void setFileURL(String fileURL) {
-        this.fileURL = fileURL;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        DataFile dataFile = (DataFile) o;
-        return Objects.equals(this.fileDescription, dataFile.fileDescription) &&
-                Objects.equals(this.fileMD5Hash, dataFile.fileMD5Hash) &&
-                Objects.equals(this.fileName, dataFile.fileName) &&
-                Objects.equals(this.fileSize, dataFile.fileSize) &&
-                Objects.equals(this.fileType, dataFile.fileType) &&
-                Objects.equals(this.fileURL, dataFile.fileURL);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(fileDescription, fileMD5Hash, fileName, fileSize, fileType, fileURL);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class DataFile {\n");
-
-        sb.append("    fileDescription: ").append(toIndentedString(fileDescription)).append("\n");
-        sb.append("    fileMD5Hash: ").append(toIndentedString(fileMD5Hash)).append("\n");
-        sb.append("    fileName: ").append(toIndentedString(fileName)).append("\n");
-        sb.append("    fileSize: ").append(toIndentedString(fileSize)).append("\n");
-        sb.append("    fileType: ").append(toIndentedString(fileType)).append("\n");
-        sb.append("    fileURL: ").append(toIndentedString(fileURL)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ExternalReferences.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ExternalReferences.java
deleted file mode 100644
index f02954c9..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ExternalReferences.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.Objects;
-
-/**
- * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
- */
-@Schema(description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ExternalReferences extends ArrayList<ExternalReferencesInner> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ExternalReferences {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ExternalReferencesInner.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ExternalReferencesInner.java
deleted file mode 100644
index 933fe2d6..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ExternalReferencesInner.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ExternalReferencesInner
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ExternalReferencesInner {
-    @SerializedName("referenceID")
-    private String referenceID = null;
-
-    @SerializedName("referenceId")
-    private String referenceId = null;
-
-    @SerializedName("referenceSource")
-    private String referenceSource = null;
-
-    public ExternalReferencesInner referenceID(String referenceID) {
-        this.referenceID = referenceID;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;referenceId&#x60;. Github issue number #460  &lt;br&gt;The external reference ID. Could be a simple string or a URI.
-     *
-     * @return referenceID
-     **/
-    @Schema(description = "**Deprecated in v2.1** Please use `referenceId`. Github issue number #460  <br>The external reference ID. Could be a simple string or a URI.")
-    public String getReferenceID() {
-        return referenceID;
-    }
-
-    public void setReferenceID(String referenceID) {
-        this.referenceID = referenceID;
-    }
-
-    public ExternalReferencesInner referenceId(String referenceId) {
-        this.referenceId = referenceId;
-        return this;
-    }
-
-    /**
-     * The external reference ID. Could be a simple string or a URI.
-     *
-     * @return referenceId
-     **/
-    @Schema(description = "The external reference ID. Could be a simple string or a URI.")
-    public String getReferenceId() {
-        return referenceId;
-    }
-
-    public void setReferenceId(String referenceId) {
-        this.referenceId = referenceId;
-    }
-
-    public ExternalReferencesInner referenceSource(String referenceSource) {
-        this.referenceSource = referenceSource;
-        return this;
-    }
-
-    /**
-     * An identifier for the source system or database of this reference
-     *
-     * @return referenceSource
-     **/
-    @Schema(description = "An identifier for the source system or database of this reference")
-    public String getReferenceSource() {
-        return referenceSource;
-    }
-
-    public void setReferenceSource(String referenceSource) {
-        this.referenceSource = referenceSource;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ExternalReferencesInner externalReferencesInner = (ExternalReferencesInner) o;
-        return Objects.equals(this.referenceID, externalReferencesInner.referenceID) &&
-                Objects.equals(this.referenceId, externalReferencesInner.referenceId) &&
-                Objects.equals(this.referenceSource, externalReferencesInner.referenceSource);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(referenceID, referenceId, referenceSource);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ExternalReferencesInner {\n");
-
-        sb.append("    referenceID: ").append(toIndentedString(referenceID)).append("\n");
-        sb.append("    referenceId: ").append(toIndentedString(referenceId)).append("\n");
-        sb.append("    referenceSource: ").append(toIndentedString(referenceSource)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GenomeMap.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GenomeMap.java
deleted file mode 100644
index 48b69397..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GenomeMap.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * GenomeMap
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class GenomeMap {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("comments")
-    private String comments = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("linkageGroupCount")
-    private Integer linkageGroupCount = null;
-
-    @SerializedName("mapDbId")
-    private String mapDbId = null;
-
-    @SerializedName("mapName")
-    private String mapName = null;
-
-    @SerializedName("mapPUI")
-    private String mapPUI = null;
-
-    @SerializedName("markerCount")
-    private Integer markerCount = null;
-
-    @SerializedName("publishedDate")
-    private OffsetDateTime publishedDate = null;
-
-    @SerializedName("scientificName")
-    private String scientificName = null;
-
-    @SerializedName("type")
-    private String type = null;
-
-    @SerializedName("unit")
-    private String unit = null;
-
-    public GenomeMap additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public GenomeMap putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public GenomeMap comments(String comments) {
-        this.comments = comments;
-        return this;
-    }
-
-    /**
-     * Additional comments about a &#x60;GenomeMap&#x60;
-     *
-     * @return comments
-     **/
-    @Schema(example = "Comments about this map", description = "Additional comments about a `GenomeMap`")
-    public String getComments() {
-        return comments;
-    }
-
-    public void setComments(String comments) {
-        this.comments = comments;
-    }
-
-    public GenomeMap commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * The common name of the &#x60;Crop&#x60;
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Paw Paw", required = true, description = "The common name of the `Crop`")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public GenomeMap documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://brapi.org", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public GenomeMap linkageGroupCount(Integer linkageGroupCount) {
-        this.linkageGroupCount = linkageGroupCount;
-        return this;
-    }
-
-    /**
-     * The number of linkage groups present in a &#x60;GenomeMap&#x60;
-     *
-     * @return linkageGroupCount
-     **/
-    @Schema(example = "5", description = "The number of linkage groups present in a `GenomeMap`")
-    public Integer getLinkageGroupCount() {
-        return linkageGroupCount;
-    }
-
-    public void setLinkageGroupCount(Integer linkageGroupCount) {
-        this.linkageGroupCount = linkageGroupCount;
-    }
-
-    public GenomeMap mapDbId(String mapDbId) {
-        this.mapDbId = mapDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;GenomeMap&#x60;
-     *
-     * @return mapDbId
-     **/
-    @Schema(example = "142cffd5", required = true, description = "The ID which uniquely identifies a `GenomeMap`")
-    public String getMapDbId() {
-        return mapDbId;
-    }
-
-    public void setMapDbId(String mapDbId) {
-        this.mapDbId = mapDbId;
-    }
-
-    public GenomeMap mapName(String mapName) {
-        this.mapName = mapName;
-        return this;
-    }
-
-    /**
-     * A human readable name for a &#x60;GenomeMap&#x60;
-     *
-     * @return mapName
-     **/
-    @Schema(example = "Genome Map 1", description = "A human readable name for a `GenomeMap`")
-    public String getMapName() {
-        return mapName;
-    }
-
-    public void setMapName(String mapName) {
-        this.mapName = mapName;
-    }
-
-    public GenomeMap mapPUI(String mapPUI) {
-        this.mapPUI = mapPUI;
-        return this;
-    }
-
-    /**
-     * The DOI or other permanent identifier for a &#x60;GenomeMap&#x60;
-     *
-     * @return mapPUI
-     **/
-    @Schema(example = "doi:10.3207/2959859860", description = "The DOI or other permanent identifier for a `GenomeMap`")
-    public String getMapPUI() {
-        return mapPUI;
-    }
-
-    public void setMapPUI(String mapPUI) {
-        this.mapPUI = mapPUI;
-    }
-
-    public GenomeMap markerCount(Integer markerCount) {
-        this.markerCount = markerCount;
-        return this;
-    }
-
-    /**
-     * The number of markers present in a &#x60;GenomeMap&#x60;
-     *
-     * @return markerCount
-     **/
-    @Schema(example = "1100", description = "The number of markers present in a `GenomeMap`")
-    public Integer getMarkerCount() {
-        return markerCount;
-    }
-
-    public void setMarkerCount(Integer markerCount) {
-        this.markerCount = markerCount;
-    }
-
-    public GenomeMap publishedDate(OffsetDateTime publishedDate) {
-        this.publishedDate = publishedDate;
-        return this;
-    }
-
-    /**
-     * The date this &#x60;GenomeMap&#x60; was published
-     *
-     * @return publishedDate
-     **/
-    @Schema(description = "The date this `GenomeMap` was published")
-    public OffsetDateTime getPublishedDate() {
-        return publishedDate;
-    }
-
-    public void setPublishedDate(OffsetDateTime publishedDate) {
-        this.publishedDate = publishedDate;
-    }
-
-    public GenomeMap scientificName(String scientificName) {
-        this.scientificName = scientificName;
-        return this;
-    }
-
-    /**
-     * Full scientific binomial format name. This includes Genus, Species, and Sub-species
-     *
-     * @return scientificName
-     **/
-    @Schema(example = "Zea mays", description = "Full scientific binomial format name. This includes Genus, Species, and Sub-species")
-    public String getScientificName() {
-        return scientificName;
-    }
-
-    public void setScientificName(String scientificName) {
-        this.scientificName = scientificName;
-    }
-
-    public GenomeMap type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The type of map this represents, usually \&quot;Genetic\&quot; or \&quot;Physical\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Genetic", required = true, description = "The type of map this represents, usually \"Genetic\" or \"Physical\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public GenomeMap unit(String unit) {
-        this.unit = unit;
-        return this;
-    }
-
-    /**
-     * The units used to describe the data in a &#x60;GenomeMap&#x60;
-     *
-     * @return unit
-     **/
-    @Schema(example = "cM", description = "The units used to describe the data in a `GenomeMap`")
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GenomeMap genomeMap = (GenomeMap) o;
-        return Objects.equals(this.additionalInfo, genomeMap.additionalInfo) &&
-                Objects.equals(this.comments, genomeMap.comments) &&
-                Objects.equals(this.commonCropName, genomeMap.commonCropName) &&
-                Objects.equals(this.documentationURL, genomeMap.documentationURL) &&
-                Objects.equals(this.linkageGroupCount, genomeMap.linkageGroupCount) &&
-                Objects.equals(this.mapDbId, genomeMap.mapDbId) &&
-                Objects.equals(this.mapName, genomeMap.mapName) &&
-                Objects.equals(this.mapPUI, genomeMap.mapPUI) &&
-                Objects.equals(this.markerCount, genomeMap.markerCount) &&
-                Objects.equals(this.publishedDate, genomeMap.publishedDate) &&
-                Objects.equals(this.scientificName, genomeMap.scientificName) &&
-                Objects.equals(this.type, genomeMap.type) &&
-                Objects.equals(this.unit, genomeMap.unit);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, comments, commonCropName, documentationURL, linkageGroupCount, mapDbId, mapName, mapPUI, markerCount, publishedDate, scientificName, type, unit);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GenomeMap {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    comments: ").append(toIndentedString(comments)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    linkageGroupCount: ").append(toIndentedString(linkageGroupCount)).append("\n");
-        sb.append("    mapDbId: ").append(toIndentedString(mapDbId)).append("\n");
-        sb.append("    mapName: ").append(toIndentedString(mapName)).append("\n");
-        sb.append("    mapPUI: ").append(toIndentedString(mapPUI)).append("\n");
-        sb.append("    markerCount: ").append(toIndentedString(markerCount)).append("\n");
-        sb.append("    publishedDate: ").append(toIndentedString(publishedDate)).append("\n");
-        sb.append("    scientificName: ").append(toIndentedString(scientificName)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("    unit: ").append(toIndentedString(unit)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GenomeMapListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GenomeMapListResponse.java
deleted file mode 100644
index e120e7cd..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GenomeMapListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * GenomeMapListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class GenomeMapListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private GenomeMapListResponseResult result = null;
-
-    public GenomeMapListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public GenomeMapListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public GenomeMapListResponse result(GenomeMapListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public GenomeMapListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(GenomeMapListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GenomeMapListResponse genomeMapListResponse = (GenomeMapListResponse) o;
-        return Objects.equals(this._atContext, genomeMapListResponse._atContext) &&
-                Objects.equals(this.metadata, genomeMapListResponse.metadata) &&
-                Objects.equals(this.result, genomeMapListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GenomeMapListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GenomeMapListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GenomeMapListResponseResult.java
deleted file mode 100644
index 7140febd..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GenomeMapListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * GenomeMapListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class GenomeMapListResponseResult {
-    @SerializedName("data")
-    private List<GenomeMap> data = new ArrayList<GenomeMap>();
-
-    public GenomeMapListResponseResult data(List<GenomeMap> data) {
-        this.data = data;
-        return this;
-    }
-
-    public GenomeMapListResponseResult addDataItem(GenomeMap dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<GenomeMap> getData() {
-        return data;
-    }
-
-    public void setData(List<GenomeMap> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GenomeMapListResponseResult genomeMapListResponseResult = (GenomeMapListResponseResult) o;
-        return Objects.equals(this.data, genomeMapListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GenomeMapListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GenomeMapSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GenomeMapSingleResponse.java
deleted file mode 100644
index 8bf25fb2..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GenomeMapSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * GenomeMapSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class GenomeMapSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private GenomeMap result = null;
-
-    public GenomeMapSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public GenomeMapSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public GenomeMapSingleResponse result(GenomeMap result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public GenomeMap getResult() {
-        return result;
-    }
-
-    public void setResult(GenomeMap result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GenomeMapSingleResponse genomeMapSingleResponse = (GenomeMapSingleResponse) o;
-        return Objects.equals(this._atContext, genomeMapSingleResponse._atContext) &&
-                Objects.equals(this.metadata, genomeMapSingleResponse.metadata) &&
-                Objects.equals(this.result, genomeMapSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GenomeMapSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GeoJSON.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GeoJSON.java
deleted file mode 100644
index 5ad10edb..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GeoJSON.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * One geometry as defined by GeoJSON (RFC 7946). All coordinates are decimal values on the WGS84 geographic coordinate reference system.  Copied from RFC 7946 Section 3.1.1  A position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.
- */
-@Schema(description = "One geometry as defined by GeoJSON (RFC 7946). All coordinates are decimal values on the WGS84 geographic coordinate reference system.  Copied from RFC 7946 Section 3.1.1  A position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class GeoJSON {
-    @SerializedName("geometry")
-    private OneOfgeoJSONGeometry geometry = null;
-
-    @SerializedName("type")
-    private String type = "Feature";
-
-    public GeoJSON geometry(OneOfgeoJSONGeometry geometry) {
-        this.geometry = geometry;
-        return this;
-    }
-
-    /**
-     * A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.
-     *
-     * @return geometry
-     **/
-    @Schema(example = "{\"coordinates\":[-76.506042,42.417373,123],\"type\":\"Point\"}", description = "A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.")
-    public OneOfgeoJSONGeometry getGeometry() {
-        return geometry;
-    }
-
-    public void setGeometry(OneOfgeoJSONGeometry geometry) {
-        this.geometry = geometry;
-    }
-
-    public GeoJSON type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The literal string \&quot;Feature\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Feature", description = "The literal string \"Feature\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GeoJSON geoJSON = (GeoJSON) o;
-        return Objects.equals(this.geometry, geoJSON.geometry) &&
-                Objects.equals(this.type, geoJSON.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(geometry, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GeoJSON {\n");
-
-        sb.append("    geometry: ").append(toIndentedString(geometry)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GeoJSONSearchArea.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GeoJSONSearchArea.java
deleted file mode 100644
index b65d94be..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/GeoJSONSearchArea.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * A GeoJSON Polygon which describes an area to search for other GeoJSON objects. All contained Points and intersecting Polygons should be returned as search results.   All coordinates are decimal values on the WGS84 geographic coordinate reference system.
- */
-@Schema(description = "A GeoJSON Polygon which describes an area to search for other GeoJSON objects. All contained Points and intersecting Polygons should be returned as search results.   All coordinates are decimal values on the WGS84 geographic coordinate reference system.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class GeoJSONSearchArea {
-    @SerializedName("geometry")
-    private OneOfgeoJSONSearchAreaGeometry geometry = null;
-
-    @SerializedName("type")
-    private String type = "Feature";
-
-    public GeoJSONSearchArea geometry(OneOfgeoJSONSearchAreaGeometry geometry) {
-        this.geometry = geometry;
-        return this;
-    }
-
-    /**
-     * A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.
-     *
-     * @return geometry
-     **/
-    @Schema(example = "{\"coordinates\":[-76.506042,42.417373,123],\"type\":\"Point\"}", description = "A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.")
-    public OneOfgeoJSONSearchAreaGeometry getGeometry() {
-        return geometry;
-    }
-
-    public void setGeometry(OneOfgeoJSONSearchAreaGeometry geometry) {
-        this.geometry = geometry;
-    }
-
-    public GeoJSONSearchArea type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The literal string \&quot;Feature\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Feature", description = "The literal string \"Feature\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GeoJSONSearchArea geoJSONSearchArea = (GeoJSONSearchArea) o;
-        return Objects.equals(this.geometry, geoJSONSearchArea.geometry) &&
-                Objects.equals(this.type, geoJSONSearchArea.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(geometry, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GeoJSONSearchArea {\n");
-
-        sb.append("    geometry: ").append(toIndentedString(geometry)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/LinearRing.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/LinearRing.java
deleted file mode 100644
index aeace38a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/LinearRing.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An array of at least four positions where the first equals the last
- */
-@Schema(description = "An array of at least four positions where the first equals the last")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class LinearRing extends ArrayList<List> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class LinearRing {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/LinkageGroup.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/LinkageGroup.java
deleted file mode 100644
index 3d130428..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/LinkageGroup.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * a &#x60;LinkageGroup&#x60; is the generic term for a named section of a &#x60;GenomeMap&#x60;. A &#x60;LinkageGroup&#x60; can represent a Chromosome, Scaffold, or Linkage Group.
- */
-@Schema(description = "a `LinkageGroup` is the generic term for a named section of a `GenomeMap`. A `LinkageGroup` can represent a Chromosome, Scaffold, or Linkage Group.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class LinkageGroup {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("linkageGroupName")
-    private String linkageGroupName = null;
-
-    @SerializedName("markerCount")
-    private Integer markerCount = null;
-
-    @SerializedName("maxPosition")
-    private Integer maxPosition = null;
-
-    public LinkageGroup additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public LinkageGroup putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public LinkageGroup linkageGroupName(String linkageGroupName) {
-        this.linkageGroupName = linkageGroupName;
-        return this;
-    }
-
-    /**
-     * The Uniquely Identifiable name of a &#x60;LinkageGroup&#x60; &lt;br&gt; This might be a chromosome identifier or the generic linkage group identifier if the chromosome is not applicable.
-     *
-     * @return linkageGroupName
-     **/
-    @Schema(example = "Chromosome 3", description = "The Uniquely Identifiable name of a `LinkageGroup` <br> This might be a chromosome identifier or the generic linkage group identifier if the chromosome is not applicable.")
-    public String getLinkageGroupName() {
-        return linkageGroupName;
-    }
-
-    public void setLinkageGroupName(String linkageGroupName) {
-        this.linkageGroupName = linkageGroupName;
-    }
-
-    public LinkageGroup markerCount(Integer markerCount) {
-        this.markerCount = markerCount;
-        return this;
-    }
-
-    /**
-     * The number of markers associated with a &#x60;LinkageGroup&#x60;
-     *
-     * @return markerCount
-     **/
-    @Schema(example = "150", description = "The number of markers associated with a `LinkageGroup`")
-    public Integer getMarkerCount() {
-        return markerCount;
-    }
-
-    public void setMarkerCount(Integer markerCount) {
-        this.markerCount = markerCount;
-    }
-
-    public LinkageGroup maxPosition(Integer maxPosition) {
-        this.maxPosition = maxPosition;
-        return this;
-    }
-
-    /**
-     * The maximum position of a marker within a &#x60;LinkageGroup&#x60;
-     *
-     * @return maxPosition
-     **/
-    @Schema(example = "2500", description = "The maximum position of a marker within a `LinkageGroup`")
-    public Integer getMaxPosition() {
-        return maxPosition;
-    }
-
-    public void setMaxPosition(Integer maxPosition) {
-        this.maxPosition = maxPosition;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        LinkageGroup linkageGroup = (LinkageGroup) o;
-        return Objects.equals(this.additionalInfo, linkageGroup.additionalInfo) &&
-                Objects.equals(this.linkageGroupName, linkageGroup.linkageGroupName) &&
-                Objects.equals(this.markerCount, linkageGroup.markerCount) &&
-                Objects.equals(this.maxPosition, linkageGroup.maxPosition);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, linkageGroupName, markerCount, maxPosition);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class LinkageGroup {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    linkageGroupName: ").append(toIndentedString(linkageGroupName)).append("\n");
-        sb.append("    markerCount: ").append(toIndentedString(markerCount)).append("\n");
-        sb.append("    maxPosition: ").append(toIndentedString(maxPosition)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/LinkageGroupListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/LinkageGroupListResponse.java
deleted file mode 100644
index 8e2bee6e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/LinkageGroupListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * LinkageGroupListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class LinkageGroupListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private LinkageGroupListResponseResult result = null;
-
-    public LinkageGroupListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public LinkageGroupListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public LinkageGroupListResponse result(LinkageGroupListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public LinkageGroupListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(LinkageGroupListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        LinkageGroupListResponse linkageGroupListResponse = (LinkageGroupListResponse) o;
-        return Objects.equals(this._atContext, linkageGroupListResponse._atContext) &&
-                Objects.equals(this.metadata, linkageGroupListResponse.metadata) &&
-                Objects.equals(this.result, linkageGroupListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class LinkageGroupListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/LinkageGroupListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/LinkageGroupListResponseResult.java
deleted file mode 100644
index 54567721..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/LinkageGroupListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * LinkageGroupListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class LinkageGroupListResponseResult {
-    @SerializedName("data")
-    private List<LinkageGroup> data = new ArrayList<LinkageGroup>();
-
-    public LinkageGroupListResponseResult data(List<LinkageGroup> data) {
-        this.data = data;
-        return this;
-    }
-
-    public LinkageGroupListResponseResult addDataItem(LinkageGroup dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<LinkageGroup> getData() {
-        return data;
-    }
-
-    public void setData(List<LinkageGroup> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        LinkageGroupListResponseResult linkageGroupListResponseResult = (LinkageGroupListResponseResult) o;
-        return Objects.equals(this.data, linkageGroupListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class LinkageGroupListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ListValue.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ListValue.java
deleted file mode 100644
index 5a7c091b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ListValue.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * **Deprecated in v2.1** Please use &#x60;genotypeValue&#x60; or &#x60;genotypeMetadata&#x60;. Github issue number #491              &lt;br&gt;&#x60;ListValue&#x60; is a wrapper around a repeated field of values. &lt;br&gt;The JSON representation for &#x60;ListValue&#x60; is JSON array.
- */
-@Schema(description = "**Deprecated in v2.1** Please use `genotypeValue` or `genotypeMetadata`. Github issue number #491              <br>`ListValue` is a wrapper around a repeated field of values. <br>The JSON representation for `ListValue` is JSON array.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ListValue {
-    @SerializedName("values")
-    private List<OneOfListValueValuesItems> values = null;
-
-    public ListValue values(List<OneOfListValueValuesItems> values) {
-        this.values = values;
-        return this;
-    }
-
-    public ListValue addValuesItem(OneOfListValueValuesItems valuesItem) {
-        if (this.values == null) {
-            this.values = new ArrayList<OneOfListValueValuesItems>();
-        }
-        this.values.add(valuesItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;genotypeValue&#x60; or &#x60;genotypeMetadata&#x60;. Github issue number #491              &lt;br&gt;Repeated field of dynamically typed values.
-     *
-     * @return values
-     **/
-    @Schema(example = "[\"AA\"]", description = "**Deprecated in v2.1** Please use `genotypeValue` or `genotypeMetadata`. Github issue number #491              <br>Repeated field of dynamically typed values.")
-    public List<OneOfListValueValuesItems> getValues() {
-        return values;
-    }
-
-    public void setValues(List<OneOfListValueValuesItems> values) {
-        this.values = values;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ListValue listValue = (ListValue) o;
-        return Objects.equals(this.values, listValue.values);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(values);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ListValue {\n");
-
-        sb.append("    values: ").append(toIndentedString(values)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MarkerPosition.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MarkerPosition.java
deleted file mode 100644
index 4f7b61a1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MarkerPosition.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * MarkerPosition
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class MarkerPosition {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("linkageGroupName")
-    private String linkageGroupName = null;
-
-    @SerializedName("mapDbId")
-    private String mapDbId = null;
-
-    @SerializedName("mapName")
-    private String mapName = null;
-
-    @SerializedName("position")
-    private Integer position = null;
-
-    @SerializedName("variantDbId")
-    private String variantDbId = null;
-
-    @SerializedName("variantName")
-    private String variantName = null;
-
-    public MarkerPosition additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public MarkerPosition putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public MarkerPosition linkageGroupName(String linkageGroupName) {
-        this.linkageGroupName = linkageGroupName;
-        return this;
-    }
-
-    /**
-     * The Uniquely Identifiable name of a &#x60;LinkageGroup&#x60; &lt;br&gt; This might be a chromosome identifier or the generic linkage group identifier if the chromosome is not applicable.
-     *
-     * @return linkageGroupName
-     **/
-    @Schema(example = "Chromosome 3", description = "The Uniquely Identifiable name of a `LinkageGroup` <br> This might be a chromosome identifier or the generic linkage group identifier if the chromosome is not applicable.")
-    public String getLinkageGroupName() {
-        return linkageGroupName;
-    }
-
-    public void setLinkageGroupName(String linkageGroupName) {
-        this.linkageGroupName = linkageGroupName;
-    }
-
-    public MarkerPosition mapDbId(String mapDbId) {
-        this.mapDbId = mapDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;GenomeMap&#x60;
-     *
-     * @return mapDbId
-     **/
-    @Schema(example = "3d52bdf3", description = "The ID which uniquely identifies a `GenomeMap`")
-    public String getMapDbId() {
-        return mapDbId;
-    }
-
-    public void setMapDbId(String mapDbId) {
-        this.mapDbId = mapDbId;
-    }
-
-    public MarkerPosition mapName(String mapName) {
-        this.mapName = mapName;
-        return this;
-    }
-
-    /**
-     * A human readable name for a &#x60;GenomeMap&#x60;
-     *
-     * @return mapName
-     **/
-    @Schema(example = "Genome Map 1", description = "A human readable name for a `GenomeMap`")
-    public String getMapName() {
-        return mapName;
-    }
-
-    public void setMapName(String mapName) {
-        this.mapName = mapName;
-    }
-
-    public MarkerPosition position(Integer position) {
-        this.position = position;
-        return this;
-    }
-
-    /**
-     * The position of a marker or variant within a &#x60;LinkageGroup&#x60;
-     *
-     * @return position
-     **/
-    @Schema(example = "2390", description = "The position of a marker or variant within a `LinkageGroup`")
-    public Integer getPosition() {
-        return position;
-    }
-
-    public void setPosition(Integer position) {
-        this.position = position;
-    }
-
-    public MarkerPosition variantDbId(String variantDbId) {
-        this.variantDbId = variantDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Variant&#x60; within the given database server &lt;br&gt; A &#x60;Variant&#x60; can also represent a Marker
-     *
-     * @return variantDbId
-     **/
-    @Schema(example = "a1eb250a", description = "The ID which uniquely identifies a `Variant` within the given database server <br> A `Variant` can also represent a Marker ")
-    public String getVariantDbId() {
-        return variantDbId;
-    }
-
-    public void setVariantDbId(String variantDbId) {
-        this.variantDbId = variantDbId;
-    }
-
-    public MarkerPosition variantName(String variantName) {
-        this.variantName = variantName;
-        return this;
-    }
-
-    /**
-     * The human readable name for a &#x60;Variant&#x60; &lt;br&gt; A &#x60;Variant&#x60; can also represent a Marker
-     *
-     * @return variantName
-     **/
-    @Schema(example = "Marker_2390", description = "The human readable name for a `Variant` <br> A `Variant` can also represent a Marker ")
-    public String getVariantName() {
-        return variantName;
-    }
-
-    public void setVariantName(String variantName) {
-        this.variantName = variantName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MarkerPosition markerPosition = (MarkerPosition) o;
-        return Objects.equals(this.additionalInfo, markerPosition.additionalInfo) &&
-                Objects.equals(this.linkageGroupName, markerPosition.linkageGroupName) &&
-                Objects.equals(this.mapDbId, markerPosition.mapDbId) &&
-                Objects.equals(this.mapName, markerPosition.mapName) &&
-                Objects.equals(this.position, markerPosition.position) &&
-                Objects.equals(this.variantDbId, markerPosition.variantDbId) &&
-                Objects.equals(this.variantName, markerPosition.variantName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, linkageGroupName, mapDbId, mapName, position, variantDbId, variantName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MarkerPosition {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    linkageGroupName: ").append(toIndentedString(linkageGroupName)).append("\n");
-        sb.append("    mapDbId: ").append(toIndentedString(mapDbId)).append("\n");
-        sb.append("    mapName: ").append(toIndentedString(mapName)).append("\n");
-        sb.append("    position: ").append(toIndentedString(position)).append("\n");
-        sb.append("    variantDbId: ").append(toIndentedString(variantDbId)).append("\n");
-        sb.append("    variantName: ").append(toIndentedString(variantName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MarkerPositionListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MarkerPositionListResponse.java
deleted file mode 100644
index 67b919ea..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MarkerPositionListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * MarkerPositionListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class MarkerPositionListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private MarkerPositionListResponseResult result = null;
-
-    public MarkerPositionListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public MarkerPositionListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public MarkerPositionListResponse result(MarkerPositionListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public MarkerPositionListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(MarkerPositionListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MarkerPositionListResponse markerPositionListResponse = (MarkerPositionListResponse) o;
-        return Objects.equals(this._atContext, markerPositionListResponse._atContext) &&
-                Objects.equals(this.metadata, markerPositionListResponse.metadata) &&
-                Objects.equals(this.result, markerPositionListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MarkerPositionListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MarkerPositionListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MarkerPositionListResponseResult.java
deleted file mode 100644
index 87d65dc7..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MarkerPositionListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * MarkerPositionListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class MarkerPositionListResponseResult {
-    @SerializedName("data")
-    private List<MarkerPosition> data = new ArrayList<MarkerPosition>();
-
-    public MarkerPositionListResponseResult data(List<MarkerPosition> data) {
-        this.data = data;
-        return this;
-    }
-
-    public MarkerPositionListResponseResult addDataItem(MarkerPosition dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<MarkerPosition> getData() {
-        return data;
-    }
-
-    public void setData(List<MarkerPosition> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MarkerPositionListResponseResult markerPositionListResponseResult = (MarkerPositionListResponseResult) o;
-        return Objects.equals(this.data, markerPositionListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MarkerPositionListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MarkerPositionSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MarkerPositionSearchRequest.java
deleted file mode 100644
index 058e2f2b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MarkerPositionSearchRequest.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * MarkerPositionSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class MarkerPositionSearchRequest {
-    @SerializedName("linkageGroupNames")
-    private List<String> linkageGroupNames = null;
-
-    @SerializedName("mapDbIds")
-    private List<String> mapDbIds = null;
-
-    @SerializedName("maxPosition")
-    private Integer maxPosition = null;
-
-    @SerializedName("minPosition")
-    private Integer minPosition = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("variantDbIds")
-    private List<String> variantDbIds = null;
-
-    public MarkerPositionSearchRequest linkageGroupNames(List<String> linkageGroupNames) {
-        this.linkageGroupNames = linkageGroupNames;
-        return this;
-    }
-
-    public MarkerPositionSearchRequest addLinkageGroupNamesItem(String linkageGroupNamesItem) {
-        if (this.linkageGroupNames == null) {
-            this.linkageGroupNames = new ArrayList<String>();
-        }
-        this.linkageGroupNames.add(linkageGroupNamesItem);
-        return this;
-    }
-
-    /**
-     * A list of Uniquely Identifiable linkage group names
-     *
-     * @return linkageGroupNames
-     **/
-    @Schema(example = "[\"Chromosome 2\",\"Chromosome 3\"]", description = "A list of Uniquely Identifiable linkage group names")
-    public List<String> getLinkageGroupNames() {
-        return linkageGroupNames;
-    }
-
-    public void setLinkageGroupNames(List<String> linkageGroupNames) {
-        this.linkageGroupNames = linkageGroupNames;
-    }
-
-    public MarkerPositionSearchRequest mapDbIds(List<String> mapDbIds) {
-        this.mapDbIds = mapDbIds;
-        return this;
-    }
-
-    public MarkerPositionSearchRequest addMapDbIdsItem(String mapDbIdsItem) {
-        if (this.mapDbIds == null) {
-            this.mapDbIds = new ArrayList<String>();
-        }
-        this.mapDbIds.add(mapDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;GenomeMaps&#x60; within the given database server
-     *
-     * @return mapDbIds
-     **/
-    @Schema(example = "[\"7e6fa8aa\",\"bedc418c\"]", description = "A list of IDs which uniquely identify `GenomeMaps` within the given database server")
-    public List<String> getMapDbIds() {
-        return mapDbIds;
-    }
-
-    public void setMapDbIds(List<String> mapDbIds) {
-        this.mapDbIds = mapDbIds;
-    }
-
-    public MarkerPositionSearchRequest maxPosition(Integer maxPosition) {
-        this.maxPosition = maxPosition;
-        return this;
-    }
-
-    /**
-     * The maximum position of markers in a given map
-     *
-     * @return maxPosition
-     **/
-    @Schema(example = "4000", description = "The maximum position of markers in a given map")
-    public Integer getMaxPosition() {
-        return maxPosition;
-    }
-
-    public void setMaxPosition(Integer maxPosition) {
-        this.maxPosition = maxPosition;
-    }
-
-    public MarkerPositionSearchRequest minPosition(Integer minPosition) {
-        this.minPosition = minPosition;
-        return this;
-    }
-
-    /**
-     * The minimum position of markers in a given map
-     *
-     * @return minPosition
-     **/
-    @Schema(example = "250", description = "The minimum position of markers in a given map")
-    public Integer getMinPosition() {
-        return minPosition;
-    }
-
-    public void setMinPosition(Integer minPosition) {
-        this.minPosition = minPosition;
-    }
-
-    public MarkerPositionSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public MarkerPositionSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public MarkerPositionSearchRequest variantDbIds(List<String> variantDbIds) {
-        this.variantDbIds = variantDbIds;
-        return this;
-    }
-
-    public MarkerPositionSearchRequest addVariantDbIdsItem(String variantDbIdsItem) {
-        if (this.variantDbIds == null) {
-            this.variantDbIds = new ArrayList<String>();
-        }
-        this.variantDbIds.add(variantDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;Variants&#x60; within the given database server
-     *
-     * @return variantDbIds
-     **/
-    @Schema(example = "[\"a0caa928\",\"f8894a26\"]", description = "A list of IDs which uniquely identify `Variants` within the given database server")
-    public List<String> getVariantDbIds() {
-        return variantDbIds;
-    }
-
-    public void setVariantDbIds(List<String> variantDbIds) {
-        this.variantDbIds = variantDbIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MarkerPositionSearchRequest markerPositionSearchRequest = (MarkerPositionSearchRequest) o;
-        return Objects.equals(this.linkageGroupNames, markerPositionSearchRequest.linkageGroupNames) &&
-                Objects.equals(this.mapDbIds, markerPositionSearchRequest.mapDbIds) &&
-                Objects.equals(this.maxPosition, markerPositionSearchRequest.maxPosition) &&
-                Objects.equals(this.minPosition, markerPositionSearchRequest.minPosition) &&
-                Objects.equals(this.page, markerPositionSearchRequest.page) &&
-                Objects.equals(this.pageSize, markerPositionSearchRequest.pageSize) &&
-                Objects.equals(this.variantDbIds, markerPositionSearchRequest.variantDbIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(linkageGroupNames, mapDbIds, maxPosition, minPosition, page, pageSize, variantDbIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MarkerPositionSearchRequest {\n");
-
-        sb.append("    linkageGroupNames: ").append(toIndentedString(linkageGroupNames)).append("\n");
-        sb.append("    mapDbIds: ").append(toIndentedString(mapDbIds)).append("\n");
-        sb.append("    maxPosition: ").append(toIndentedString(maxPosition)).append("\n");
-        sb.append("    minPosition: ").append(toIndentedString(minPosition)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    variantDbIds: ").append(toIndentedString(variantDbIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Measurement.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Measurement.java
deleted file mode 100644
index ac595206..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Measurement.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.util.Objects;
-
-/**
- * A value with units
- */
-@Schema(description = "A value with units")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class Measurement {
-    @SerializedName("units")
-    private String units = null;
-
-    @SerializedName("value")
-    private BigDecimal value = null;
-
-    public Measurement units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * Units (example: \&quot;ng/ul\&quot;)
-     *
-     * @return units
-     **/
-    @Schema(example = "ng/ul", description = "Units (example: \"ng/ul\")")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    public Measurement value(BigDecimal value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * Value (example: \&quot;2.3\&quot;)
-     *
-     * @return value
-     **/
-    @Schema(example = "2.3", description = "Value (example: \"2.3\")")
-    public BigDecimal getValue() {
-        return value;
-    }
-
-    public void setValue(BigDecimal value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Measurement measurement = (Measurement) o;
-        return Objects.equals(this.units, measurement.units) &&
-                Objects.equals(this.value, measurement.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(units, value);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Measurement {\n");
-
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MethodBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MethodBaseClass.java
deleted file mode 100644
index eff562fb..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MethodBaseClass.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A description of the way an Observation should be collected.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Method \&quot;estimation\&quot; or \&quot;drone image processing\&quot;.
- */
-@Schema(description = "A description of the way an Observation should be collected.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Method \"estimation\" or \"drone image processing\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class MethodBaseClass {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("bibliographicalReference")
-    private String bibliographicalReference = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("formula")
-    private String formula = null;
-
-    @SerializedName("methodClass")
-    private String methodClass = null;
-
-    @SerializedName("methodName")
-    private String methodName = null;
-
-    @SerializedName("methodPUI")
-    private String methodPUI = null;
-
-    @SerializedName("ontologyReference")
-    private MethodBaseClassOntologyReference ontologyReference = null;
-
-    public MethodBaseClass additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public MethodBaseClass putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public MethodBaseClass bibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-        return this;
-    }
-
-    /**
-     * Bibliographical reference describing the method. &lt;br/&gt;MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.
-     *
-     * @return bibliographicalReference
-     **/
-    @Schema(example = "Smith, 1893, Really Cool Paper, Popular Journal", description = "Bibliographical reference describing the method. <br/>MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.")
-    public String getBibliographicalReference() {
-        return bibliographicalReference;
-    }
-
-    public void setBibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-    }
-
-    public MethodBaseClass description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Method description &lt;br/&gt;MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)
-     *
-     * @return description
-     **/
-    @Schema(example = "A measuring tape was used", description = "Method description <br/>MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public MethodBaseClass externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public MethodBaseClass addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public MethodBaseClass formula(String formula) {
-        this.formula = formula;
-        return this;
-    }
-
-    /**
-     * For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation
-     *
-     * @return formula
-     **/
-    @Schema(example = "a^2 + b^2 = c^2", description = "For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation")
-    public String getFormula() {
-        return formula;
-    }
-
-    public void setFormula(String formula) {
-        this.formula = formula;
-    }
-
-    public MethodBaseClass methodClass(String methodClass) {
-        this.methodClass = methodClass;
-        return this;
-    }
-
-    /**
-     * Method class (examples: \&quot;Measurement\&quot;, \&quot;Counting\&quot;, \&quot;Estimation\&quot;, \&quot;Computation\&quot;, etc.)
-     *
-     * @return methodClass
-     **/
-    @Schema(example = "Measurement", description = "Method class (examples: \"Measurement\", \"Counting\", \"Estimation\", \"Computation\", etc.)")
-    public String getMethodClass() {
-        return methodClass;
-    }
-
-    public void setMethodClass(String methodClass) {
-        this.methodClass = methodClass;
-    }
-
-    public MethodBaseClass methodName(String methodName) {
-        this.methodName = methodName;
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodName
-     **/
-    @Schema(example = "Measuring Tape", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public String getMethodName() {
-        return methodName;
-    }
-
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
-    public MethodBaseClass methodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000212", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public String getMethodPUI() {
-        return methodPUI;
-    }
-
-    public void setMethodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-    }
-
-    public MethodBaseClass ontologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodBaseClassOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodBaseClass methodBaseClass = (MethodBaseClass) o;
-        return Objects.equals(this.additionalInfo, methodBaseClass.additionalInfo) &&
-                Objects.equals(this.bibliographicalReference, methodBaseClass.bibliographicalReference) &&
-                Objects.equals(this.description, methodBaseClass.description) &&
-                Objects.equals(this.externalReferences, methodBaseClass.externalReferences) &&
-                Objects.equals(this.formula, methodBaseClass.formula) &&
-                Objects.equals(this.methodClass, methodBaseClass.methodClass) &&
-                Objects.equals(this.methodName, methodBaseClass.methodName) &&
-                Objects.equals(this.methodPUI, methodBaseClass.methodPUI) &&
-                Objects.equals(this.ontologyReference, methodBaseClass.ontologyReference);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, bibliographicalReference, description, externalReferences, formula, methodClass, methodName, methodPUI, ontologyReference);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodBaseClass {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    bibliographicalReference: ").append(toIndentedString(bibliographicalReference)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    formula: ").append(toIndentedString(formula)).append("\n");
-        sb.append("    methodClass: ").append(toIndentedString(methodClass)).append("\n");
-        sb.append("    methodName: ").append(toIndentedString(methodName)).append("\n");
-        sb.append("    methodPUI: ").append(toIndentedString(methodPUI)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MethodBaseClassOntologyReference.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MethodBaseClassOntologyReference.java
deleted file mode 100644
index 54393cad..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MethodBaseClassOntologyReference.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).
- */
-@Schema(description = "MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class MethodBaseClassOntologyReference {
-    @SerializedName("documentationLinks")
-    private List<MethodBaseClassOntologyReferenceDocumentationLinks> documentationLinks = null;
-
-    @SerializedName("ontologyDbId")
-    private String ontologyDbId = null;
-
-    @SerializedName("ontologyName")
-    private String ontologyName = null;
-
-    @SerializedName("version")
-    private String version = null;
-
-    public MethodBaseClassOntologyReference documentationLinks(List<MethodBaseClassOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-        return this;
-    }
-
-    public MethodBaseClassOntologyReference addDocumentationLinksItem(MethodBaseClassOntologyReferenceDocumentationLinks documentationLinksItem) {
-        if (this.documentationLinks == null) {
-            this.documentationLinks = new ArrayList<MethodBaseClassOntologyReferenceDocumentationLinks>();
-        }
-        this.documentationLinks.add(documentationLinksItem);
-        return this;
-    }
-
-    /**
-     * links to various ontology documentation
-     *
-     * @return documentationLinks
-     **/
-    @Schema(description = "links to various ontology documentation")
-    public List<MethodBaseClassOntologyReferenceDocumentationLinks> getDocumentationLinks() {
-        return documentationLinks;
-    }
-
-    public void setDocumentationLinks(List<MethodBaseClassOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-    }
-
-    public MethodBaseClassOntologyReference ontologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-        return this;
-    }
-
-    /**
-     * Ontology database unique identifier
-     *
-     * @return ontologyDbId
-     **/
-    @Schema(example = "6b071868", required = true, description = "Ontology database unique identifier")
-    public String getOntologyDbId() {
-        return ontologyDbId;
-    }
-
-    public void setOntologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-    }
-
-    public MethodBaseClassOntologyReference ontologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-        return this;
-    }
-
-    /**
-     * Ontology name
-     *
-     * @return ontologyName
-     **/
-    @Schema(example = "The Crop Ontology", required = true, description = "Ontology name")
-    public String getOntologyName() {
-        return ontologyName;
-    }
-
-    public void setOntologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-    }
-
-    public MethodBaseClassOntologyReference version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    /**
-     * Ontology version (no specific format)
-     *
-     * @return version
-     **/
-    @Schema(example = "7.2.3", description = "Ontology version (no specific format)")
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodBaseClassOntologyReference methodBaseClassOntologyReference = (MethodBaseClassOntologyReference) o;
-        return Objects.equals(this.documentationLinks, methodBaseClassOntologyReference.documentationLinks) &&
-                Objects.equals(this.ontologyDbId, methodBaseClassOntologyReference.ontologyDbId) &&
-                Objects.equals(this.ontologyName, methodBaseClassOntologyReference.ontologyName) &&
-                Objects.equals(this.version, methodBaseClassOntologyReference.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(documentationLinks, ontologyDbId, ontologyName, version);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodBaseClassOntologyReference {\n");
-
-        sb.append("    documentationLinks: ").append(toIndentedString(documentationLinks)).append("\n");
-        sb.append("    ontologyDbId: ").append(toIndentedString(ontologyDbId)).append("\n");
-        sb.append("    ontologyName: ").append(toIndentedString(ontologyName)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MethodBaseClassOntologyReferenceDocumentationLinks.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MethodBaseClassOntologyReferenceDocumentationLinks.java
deleted file mode 100644
index 54e035e1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/MethodBaseClassOntologyReferenceDocumentationLinks.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * MethodBaseClassOntologyReferenceDocumentationLinks
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class MethodBaseClassOntologyReferenceDocumentationLinks {
-    @SerializedName("URL")
-    private String URL = null;
-
-    /**
-     * Gets or Sets type
-     */
-    @JsonAdapter(TypeEnum.Adapter.class)
-    public enum TypeEnum {
-        OBO("OBO"),
-        RDF("RDF"),
-        WEBPAGE("WEBPAGE");
-
-        private String value;
-
-        TypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static TypeEnum fromValue(String input) {
-            for (TypeEnum b : TypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<TypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final TypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public TypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return TypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("type")
-    private TypeEnum type = null;
-
-    public MethodBaseClassOntologyReferenceDocumentationLinks URL(String URL) {
-        this.URL = URL;
-        return this;
-    }
-
-    /**
-     * Get URL
-     *
-     * @return URL
-     **/
-    @Schema(example = "http://purl.obolibrary.org/obo/ro.owl", description = "")
-    public String getURL() {
-        return URL;
-    }
-
-    public void setURL(String URL) {
-        this.URL = URL;
-    }
-
-    public MethodBaseClassOntologyReferenceDocumentationLinks type(TypeEnum type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * Get type
-     *
-     * @return type
-     **/
-    @Schema(example = "OBO", description = "")
-    public TypeEnum getType() {
-        return type;
-    }
-
-    public void setType(TypeEnum type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodBaseClassOntologyReferenceDocumentationLinks methodBaseClassOntologyReferenceDocumentationLinks = (MethodBaseClassOntologyReferenceDocumentationLinks) o;
-        return Objects.equals(this.URL, methodBaseClassOntologyReferenceDocumentationLinks.URL) &&
-                Objects.equals(this.type, methodBaseClassOntologyReferenceDocumentationLinks.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(URL, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodBaseClassOntologyReferenceDocumentationLinks {\n");
-
-        sb.append("    URL: ").append(toIndentedString(URL)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Model202AcceptedSearchResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Model202AcceptedSearchResponse.java
deleted file mode 100644
index d36a4b2d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Model202AcceptedSearchResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * Model202AcceptedSearchResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class Model202AcceptedSearchResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Model202AcceptedSearchResponseResult result = null;
-
-    public Model202AcceptedSearchResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public Model202AcceptedSearchResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public Model202AcceptedSearchResponse result(Model202AcceptedSearchResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(description = "")
-    public Model202AcceptedSearchResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(Model202AcceptedSearchResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Model202AcceptedSearchResponse _202AcceptedSearchResponse = (Model202AcceptedSearchResponse) o;
-        return Objects.equals(this._atContext, _202AcceptedSearchResponse._atContext) &&
-                Objects.equals(this.metadata, _202AcceptedSearchResponse.metadata) &&
-                Objects.equals(this.result, _202AcceptedSearchResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Model202AcceptedSearchResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Model202AcceptedSearchResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Model202AcceptedSearchResponseResult.java
deleted file mode 100644
index 27af50ad..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Model202AcceptedSearchResponseResult.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Model202AcceptedSearchResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class Model202AcceptedSearchResponseResult {
-    @SerializedName("searchResultsDbId")
-    private String searchResultsDbId = null;
-
-    public Model202AcceptedSearchResponseResult searchResultsDbId(String searchResultsDbId) {
-        this.searchResultsDbId = searchResultsDbId;
-        return this;
-    }
-
-    /**
-     * Get searchResultsDbId
-     *
-     * @return searchResultsDbId
-     **/
-    @Schema(example = "551ae08c", description = "")
-    public String getSearchResultsDbId() {
-        return searchResultsDbId;
-    }
-
-    public void setSearchResultsDbId(String searchResultsDbId) {
-        this.searchResultsDbId = searchResultsDbId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Model202AcceptedSearchResponseResult _202AcceptedSearchResponseResult = (Model202AcceptedSearchResponseResult) o;
-        return Objects.equals(this.searchResultsDbId, _202AcceptedSearchResponseResult.searchResultsDbId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(searchResultsDbId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Model202AcceptedSearchResponseResult {\n");
-
-        sb.append("    searchResultsDbId: ").append(toIndentedString(searchResultsDbId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ObservationUnitHierarchyLevel.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ObservationUnitHierarchyLevel.java
deleted file mode 100644
index 81563ba3..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ObservationUnitHierarchyLevel.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6).   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
- */
-@Schema(description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6).   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ObservationUnitHierarchyLevel {
-    @SerializedName("levelName")
-    private String levelName = null;
-
-    @SerializedName("levelOrder")
-    private Integer levelOrder = null;
-
-    public ObservationUnitHierarchyLevel levelName(String levelName) {
-        this.levelName = levelName;
-        return this;
-    }
-
-    /**
-     * A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelName
-     **/
-    @Schema(example = "plot", description = "A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public ObservationUnitHierarchyLevel levelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-        return this;
-    }
-
-    /**
-     * &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;&#x27;s lower numbers  are at the top of the hierarchy (ie field -&gt; 1) and higher numbers are at the bottom of the hierarchy (ie plant -&gt; 9).   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelOrder
-     **/
-    @Schema(example = "2", description = "`levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`'s lower numbers  are at the top of the hierarchy (ie field -> 1) and higher numbers are at the bottom of the hierarchy (ie plant -> 9).   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public Integer getLevelOrder() {
-        return levelOrder;
-    }
-
-    public void setLevelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitHierarchyLevel observationUnitHierarchyLevel = (ObservationUnitHierarchyLevel) o;
-        return Objects.equals(this.levelName, observationUnitHierarchyLevel.levelName) &&
-                Objects.equals(this.levelOrder, observationUnitHierarchyLevel.levelOrder);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(levelName, levelOrder);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitHierarchyLevel {\n");
-
-        sb.append("    levelName: ").append(toIndentedString(levelName)).append("\n");
-        sb.append("    levelOrder: ").append(toIndentedString(levelOrder)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OneOfListValueValuesItems.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OneOfListValueValuesItems.java
deleted file mode 100644
index 403f1d93..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OneOfListValueValuesItems.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-/**
- * OneOfListValueValuesItems
- */
-public interface OneOfListValueValuesItems {
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OneOfgeoJSONGeometry.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OneOfgeoJSONGeometry.java
deleted file mode 100644
index 4a7daa52..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OneOfgeoJSONGeometry.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-/**
- * OneOfgeoJSONGeometry
- */
-public interface OneOfgeoJSONGeometry {
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OneOfgeoJSONSearchAreaGeometry.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OneOfgeoJSONSearchAreaGeometry.java
deleted file mode 100644
index 998048d9..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OneOfgeoJSONSearchAreaGeometry.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-/**
- * OneOfgeoJSONSearchAreaGeometry
- */
-public interface OneOfgeoJSONSearchAreaGeometry {
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OntologyReference.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OntologyReference.java
deleted file mode 100644
index e1fd6e49..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OntologyReference.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).
- */
-@Schema(description = "MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class OntologyReference {
-    @SerializedName("documentationLinks")
-    private List<MethodBaseClassOntologyReferenceDocumentationLinks> documentationLinks = null;
-
-    @SerializedName("ontologyDbId")
-    private String ontologyDbId = null;
-
-    @SerializedName("ontologyName")
-    private String ontologyName = null;
-
-    @SerializedName("version")
-    private String version = null;
-
-    public OntologyReference documentationLinks(List<MethodBaseClassOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-        return this;
-    }
-
-    public OntologyReference addDocumentationLinksItem(MethodBaseClassOntologyReferenceDocumentationLinks documentationLinksItem) {
-        if (this.documentationLinks == null) {
-            this.documentationLinks = new ArrayList<MethodBaseClassOntologyReferenceDocumentationLinks>();
-        }
-        this.documentationLinks.add(documentationLinksItem);
-        return this;
-    }
-
-    /**
-     * links to various ontology documentation
-     *
-     * @return documentationLinks
-     **/
-    @Schema(description = "links to various ontology documentation")
-    public List<MethodBaseClassOntologyReferenceDocumentationLinks> getDocumentationLinks() {
-        return documentationLinks;
-    }
-
-    public void setDocumentationLinks(List<MethodBaseClassOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-    }
-
-    public OntologyReference ontologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-        return this;
-    }
-
-    /**
-     * Ontology database unique identifier
-     *
-     * @return ontologyDbId
-     **/
-    @Schema(example = "6b071868", required = true, description = "Ontology database unique identifier")
-    public String getOntologyDbId() {
-        return ontologyDbId;
-    }
-
-    public void setOntologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-    }
-
-    public OntologyReference ontologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-        return this;
-    }
-
-    /**
-     * Ontology name
-     *
-     * @return ontologyName
-     **/
-    @Schema(example = "The Crop Ontology", required = true, description = "Ontology name")
-    public String getOntologyName() {
-        return ontologyName;
-    }
-
-    public void setOntologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-    }
-
-    public OntologyReference version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    /**
-     * Ontology version (no specific format)
-     *
-     * @return version
-     **/
-    @Schema(example = "7.2.3", description = "Ontology version (no specific format)")
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OntologyReference ontologyReference = (OntologyReference) o;
-        return Objects.equals(this.documentationLinks, ontologyReference.documentationLinks) &&
-                Objects.equals(this.ontologyDbId, ontologyReference.ontologyDbId) &&
-                Objects.equals(this.ontologyName, ontologyReference.ontologyName) &&
-                Objects.equals(this.version, ontologyReference.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(documentationLinks, ontologyDbId, ontologyName, version);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class OntologyReference {\n");
-
-        sb.append("    documentationLinks: ").append(toIndentedString(documentationLinks)).append("\n");
-        sb.append("    ontologyDbId: ").append(toIndentedString(ontologyDbId)).append("\n");
-        sb.append("    ontologyName: ").append(toIndentedString(ontologyName)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OntologyTerm.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OntologyTerm.java
deleted file mode 100644
index 5ff29f1f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/OntologyTerm.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * An ontology term describing an attribute.
- */
-@Schema(description = "An ontology term describing an attribute.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class OntologyTerm {
-    @SerializedName("term")
-    private String term = null;
-
-    @SerializedName("termURI")
-    private String termURI = null;
-
-    public OntologyTerm term(String term) {
-        this.term = term;
-        return this;
-    }
-
-    /**
-     * Ontology term - the label of the ontology term the termId is pointing to.
-     *
-     * @return term
-     **/
-    @Schema(example = "sonic hedgehog", description = "Ontology term - the label of the ontology term the termId is pointing to.")
-    public String getTerm() {
-        return term;
-    }
-
-    public void setTerm(String term) {
-        this.term = term;
-    }
-
-    public OntologyTerm termURI(String termURI) {
-        this.termURI = termURI;
-        return this;
-    }
-
-    /**
-     * Ontology term identifier - the CURIE for an ontology term. It differs from the standard GA4GH schema&#x27;s :ref:&#x60;id &#x60; in that it is a CURIE pointing to an information resource outside of the scope of the schema or its resource implementation.
-     *
-     * @return termURI
-     **/
-    @Schema(example = "MGI:MGI:98297", description = "Ontology term identifier - the CURIE for an ontology term. It differs from the standard GA4GH schema's :ref:`id ` in that it is a CURIE pointing to an information resource outside of the scope of the schema or its resource implementation.")
-    public String getTermURI() {
-        return termURI;
-    }
-
-    public void setTermURI(String termURI) {
-        this.termURI = termURI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OntologyTerm ontologyTerm = (OntologyTerm) o;
-        return Objects.equals(this.term, ontologyTerm.term) &&
-                Objects.equals(this.termURI, ontologyTerm.termURI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(term, termURI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class OntologyTerm {\n");
-
-        sb.append("    term: ").append(toIndentedString(term)).append("\n");
-        sb.append("    termURI: ").append(toIndentedString(termURI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Plate.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Plate.java
deleted file mode 100644
index 070c545c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Plate.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * Plate
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class Plate {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("plateBarcode")
-    private String plateBarcode = null;
-
-    @SerializedName("plateDbId")
-    private String plateDbId = null;
-
-    /**
-     * Enum for plate formats, usually \&quot;PLATE_96\&quot; for a 96 well plate or \&quot;TUBES\&quot; for plateless format
-     */
-    @JsonAdapter(PlateFormatEnum.Adapter.class)
-    public enum PlateFormatEnum {
-        PLATE_96("PLATE_96"),
-        TUBES("TUBES");
-
-        private String value;
-
-        PlateFormatEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static PlateFormatEnum fromValue(String input) {
-            for (PlateFormatEnum b : PlateFormatEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<PlateFormatEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final PlateFormatEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public PlateFormatEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return PlateFormatEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("plateFormat")
-    private PlateFormatEnum plateFormat = null;
-
-    @SerializedName("plateName")
-    private String plateName = null;
-
-    @SerializedName("programDbId")
-    private String programDbId = null;
-
-    /**
-     * The type of samples taken. ex. &#x27;DNA&#x27;, &#x27;RNA&#x27;, &#x27;Tissue&#x27;, etc
-     */
-    @JsonAdapter(SampleTypeEnum.Adapter.class)
-    public enum SampleTypeEnum {
-        DNA("DNA"),
-        RNA("RNA"),
-        TISSUE("TISSUE"),
-        MIXED("MIXED");
-
-        private String value;
-
-        SampleTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static SampleTypeEnum fromValue(String input) {
-            for (SampleTypeEnum b : SampleTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<SampleTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final SampleTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public SampleTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return SampleTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("sampleType")
-    private SampleTypeEnum sampleType = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("trialDbId")
-    private String trialDbId = null;
-
-    public Plate additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Plate putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Plate externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Plate addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Plate plateBarcode(String plateBarcode) {
-        this.plateBarcode = plateBarcode;
-        return this;
-    }
-
-    /**
-     * A unique identifier physically attached to a &#x60;Plate&#x60;
-     *
-     * @return plateBarcode
-     **/
-    @Schema(example = "11223344", description = "A unique identifier physically attached to a `Plate`")
-    public String getPlateBarcode() {
-        return plateBarcode;
-    }
-
-    public void setPlateBarcode(String plateBarcode) {
-        this.plateBarcode = plateBarcode;
-    }
-
-    public Plate plateDbId(String plateDbId) {
-        this.plateDbId = plateDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Plate&#x60;
-     *
-     * @return plateDbId
-     **/
-    @Schema(example = "a106467f", description = "The ID which uniquely identifies a `Plate`")
-    public String getPlateDbId() {
-        return plateDbId;
-    }
-
-    public void setPlateDbId(String plateDbId) {
-        this.plateDbId = plateDbId;
-    }
-
-    public Plate plateFormat(PlateFormatEnum plateFormat) {
-        this.plateFormat = plateFormat;
-        return this;
-    }
-
-    /**
-     * Enum for plate formats, usually \&quot;PLATE_96\&quot; for a 96 well plate or \&quot;TUBES\&quot; for plateless format
-     *
-     * @return plateFormat
-     **/
-    @Schema(example = "PLATE_96", description = "Enum for plate formats, usually \"PLATE_96\" for a 96 well plate or \"TUBES\" for plateless format")
-    public PlateFormatEnum getPlateFormat() {
-        return plateFormat;
-    }
-
-    public void setPlateFormat(PlateFormatEnum plateFormat) {
-        this.plateFormat = plateFormat;
-    }
-
-    public Plate plateName(String plateName) {
-        this.plateName = plateName;
-        return this;
-    }
-
-    /**
-     * A human readable name for a &#x60;Plate&#x60;
-     *
-     * @return plateName
-     **/
-    @Schema(example = "Plate_123_XYZ", description = "A human readable name for a `Plate`")
-    public String getPlateName() {
-        return plateName;
-    }
-
-    public void setPlateName(String plateName) {
-        this.plateName = plateName;
-    }
-
-    public Plate programDbId(String programDbId) {
-        this.programDbId = programDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Program&#x60; within the given database server
-     *
-     * @return programDbId
-     **/
-    @Schema(example = "bd748e00", description = "The ID which uniquely identifies a `Program` within the given database server")
-    public String getProgramDbId() {
-        return programDbId;
-    }
-
-    public void setProgramDbId(String programDbId) {
-        this.programDbId = programDbId;
-    }
-
-    public Plate sampleType(SampleTypeEnum sampleType) {
-        this.sampleType = sampleType;
-        return this;
-    }
-
-    /**
-     * The type of samples taken. ex. &#x27;DNA&#x27;, &#x27;RNA&#x27;, &#x27;Tissue&#x27;, etc
-     *
-     * @return sampleType
-     **/
-    @Schema(example = "TISSUE", description = "The type of samples taken. ex. 'DNA', 'RNA', 'Tissue', etc")
-    public SampleTypeEnum getSampleType() {
-        return sampleType;
-    }
-
-    public void setSampleType(SampleTypeEnum sampleType) {
-        this.sampleType = sampleType;
-    }
-
-    public Plate studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Study&#x60; within the given database server
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "64bd6bf9", description = "The ID which uniquely identifies a `Study` within the given database server")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public Plate trialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Trial&#x60; within the given database server
-     *
-     * @return trialDbId
-     **/
-    @Schema(example = "d34c5349", description = "The ID which uniquely identifies a `Trial` within the given database server")
-    public String getTrialDbId() {
-        return trialDbId;
-    }
-
-    public void setTrialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Plate plate = (Plate) o;
-        return Objects.equals(this.additionalInfo, plate.additionalInfo) &&
-                Objects.equals(this.externalReferences, plate.externalReferences) &&
-                Objects.equals(this.plateBarcode, plate.plateBarcode) &&
-                Objects.equals(this.plateDbId, plate.plateDbId) &&
-                Objects.equals(this.plateFormat, plate.plateFormat) &&
-                Objects.equals(this.plateName, plate.plateName) &&
-                Objects.equals(this.programDbId, plate.programDbId) &&
-                Objects.equals(this.sampleType, plate.sampleType) &&
-                Objects.equals(this.studyDbId, plate.studyDbId) &&
-                Objects.equals(this.trialDbId, plate.trialDbId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, externalReferences, plateBarcode, plateDbId, plateFormat, plateName, programDbId, sampleType, studyDbId, trialDbId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Plate {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    plateBarcode: ").append(toIndentedString(plateBarcode)).append("\n");
-        sb.append("    plateDbId: ").append(toIndentedString(plateDbId)).append("\n");
-        sb.append("    plateFormat: ").append(toIndentedString(plateFormat)).append("\n");
-        sb.append("    plateName: ").append(toIndentedString(plateName)).append("\n");
-        sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-        sb.append("    sampleType: ").append(toIndentedString(sampleType)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    trialDbId: ").append(toIndentedString(trialDbId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateFormat.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateFormat.java
deleted file mode 100644
index b1632341..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateFormat.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-/**
- * Enum for plate formats, usually \&quot;PLATE_96\&quot; for a 96 well plate or \&quot;TUBES\&quot; for plateless format
- */
-@JsonAdapter(PlateFormat.Adapter.class)
-public enum PlateFormat {
-    PLATE_96("PLATE_96"),
-    TUBES("TUBES");
-
-    private final String value;
-
-    PlateFormat(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    public static PlateFormat fromValue(String input) {
-        for (PlateFormat b : PlateFormat.values()) {
-            if (b.value.equals(input)) {
-                return b;
-            }
-        }
-        return null;
-    }
-
-    public static class Adapter extends TypeAdapter<PlateFormat> {
-        @Override
-        public void write(final JsonWriter jsonWriter, final PlateFormat enumeration) throws IOException {
-            jsonWriter.value(String.valueOf(enumeration.getValue()));
-        }
-
-        @Override
-        public PlateFormat read(final JsonReader jsonReader) throws IOException {
-            Object value = jsonReader.nextString();
-            return PlateFormat.fromValue((String) (value));
-        }
-    }
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateListResponse.java
deleted file mode 100644
index ec5a7523..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * PlateListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class PlateListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private PlateListResponseResult result = null;
-
-    public PlateListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public PlateListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public PlateListResponse result(PlateListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public PlateListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(PlateListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PlateListResponse plateListResponse = (PlateListResponse) o;
-        return Objects.equals(this._atContext, plateListResponse._atContext) &&
-                Objects.equals(this.metadata, plateListResponse.metadata) &&
-                Objects.equals(this.result, plateListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PlateListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateListResponseResult.java
deleted file mode 100644
index c3ea1914..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * PlateListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class PlateListResponseResult {
-    @SerializedName("data")
-    private List<Plate> data = new ArrayList<Plate>();
-
-    public PlateListResponseResult data(List<Plate> data) {
-        this.data = data;
-        return this;
-    }
-
-    public PlateListResponseResult addDataItem(Plate dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Plate> getData() {
-        return data;
-    }
-
-    public void setData(List<Plate> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PlateListResponseResult plateListResponseResult = (PlateListResponseResult) o;
-        return Objects.equals(this.data, plateListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PlateListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateNewRequest.java
deleted file mode 100644
index da21a3bc..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateNewRequest.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * PlateNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class PlateNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("plateBarcode")
-    private String plateBarcode = null;
-
-    /**
-     * Enum for plate formats, usually \&quot;PLATE_96\&quot; for a 96 well plate or \&quot;TUBES\&quot; for plateless format
-     */
-    @JsonAdapter(PlateFormatEnum.Adapter.class)
-    public enum PlateFormatEnum {
-        PLATE_96("PLATE_96"),
-        TUBES("TUBES");
-
-        private String value;
-
-        PlateFormatEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static PlateFormatEnum fromValue(String input) {
-            for (PlateFormatEnum b : PlateFormatEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<PlateFormatEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final PlateFormatEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public PlateFormatEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return PlateFormatEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("plateFormat")
-    private PlateFormatEnum plateFormat = null;
-
-    @SerializedName("plateName")
-    private String plateName = null;
-
-    @SerializedName("programDbId")
-    private String programDbId = null;
-
-    /**
-     * The type of samples taken. ex. &#x27;DNA&#x27;, &#x27;RNA&#x27;, &#x27;Tissue&#x27;, etc
-     */
-    @JsonAdapter(SampleTypeEnum.Adapter.class)
-    public enum SampleTypeEnum {
-        DNA("DNA"),
-        RNA("RNA"),
-        TISSUE("TISSUE"),
-        MIXED("MIXED");
-
-        private String value;
-
-        SampleTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static SampleTypeEnum fromValue(String input) {
-            for (SampleTypeEnum b : SampleTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<SampleTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final SampleTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public SampleTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return SampleTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("sampleType")
-    private SampleTypeEnum sampleType = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("trialDbId")
-    private String trialDbId = null;
-
-    public PlateNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public PlateNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public PlateNewRequest externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public PlateNewRequest addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public PlateNewRequest plateBarcode(String plateBarcode) {
-        this.plateBarcode = plateBarcode;
-        return this;
-    }
-
-    /**
-     * A unique identifier physically attached to a &#x60;Plate&#x60;
-     *
-     * @return plateBarcode
-     **/
-    @Schema(example = "11223344", description = "A unique identifier physically attached to a `Plate`")
-    public String getPlateBarcode() {
-        return plateBarcode;
-    }
-
-    public void setPlateBarcode(String plateBarcode) {
-        this.plateBarcode = plateBarcode;
-    }
-
-    public PlateNewRequest plateFormat(PlateFormatEnum plateFormat) {
-        this.plateFormat = plateFormat;
-        return this;
-    }
-
-    /**
-     * Enum for plate formats, usually \&quot;PLATE_96\&quot; for a 96 well plate or \&quot;TUBES\&quot; for plateless format
-     *
-     * @return plateFormat
-     **/
-    @Schema(example = "PLATE_96", description = "Enum for plate formats, usually \"PLATE_96\" for a 96 well plate or \"TUBES\" for plateless format")
-    public PlateFormatEnum getPlateFormat() {
-        return plateFormat;
-    }
-
-    public void setPlateFormat(PlateFormatEnum plateFormat) {
-        this.plateFormat = plateFormat;
-    }
-
-    public PlateNewRequest plateName(String plateName) {
-        this.plateName = plateName;
-        return this;
-    }
-
-    /**
-     * A human readable name for a &#x60;Plate&#x60;
-     *
-     * @return plateName
-     **/
-    @Schema(example = "Plate_123_XYZ", description = "A human readable name for a `Plate`")
-    public String getPlateName() {
-        return plateName;
-    }
-
-    public void setPlateName(String plateName) {
-        this.plateName = plateName;
-    }
-
-    public PlateNewRequest programDbId(String programDbId) {
-        this.programDbId = programDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Program&#x60; within the given database server
-     *
-     * @return programDbId
-     **/
-    @Schema(example = "bd748e00", description = "The ID which uniquely identifies a `Program` within the given database server")
-    public String getProgramDbId() {
-        return programDbId;
-    }
-
-    public void setProgramDbId(String programDbId) {
-        this.programDbId = programDbId;
-    }
-
-    public PlateNewRequest sampleType(SampleTypeEnum sampleType) {
-        this.sampleType = sampleType;
-        return this;
-    }
-
-    /**
-     * The type of samples taken. ex. &#x27;DNA&#x27;, &#x27;RNA&#x27;, &#x27;Tissue&#x27;, etc
-     *
-     * @return sampleType
-     **/
-    @Schema(example = "TISSUE", description = "The type of samples taken. ex. 'DNA', 'RNA', 'Tissue', etc")
-    public SampleTypeEnum getSampleType() {
-        return sampleType;
-    }
-
-    public void setSampleType(SampleTypeEnum sampleType) {
-        this.sampleType = sampleType;
-    }
-
-    public PlateNewRequest studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Study&#x60; within the given database server
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "64bd6bf9", description = "The ID which uniquely identifies a `Study` within the given database server")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public PlateNewRequest trialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Trial&#x60; within the given database server
-     *
-     * @return trialDbId
-     **/
-    @Schema(example = "d34c5349", description = "The ID which uniquely identifies a `Trial` within the given database server")
-    public String getTrialDbId() {
-        return trialDbId;
-    }
-
-    public void setTrialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PlateNewRequest plateNewRequest = (PlateNewRequest) o;
-        return Objects.equals(this.additionalInfo, plateNewRequest.additionalInfo) &&
-                Objects.equals(this.externalReferences, plateNewRequest.externalReferences) &&
-                Objects.equals(this.plateBarcode, plateNewRequest.plateBarcode) &&
-                Objects.equals(this.plateFormat, plateNewRequest.plateFormat) &&
-                Objects.equals(this.plateName, plateNewRequest.plateName) &&
-                Objects.equals(this.programDbId, plateNewRequest.programDbId) &&
-                Objects.equals(this.sampleType, plateNewRequest.sampleType) &&
-                Objects.equals(this.studyDbId, plateNewRequest.studyDbId) &&
-                Objects.equals(this.trialDbId, plateNewRequest.trialDbId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, externalReferences, plateBarcode, plateFormat, plateName, programDbId, sampleType, studyDbId, trialDbId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PlateNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    plateBarcode: ").append(toIndentedString(plateBarcode)).append("\n");
-        sb.append("    plateFormat: ").append(toIndentedString(plateFormat)).append("\n");
-        sb.append("    plateName: ").append(toIndentedString(plateName)).append("\n");
-        sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-        sb.append("    sampleType: ").append(toIndentedString(sampleType)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    trialDbId: ").append(toIndentedString(trialDbId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateSearchRequest.java
deleted file mode 100644
index 8df3cd3a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateSearchRequest.java
+++ /dev/null
@@ -1,722 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * PlateSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class PlateSearchRequest {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("observationUnitDbIds")
-    private List<String> observationUnitDbIds = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("plateBarcodes")
-    private List<String> plateBarcodes = null;
-
-    @SerializedName("plateDbIds")
-    private List<String> plateDbIds = null;
-
-    @SerializedName("plateNames")
-    private List<String> plateNames = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("sampleDbIds")
-    private List<String> sampleDbIds = null;
-
-    @SerializedName("sampleGroupDbIds")
-    private List<String> sampleGroupDbIds = null;
-
-    @SerializedName("sampleNames")
-    private List<String> sampleNames = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public PlateSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public PlateSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public PlateSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public PlateSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public PlateSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public PlateSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public PlateSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public PlateSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public PlateSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public PlateSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"d745e1e2\",\"6dd28d74\"]", description = "The ID which uniquely identifies a germplasm")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public PlateSearchRequest germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public PlateSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public PlateSearchRequest observationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-        return this;
-    }
-
-    public PlateSearchRequest addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-        if (this.observationUnitDbIds == null) {
-            this.observationUnitDbIds = new ArrayList<String>();
-        }
-        this.observationUnitDbIds.add(observationUnitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation unit
-     *
-     * @return observationUnitDbIds
-     **/
-    @Schema(example = "[\"3cd0ca36\",\"983f3b14\"]", description = "The ID which uniquely identifies an observation unit")
-    public List<String> getObservationUnitDbIds() {
-        return observationUnitDbIds;
-    }
-
-    public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-    }
-
-    public PlateSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public PlateSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public PlateSearchRequest plateBarcodes(List<String> plateBarcodes) {
-        this.plateBarcodes = plateBarcodes;
-        return this;
-    }
-
-    public PlateSearchRequest addPlateBarcodesItem(String plateBarcodesItem) {
-        if (this.plateBarcodes == null) {
-            this.plateBarcodes = new ArrayList<String>();
-        }
-        this.plateBarcodes.add(plateBarcodesItem);
-        return this;
-    }
-
-    /**
-     * A unique identifier physically attached to the plate
-     *
-     * @return plateBarcodes
-     **/
-    @Schema(example = "[\"11223344\",\"55667788\"]", description = "A unique identifier physically attached to the plate")
-    public List<String> getPlateBarcodes() {
-        return plateBarcodes;
-    }
-
-    public void setPlateBarcodes(List<String> plateBarcodes) {
-        this.plateBarcodes = plateBarcodes;
-    }
-
-    public PlateSearchRequest plateDbIds(List<String> plateDbIds) {
-        this.plateDbIds = plateDbIds;
-        return this;
-    }
-
-    public PlateSearchRequest addPlateDbIdsItem(String plateDbIdsItem) {
-        if (this.plateDbIds == null) {
-            this.plateDbIds = new ArrayList<String>();
-        }
-        this.plateDbIds.add(plateDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a plate of samples
-     *
-     * @return plateDbIds
-     **/
-    @Schema(example = "[\"0cac98b8\",\"b96125fb\"]", description = "The ID which uniquely identifies a plate of samples")
-    public List<String> getPlateDbIds() {
-        return plateDbIds;
-    }
-
-    public void setPlateDbIds(List<String> plateDbIds) {
-        this.plateDbIds = plateDbIds;
-    }
-
-    public PlateSearchRequest plateNames(List<String> plateNames) {
-        this.plateNames = plateNames;
-        return this;
-    }
-
-    public PlateSearchRequest addPlateNamesItem(String plateNamesItem) {
-        if (this.plateNames == null) {
-            this.plateNames = new ArrayList<String>();
-        }
-        this.plateNames.add(plateNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a plate of samples
-     *
-     * @return plateNames
-     **/
-    @Schema(example = "[\"0cac98b8\",\"b96125fb\"]", description = "The human readable name of a plate of samples")
-    public List<String> getPlateNames() {
-        return plateNames;
-    }
-
-    public void setPlateNames(List<String> plateNames) {
-        this.plateNames = plateNames;
-    }
-
-    public PlateSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public PlateSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public PlateSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public PlateSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public PlateSearchRequest sampleDbIds(List<String> sampleDbIds) {
-        this.sampleDbIds = sampleDbIds;
-        return this;
-    }
-
-    public PlateSearchRequest addSampleDbIdsItem(String sampleDbIdsItem) {
-        if (this.sampleDbIds == null) {
-            this.sampleDbIds = new ArrayList<String>();
-        }
-        this.sampleDbIds.add(sampleDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a sample
-     *
-     * @return sampleDbIds
-     **/
-    @Schema(example = "[\"3bece2ca\",\"dd286cc6\"]", description = "The ID which uniquely identifies a sample")
-    public List<String> getSampleDbIds() {
-        return sampleDbIds;
-    }
-
-    public void setSampleDbIds(List<String> sampleDbIds) {
-        this.sampleDbIds = sampleDbIds;
-    }
-
-    public PlateSearchRequest sampleGroupDbIds(List<String> sampleGroupDbIds) {
-        this.sampleGroupDbIds = sampleGroupDbIds;
-        return this;
-    }
-
-    public PlateSearchRequest addSampleGroupDbIdsItem(String sampleGroupDbIdsItem) {
-        if (this.sampleGroupDbIds == null) {
-            this.sampleGroupDbIds = new ArrayList<String>();
-        }
-        this.sampleGroupDbIds.add(sampleGroupDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a group of related Samples
-     *
-     * @return sampleGroupDbIds
-     **/
-    @Schema(example = "[\"45e1e2d7\",\"6cc6dd28\"]", description = "The unique identifier for a group of related Samples")
-    public List<String> getSampleGroupDbIds() {
-        return sampleGroupDbIds;
-    }
-
-    public void setSampleGroupDbIds(List<String> sampleGroupDbIds) {
-        this.sampleGroupDbIds = sampleGroupDbIds;
-    }
-
-    public PlateSearchRequest sampleNames(List<String> sampleNames) {
-        this.sampleNames = sampleNames;
-        return this;
-    }
-
-    public PlateSearchRequest addSampleNamesItem(String sampleNamesItem) {
-        if (this.sampleNames == null) {
-            this.sampleNames = new ArrayList<String>();
-        }
-        this.sampleNames.add(sampleNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of the sample
-     *
-     * @return sampleNames
-     **/
-    @Schema(example = "[\"SA_111\",\"SA_222\"]", description = "The human readable name of the sample")
-    public List<String> getSampleNames() {
-        return sampleNames;
-    }
-
-    public void setSampleNames(List<String> sampleNames) {
-        this.sampleNames = sampleNames;
-    }
-
-    public PlateSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public PlateSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public PlateSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public PlateSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public PlateSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public PlateSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public PlateSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public PlateSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PlateSearchRequest plateSearchRequest = (PlateSearchRequest) o;
-        return Objects.equals(this.commonCropNames, plateSearchRequest.commonCropNames) &&
-                Objects.equals(this.externalReferenceIDs, plateSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, plateSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, plateSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.germplasmDbIds, plateSearchRequest.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, plateSearchRequest.germplasmNames) &&
-                Objects.equals(this.observationUnitDbIds, plateSearchRequest.observationUnitDbIds) &&
-                Objects.equals(this.page, plateSearchRequest.page) &&
-                Objects.equals(this.pageSize, plateSearchRequest.pageSize) &&
-                Objects.equals(this.plateBarcodes, plateSearchRequest.plateBarcodes) &&
-                Objects.equals(this.plateDbIds, plateSearchRequest.plateDbIds) &&
-                Objects.equals(this.plateNames, plateSearchRequest.plateNames) &&
-                Objects.equals(this.programDbIds, plateSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, plateSearchRequest.programNames) &&
-                Objects.equals(this.sampleDbIds, plateSearchRequest.sampleDbIds) &&
-                Objects.equals(this.sampleGroupDbIds, plateSearchRequest.sampleGroupDbIds) &&
-                Objects.equals(this.sampleNames, plateSearchRequest.sampleNames) &&
-                Objects.equals(this.studyDbIds, plateSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, plateSearchRequest.studyNames) &&
-                Objects.equals(this.trialDbIds, plateSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, plateSearchRequest.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds, germplasmNames, observationUnitDbIds, page, pageSize, plateBarcodes, plateDbIds, plateNames, programDbIds, programNames, sampleDbIds, sampleGroupDbIds, sampleNames, studyDbIds, studyNames, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PlateSearchRequest {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    plateBarcodes: ").append(toIndentedString(plateBarcodes)).append("\n");
-        sb.append("    plateDbIds: ").append(toIndentedString(plateDbIds)).append("\n");
-        sb.append("    plateNames: ").append(toIndentedString(plateNames)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    sampleDbIds: ").append(toIndentedString(sampleDbIds)).append("\n");
-        sb.append("    sampleGroupDbIds: ").append(toIndentedString(sampleGroupDbIds)).append("\n");
-        sb.append("    sampleNames: ").append(toIndentedString(sampleNames)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateSingleResponse.java
deleted file mode 100644
index cc86e45e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PlateSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * PlateSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class PlateSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Plate result = null;
-
-    public PlateSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public PlateSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public PlateSingleResponse result(Plate result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Plate getResult() {
-        return result;
-    }
-
-    public void setResult(Plate result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PlateSingleResponse plateSingleResponse = (PlateSingleResponse) o;
-        return Objects.equals(this._atContext, plateSingleResponse._atContext) &&
-                Objects.equals(this.metadata, plateSingleResponse.metadata) &&
-                Objects.equals(this.result, plateSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PlateSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PointGeometry.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PointGeometry.java
deleted file mode 100644
index 5261fd1f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PointGeometry.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Copied from RFC 7946 Section 3.1.1  A position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.
- */
-@Schema(description = "Copied from RFC 7946 Section 3.1.1  A position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class PointGeometry {
-    @SerializedName("coordinates")
-    private List<BigDecimal> coordinates = null;
-
-    @SerializedName("type")
-    private String type = "Point";
-
-    public PointGeometry coordinates(List<BigDecimal> coordinates) {
-        this.coordinates = coordinates;
-        return this;
-    }
-
-    public PointGeometry addCoordinatesItem(BigDecimal coordinatesItem) {
-        if (this.coordinates == null) {
-            this.coordinates = new ArrayList<BigDecimal>();
-        }
-        this.coordinates.add(coordinatesItem);
-        return this;
-    }
-
-    /**
-     * A single position
-     *
-     * @return coordinates
-     **/
-    @Schema(example = "[-76.506042,42.417373,123]", description = "A single position")
-    public List<BigDecimal> getCoordinates() {
-        return coordinates;
-    }
-
-    public void setCoordinates(List<BigDecimal> coordinates) {
-        this.coordinates = coordinates;
-    }
-
-    public PointGeometry type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The literal string \&quot;Point\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Point", description = "The literal string \"Point\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PointGeometry pointGeometry = (PointGeometry) o;
-        return Objects.equals(this.coordinates, pointGeometry.coordinates) &&
-                Objects.equals(this.type, pointGeometry.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(coordinates, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PointGeometry {\n");
-
-        sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Polygon.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Polygon.java
deleted file mode 100644
index 200bcc28..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Polygon.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An array of linear rings
- */
-@Schema(description = "An array of linear rings")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class Polygon extends ArrayList<List> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Polygon {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PolygonGeometry.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PolygonGeometry.java
deleted file mode 100644
index 364a9777..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/PolygonGeometry.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An array of Linear Rings. Each Linear Ring is an array of Points.   A Point is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.
- */
-@Schema(description = "An array of Linear Rings. Each Linear Ring is an array of Points.   A Point is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class PolygonGeometry {
-    @SerializedName("coordinates")
-    private List<List<List<BigDecimal>>> coordinates = null;
-
-    @SerializedName("type")
-    private String type = "Polygon";
-
-    public PolygonGeometry coordinates(List<List<List<BigDecimal>>> coordinates) {
-        this.coordinates = coordinates;
-        return this;
-    }
-
-    public PolygonGeometry addCoordinatesItem(List<List<BigDecimal>> coordinatesItem) {
-        if (this.coordinates == null) {
-            this.coordinates = new ArrayList<List<List<BigDecimal>>>();
-        }
-        this.coordinates.add(coordinatesItem);
-        return this;
-    }
-
-    /**
-     * An array of linear rings
-     *
-     * @return coordinates
-     **/
-    @Schema(example = "[[[-77.456654,42.241133,494],[-75.414133,41.508282,571],[-76.506042,42.417373,123],[-77.456654,42.241133,346]]]", description = "An array of linear rings")
-    public List<List<List<BigDecimal>>> getCoordinates() {
-        return coordinates;
-    }
-
-    public void setCoordinates(List<List<List<BigDecimal>>> coordinates) {
-        this.coordinates = coordinates;
-    }
-
-    public PolygonGeometry type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The literal string \&quot;Polygon\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Polygon", description = "The literal string \"Polygon\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PolygonGeometry polygonGeometry = (PolygonGeometry) o;
-        return Objects.equals(this.coordinates, polygonGeometry.coordinates) &&
-                Objects.equals(this.type, polygonGeometry.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(coordinates, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PolygonGeometry {\n");
-
-        sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Position.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Position.java
deleted file mode 100644
index ef3a289d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Position.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Objects;
-
-/**
- * A single position
- */
-@Schema(description = "A single position")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class Position extends ArrayList<BigDecimal> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Position {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Reference.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Reference.java
deleted file mode 100644
index e642187a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Reference.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A &#x60;Reference&#x60; is a canonical assembled contig, intended to act as a reference coordinate space for other genomic annotations. A single &#x60;Reference&#x60; might represent the human chromosome 1, for instance. &#x60;References&#x60; are designed to be immutable.
- */
-@Schema(description = "A `Reference` is a canonical assembled contig, intended to act as a reference coordinate space for other genomic annotations. A single `Reference` might represent the human chromosome 1, for instance. `References` are designed to be immutable.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class Reference {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("externalReferences")
-    private ExternalReferences externalReferences = null;
-
-    @SerializedName("isDerived")
-    private Boolean isDerived = null;
-
-    @SerializedName("length")
-    private Integer length = null;
-
-    @SerializedName("md5checksum")
-    private String md5checksum = null;
-
-    @SerializedName("referenceDbId")
-    private String referenceDbId = null;
-
-    @SerializedName("referenceName")
-    private String referenceName = null;
-
-    @SerializedName("referenceSetDbId")
-    private String referenceSetDbId = null;
-
-    @SerializedName("referenceSetName")
-    private String referenceSetName = null;
-
-    @SerializedName("sourceAccessions")
-    private List<String> sourceAccessions = null;
-
-    @SerializedName("sourceDivergence")
-    private Float sourceDivergence = null;
-
-    @SerializedName("sourceGermplasm")
-    private List<ReferenceSourceGermplasm> sourceGermplasm = null;
-
-    @SerializedName("sourceURI")
-    private String sourceURI = null;
-
-    @SerializedName("species")
-    private OntologyTerm species = null;
-
-    public Reference additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Reference putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Reference commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Common name for the crop
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Maize", description = "Common name for the crop")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public Reference externalReferences(ExternalReferences externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    /**
-     * Get externalReferences
-     *
-     * @return externalReferences
-     **/
-    @Schema(description = "")
-    public ExternalReferences getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(ExternalReferences externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Reference isDerived(Boolean isDerived) {
-        this.isDerived = isDerived;
-        return this;
-    }
-
-    /**
-     * A sequence X is said to be derived from source sequence Y, if X and Y are of the same length and the per-base sequence divergence at A/C/G/T bases is sufficiently small. Two sequences derived from the same official sequence share the same coordinates and annotations, and can be replaced with the official sequence for certain use cases.
-     *
-     * @return isDerived
-     **/
-    @Schema(example = "false", description = "A sequence X is said to be derived from source sequence Y, if X and Y are of the same length and the per-base sequence divergence at A/C/G/T bases is sufficiently small. Two sequences derived from the same official sequence share the same coordinates and annotations, and can be replaced with the official sequence for certain use cases.")
-    public Boolean isIsDerived() {
-        return isDerived;
-    }
-
-    public void setIsDerived(Boolean isDerived) {
-        this.isDerived = isDerived;
-    }
-
-    public Reference length(Integer length) {
-        this.length = length;
-        return this;
-    }
-
-    /**
-     * The length of this &#x60;Reference&#x60; sequence.
-     *
-     * @return length
-     **/
-    @Schema(example = "50000000", description = "The length of this `Reference` sequence.")
-    public Integer getLength() {
-        return length;
-    }
-
-    public void setLength(Integer length) {
-        this.length = length;
-    }
-
-    public Reference md5checksum(String md5checksum) {
-        this.md5checksum = md5checksum;
-        return this;
-    }
-
-    /**
-     * The MD5 checksum uniquely representing this &#x60;Reference&#x60; as a lower-case hexadecimal string, calculated as the MD5 of the upper-case sequence excluding all whitespace characters (this is equivalent to SQ:M5 in SAM).
-     *
-     * @return md5checksum
-     **/
-    @Schema(example = "c2365e900c81a89cf74d83dab60df146", description = "The MD5 checksum uniquely representing this `Reference` as a lower-case hexadecimal string, calculated as the MD5 of the upper-case sequence excluding all whitespace characters (this is equivalent to SQ:M5 in SAM).")
-    public String getMd5checksum() {
-        return md5checksum;
-    }
-
-    public void setMd5checksum(String md5checksum) {
-        this.md5checksum = md5checksum;
-    }
-
-    public Reference referenceDbId(String referenceDbId) {
-        this.referenceDbId = referenceDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a &#x60;Reference&#x60;
-     *
-     * @return referenceDbId
-     **/
-    @Schema(example = "fc0a81d0", description = "The unique identifier for a `Reference`")
-    public String getReferenceDbId() {
-        return referenceDbId;
-    }
-
-    public void setReferenceDbId(String referenceDbId) {
-        this.referenceDbId = referenceDbId;
-    }
-
-    public Reference referenceName(String referenceName) {
-        this.referenceName = referenceName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a &#x60;Reference&#x60; within a &#x60;ReferenceSet&#x60;.
-     *
-     * @return referenceName
-     **/
-    @Schema(example = "Chromosome 2", description = "The human readable name of a `Reference` within a `ReferenceSet`.")
-    public String getReferenceName() {
-        return referenceName;
-    }
-
-    public void setReferenceName(String referenceName) {
-        this.referenceName = referenceName;
-    }
-
-    public Reference referenceSetDbId(String referenceSetDbId) {
-        this.referenceSetDbId = referenceSetDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a &#x60;ReferenceSet&#x60;
-     *
-     * @return referenceSetDbId
-     **/
-    @Schema(example = "c1ecfef1", description = "The unique identifier for a `ReferenceSet`")
-    public String getReferenceSetDbId() {
-        return referenceSetDbId;
-    }
-
-    public void setReferenceSetDbId(String referenceSetDbId) {
-        this.referenceSetDbId = referenceSetDbId;
-    }
-
-    public Reference referenceSetName(String referenceSetName) {
-        this.referenceSetName = referenceSetName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a &#x60;ReferenceSet&#x60;
-     *
-     * @return referenceSetName
-     **/
-    @Schema(example = "The Best Assembly Ever", description = "The human readable name of a `ReferenceSet`")
-    public String getReferenceSetName() {
-        return referenceSetName;
-    }
-
-    public void setReferenceSetName(String referenceSetName) {
-        this.referenceSetName = referenceSetName;
-    }
-
-    public Reference sourceAccessions(List<String> sourceAccessions) {
-        this.sourceAccessions = sourceAccessions;
-        return this;
-    }
-
-    public Reference addSourceAccessionsItem(String sourceAccessionsItem) {
-        if (this.sourceAccessions == null) {
-            this.sourceAccessions = new ArrayList<String>();
-        }
-        this.sourceAccessions.add(sourceAccessionsItem);
-        return this;
-    }
-
-    /**
-     * All known corresponding accession IDs in INSDC (GenBank/ENA/DDBJ) which must include a version number, e.g. &#x60;GCF_000001405.26&#x60;.
-     *
-     * @return sourceAccessions
-     **/
-    @Schema(example = "[\"GCF_000001405.26\"]", description = "All known corresponding accession IDs in INSDC (GenBank/ENA/DDBJ) which must include a version number, e.g. `GCF_000001405.26`.")
-    public List<String> getSourceAccessions() {
-        return sourceAccessions;
-    }
-
-    public void setSourceAccessions(List<String> sourceAccessions) {
-        this.sourceAccessions = sourceAccessions;
-    }
-
-    public Reference sourceDivergence(Float sourceDivergence) {
-        this.sourceDivergence = sourceDivergence;
-        return this;
-    }
-
-    /**
-     * The &#x60;sourceDivergence&#x60; is the fraction of non-indel bases that do not match the &#x60;Reference&#x60; this message was derived from.
-     *
-     * @return sourceDivergence
-     **/
-    @Schema(example = "0.01", description = "The `sourceDivergence` is the fraction of non-indel bases that do not match the `Reference` this message was derived from.")
-    public Float getSourceDivergence() {
-        return sourceDivergence;
-    }
-
-    public void setSourceDivergence(Float sourceDivergence) {
-        this.sourceDivergence = sourceDivergence;
-    }
-
-    public Reference sourceGermplasm(List<ReferenceSourceGermplasm> sourceGermplasm) {
-        this.sourceGermplasm = sourceGermplasm;
-        return this;
-    }
-
-    public Reference addSourceGermplasmItem(ReferenceSourceGermplasm sourceGermplasmItem) {
-        if (this.sourceGermplasm == null) {
-            this.sourceGermplasm = new ArrayList<ReferenceSourceGermplasm>();
-        }
-        this.sourceGermplasm.add(sourceGermplasmItem);
-        return this;
-    }
-
-    /**
-     * All known corresponding Germplasm
-     *
-     * @return sourceGermplasm
-     **/
-    @Schema(description = "All known corresponding Germplasm")
-    public List<ReferenceSourceGermplasm> getSourceGermplasm() {
-        return sourceGermplasm;
-    }
-
-    public void setSourceGermplasm(List<ReferenceSourceGermplasm> sourceGermplasm) {
-        this.sourceGermplasm = sourceGermplasm;
-    }
-
-    public Reference sourceURI(String sourceURI) {
-        this.sourceURI = sourceURI;
-        return this;
-    }
-
-    /**
-     * The URI from which the sequence was obtained. Specifies a FASTA format file/string with one name, sequence pair. In most cases, clients should call the &#x60;getReferenceBases()&#x60; method to obtain sequence bases for a &#x60;Reference&#x60; instead of attempting to retrieve this URI.
-     *
-     * @return sourceURI
-     **/
-    @Schema(example = "https://wiki.brapi.org/files/demo.fast", description = "The URI from which the sequence was obtained. Specifies a FASTA format file/string with one name, sequence pair. In most cases, clients should call the `getReferenceBases()` method to obtain sequence bases for a `Reference` instead of attempting to retrieve this URI.")
-    public String getSourceURI() {
-        return sourceURI;
-    }
-
-    public void setSourceURI(String sourceURI) {
-        this.sourceURI = sourceURI;
-    }
-
-    public Reference species(OntologyTerm species) {
-        this.species = species;
-        return this;
-    }
-
-    /**
-     * Get species
-     *
-     * @return species
-     **/
-    @Schema(description = "")
-    public OntologyTerm getSpecies() {
-        return species;
-    }
-
-    public void setSpecies(OntologyTerm species) {
-        this.species = species;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Reference reference = (Reference) o;
-        return Objects.equals(this.additionalInfo, reference.additionalInfo) &&
-                Objects.equals(this.commonCropName, reference.commonCropName) &&
-                Objects.equals(this.externalReferences, reference.externalReferences) &&
-                Objects.equals(this.isDerived, reference.isDerived) &&
-                Objects.equals(this.length, reference.length) &&
-                Objects.equals(this.md5checksum, reference.md5checksum) &&
-                Objects.equals(this.referenceDbId, reference.referenceDbId) &&
-                Objects.equals(this.referenceName, reference.referenceName) &&
-                Objects.equals(this.referenceSetDbId, reference.referenceSetDbId) &&
-                Objects.equals(this.referenceSetName, reference.referenceSetName) &&
-                Objects.equals(this.sourceAccessions, reference.sourceAccessions) &&
-                Objects.equals(this.sourceDivergence, reference.sourceDivergence) &&
-                Objects.equals(this.sourceGermplasm, reference.sourceGermplasm) &&
-                Objects.equals(this.sourceURI, reference.sourceURI) &&
-                Objects.equals(this.species, reference.species);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, commonCropName, externalReferences, isDerived, length, md5checksum, referenceDbId, referenceName, referenceSetDbId, referenceSetName, sourceAccessions, sourceDivergence, sourceGermplasm, sourceURI, species);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Reference {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    isDerived: ").append(toIndentedString(isDerived)).append("\n");
-        sb.append("    length: ").append(toIndentedString(length)).append("\n");
-        sb.append("    md5checksum: ").append(toIndentedString(md5checksum)).append("\n");
-        sb.append("    referenceDbId: ").append(toIndentedString(referenceDbId)).append("\n");
-        sb.append("    referenceName: ").append(toIndentedString(referenceName)).append("\n");
-        sb.append("    referenceSetDbId: ").append(toIndentedString(referenceSetDbId)).append("\n");
-        sb.append("    referenceSetName: ").append(toIndentedString(referenceSetName)).append("\n");
-        sb.append("    sourceAccessions: ").append(toIndentedString(sourceAccessions)).append("\n");
-        sb.append("    sourceDivergence: ").append(toIndentedString(sourceDivergence)).append("\n");
-        sb.append("    sourceGermplasm: ").append(toIndentedString(sourceGermplasm)).append("\n");
-        sb.append("    sourceURI: ").append(toIndentedString(sourceURI)).append("\n");
-        sb.append("    species: ").append(toIndentedString(species)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceBases.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceBases.java
deleted file mode 100644
index 213c6f1c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceBases.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * A string representation of the &#x60;Reference&#x60; base alleles.
- */
-@Schema(description = "A string representation of the `Reference` base alleles.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ReferenceBases {
-    @SerializedName("nextPageToken")
-    private String nextPageToken = null;
-
-    @SerializedName("offset")
-    private Integer offset = null;
-
-    @SerializedName("sequence")
-    private String sequence = null;
-
-    public ReferenceBases nextPageToken(String nextPageToken) {
-        this.nextPageToken = nextPageToken;
-        return this;
-    }
-
-    /**
-     * The continuation token, which is used to page through large result sets. Provide this value in a subsequent request to return the next page of results. This field will be empty if there are not any additional results.
-     *
-     * @return nextPageToken
-     **/
-    @Schema(example = "3a3d658a", description = "The continuation token, which is used to page through large result sets. Provide this value in a subsequent request to return the next page of results. This field will be empty if there are not any additional results.")
-    public String getNextPageToken() {
-        return nextPageToken;
-    }
-
-    public void setNextPageToken(String nextPageToken) {
-        this.nextPageToken = nextPageToken;
-    }
-
-    public ReferenceBases offset(Integer offset) {
-        this.offset = offset;
-        return this;
-    }
-
-    /**
-     * The offset position (0-based) of the given sequence from the start of this &#x60;Reference&#x60;. This value will differ for each page in a request.
-     *
-     * @return offset
-     **/
-    @Schema(example = "20000", description = "The offset position (0-based) of the given sequence from the start of this `Reference`. This value will differ for each page in a request.")
-    public Integer getOffset() {
-        return offset;
-    }
-
-    public void setOffset(Integer offset) {
-        this.offset = offset;
-    }
-
-    public ReferenceBases sequence(String sequence) {
-        this.sequence = sequence;
-        return this;
-    }
-
-    /**
-     * A sub-string of the bases that make up this reference. Bases are represented as IUPAC-IUB codes; this string matches the regular expression &#x60;[ACGTMRWSYKVHDBN]*&#x60;.
-     *
-     * @return sequence
-     **/
-    @Schema(example = "TAGGATTGAGCTCTATATTAGGATTGAGCTCTATATTAGGATTGAGCTCTATATTAGGATTGAGCTCTATATTAGGATTGAGCTCTATATTAGGATTGAGCTCTATATTAGGATTGAGCTCTATATTAGGATTGAGCTCTATATTAGGATTGAGCTCTATAT", description = "A sub-string of the bases that make up this reference. Bases are represented as IUPAC-IUB codes; this string matches the regular expression `[ACGTMRWSYKVHDBN]*`.")
-    public String getSequence() {
-        return sequence;
-    }
-
-    public void setSequence(String sequence) {
-        this.sequence = sequence;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ReferenceBases referenceBases = (ReferenceBases) o;
-        return Objects.equals(this.nextPageToken, referenceBases.nextPageToken) &&
-                Objects.equals(this.offset, referenceBases.offset) &&
-                Objects.equals(this.sequence, referenceBases.sequence);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(nextPageToken, offset, sequence);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ReferenceBases {\n");
-
-        sb.append("    nextPageToken: ").append(toIndentedString(nextPageToken)).append("\n");
-        sb.append("    offset: ").append(toIndentedString(offset)).append("\n");
-        sb.append("    sequence: ").append(toIndentedString(sequence)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceBasesResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceBasesResponse.java
deleted file mode 100644
index 0e4e7f98..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceBasesResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ReferenceBasesResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ReferenceBasesResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ReferenceBases result = null;
-
-    public ReferenceBasesResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ReferenceBasesResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ReferenceBasesResponse result(ReferenceBases result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ReferenceBases getResult() {
-        return result;
-    }
-
-    public void setResult(ReferenceBases result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ReferenceBasesResponse referenceBasesResponse = (ReferenceBasesResponse) o;
-        return Objects.equals(this._atContext, referenceBasesResponse._atContext) &&
-                Objects.equals(this.metadata, referenceBasesResponse.metadata) &&
-                Objects.equals(this.result, referenceBasesResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ReferenceBasesResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSet.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSet.java
deleted file mode 100644
index a85d92de..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSet.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A &#x60;ReferenceSet&#x60; is a set of &#x60;Reference&#x60; s which typically comprise a reference assembly, such as &#x60;GRCH_38&#x60;. A &#x60;ReferenceSet&#x60; defines a common coordinate space for comparing reference-aligned experimental data.
- */
-@Schema(description = "A `ReferenceSet` is a set of `Reference` s which typically comprise a reference assembly, such as `GRCH_38`. A `ReferenceSet` defines a common coordinate space for comparing reference-aligned experimental data.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ReferenceSet {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("assemblyPUI")
-    private String assemblyPUI = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("externalReferences")
-    private ExternalReferences externalReferences = null;
-
-    @SerializedName("isDerived")
-    private Boolean isDerived = null;
-
-    @SerializedName("md5checksum")
-    private String md5checksum = null;
-
-    @SerializedName("referenceSetDbId")
-    private String referenceSetDbId = null;
-
-    @SerializedName("referenceSetName")
-    private String referenceSetName = null;
-
-    @SerializedName("sourceAccessions")
-    private List<String> sourceAccessions = null;
-
-    @SerializedName("sourceGermplasm")
-    private List<ReferenceSetSourceGermplasm> sourceGermplasm = null;
-
-    @SerializedName("sourceURI")
-    private String sourceURI = null;
-
-    @SerializedName("species")
-    private OntologyTerm species = null;
-
-    public ReferenceSet additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ReferenceSet putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ReferenceSet assemblyPUI(String assemblyPUI) {
-        this.assemblyPUI = assemblyPUI;
-        return this;
-    }
-
-    /**
-     * The remaining information is about the source of the sequences Public id of this reference set, such as &#x60;GRCH_37&#x60;.
-     *
-     * @return assemblyPUI
-     **/
-    @Schema(example = "doi://10.12345/fake/9876", description = "The remaining information is about the source of the sequences Public id of this reference set, such as `GRCH_37`.")
-    public String getAssemblyPUI() {
-        return assemblyPUI;
-    }
-
-    public void setAssemblyPUI(String assemblyPUI) {
-        this.assemblyPUI = assemblyPUI;
-    }
-
-    public ReferenceSet commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Common name for the crop
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Maize", description = "Common name for the crop")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public ReferenceSet description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Optional free text description of this reference set.
-     *
-     * @return description
-     **/
-    @Schema(example = "This is an example description for an assembly", description = "Optional free text description of this reference set.")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public ReferenceSet externalReferences(ExternalReferences externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    /**
-     * Get externalReferences
-     *
-     * @return externalReferences
-     **/
-    @Schema(description = "")
-    public ExternalReferences getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(ExternalReferences externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ReferenceSet isDerived(Boolean isDerived) {
-        this.isDerived = isDerived;
-        return this;
-    }
-
-    /**
-     * A reference set may be derived from a source if it contains additional sequences, or some of the sequences within it are derived (see the definition of &#x60;isDerived&#x60; in &#x60;Reference&#x60;).
-     *
-     * @return isDerived
-     **/
-    @Schema(description = "A reference set may be derived from a source if it contains additional sequences, or some of the sequences within it are derived (see the definition of `isDerived` in `Reference`).")
-    public Boolean isIsDerived() {
-        return isDerived;
-    }
-
-    public void setIsDerived(Boolean isDerived) {
-        this.isDerived = isDerived;
-    }
-
-    public ReferenceSet md5checksum(String md5checksum) {
-        this.md5checksum = md5checksum;
-        return this;
-    }
-
-    /**
-     * Order-independent MD5 checksum which identifies this &#x60;ReferenceSet&#x60;.  To compute this checksum, make a list of &#x60;Reference.md5checksum&#x60; for all &#x60;Reference&#x60; s in this set. Then sort that list, and take the MD5 hash of all the strings concatenated together. Express the hash as a lower-case hexadecimal string.
-     *
-     * @return md5checksum
-     **/
-    @Schema(example = "c2365e900c81a89cf74d83dab60df146", description = "Order-independent MD5 checksum which identifies this `ReferenceSet`.  To compute this checksum, make a list of `Reference.md5checksum` for all `Reference` s in this set. Then sort that list, and take the MD5 hash of all the strings concatenated together. Express the hash as a lower-case hexadecimal string.")
-    public String getMd5checksum() {
-        return md5checksum;
-    }
-
-    public void setMd5checksum(String md5checksum) {
-        this.md5checksum = md5checksum;
-    }
-
-    public ReferenceSet referenceSetDbId(String referenceSetDbId) {
-        this.referenceSetDbId = referenceSetDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a ReferenceSet
-     *
-     * @return referenceSetDbId
-     **/
-    @Schema(example = "c1ecfef1", description = "The unique identifier for a ReferenceSet")
-    public String getReferenceSetDbId() {
-        return referenceSetDbId;
-    }
-
-    public void setReferenceSetDbId(String referenceSetDbId) {
-        this.referenceSetDbId = referenceSetDbId;
-    }
-
-    public ReferenceSet referenceSetName(String referenceSetName) {
-        this.referenceSetName = referenceSetName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a ReferenceSet
-     *
-     * @return referenceSetName
-     **/
-    @Schema(example = "The Best Assembly Ever", description = "The human readable name of a ReferenceSet")
-    public String getReferenceSetName() {
-        return referenceSetName;
-    }
-
-    public void setReferenceSetName(String referenceSetName) {
-        this.referenceSetName = referenceSetName;
-    }
-
-    public ReferenceSet sourceAccessions(List<String> sourceAccessions) {
-        this.sourceAccessions = sourceAccessions;
-        return this;
-    }
-
-    public ReferenceSet addSourceAccessionsItem(String sourceAccessionsItem) {
-        if (this.sourceAccessions == null) {
-            this.sourceAccessions = new ArrayList<String>();
-        }
-        this.sourceAccessions.add(sourceAccessionsItem);
-        return this;
-    }
-
-    /**
-     * All known corresponding accession IDs in INSDC (GenBank/ENA/DDBJ) ideally with a version number, e.g. &#x60;NC_000001.11&#x60;.
-     *
-     * @return sourceAccessions
-     **/
-    @Schema(example = "[\"A0000002\",\"A0009393\"]", description = "All known corresponding accession IDs in INSDC (GenBank/ENA/DDBJ) ideally with a version number, e.g. `NC_000001.11`.")
-    public List<String> getSourceAccessions() {
-        return sourceAccessions;
-    }
-
-    public void setSourceAccessions(List<String> sourceAccessions) {
-        this.sourceAccessions = sourceAccessions;
-    }
-
-    public ReferenceSet sourceGermplasm(List<ReferenceSetSourceGermplasm> sourceGermplasm) {
-        this.sourceGermplasm = sourceGermplasm;
-        return this;
-    }
-
-    public ReferenceSet addSourceGermplasmItem(ReferenceSetSourceGermplasm sourceGermplasmItem) {
-        if (this.sourceGermplasm == null) {
-            this.sourceGermplasm = new ArrayList<ReferenceSetSourceGermplasm>();
-        }
-        this.sourceGermplasm.add(sourceGermplasmItem);
-        return this;
-    }
-
-    /**
-     * All known corresponding Germplasm
-     *
-     * @return sourceGermplasm
-     **/
-    @Schema(description = "All known corresponding Germplasm")
-    public List<ReferenceSetSourceGermplasm> getSourceGermplasm() {
-        return sourceGermplasm;
-    }
-
-    public void setSourceGermplasm(List<ReferenceSetSourceGermplasm> sourceGermplasm) {
-        this.sourceGermplasm = sourceGermplasm;
-    }
-
-    public ReferenceSet sourceURI(String sourceURI) {
-        this.sourceURI = sourceURI;
-        return this;
-    }
-
-    /**
-     * Specifies a FASTA format file/string.
-     *
-     * @return sourceURI
-     **/
-    @Schema(example = "https://wiki.brapi.org/files/demo.fast", description = "Specifies a FASTA format file/string.")
-    public String getSourceURI() {
-        return sourceURI;
-    }
-
-    public void setSourceURI(String sourceURI) {
-        this.sourceURI = sourceURI;
-    }
-
-    public ReferenceSet species(OntologyTerm species) {
-        this.species = species;
-        return this;
-    }
-
-    /**
-     * Get species
-     *
-     * @return species
-     **/
-    @Schema(description = "")
-    public OntologyTerm getSpecies() {
-        return species;
-    }
-
-    public void setSpecies(OntologyTerm species) {
-        this.species = species;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ReferenceSet referenceSet = (ReferenceSet) o;
-        return Objects.equals(this.additionalInfo, referenceSet.additionalInfo) &&
-                Objects.equals(this.assemblyPUI, referenceSet.assemblyPUI) &&
-                Objects.equals(this.commonCropName, referenceSet.commonCropName) &&
-                Objects.equals(this.description, referenceSet.description) &&
-                Objects.equals(this.externalReferences, referenceSet.externalReferences) &&
-                Objects.equals(this.isDerived, referenceSet.isDerived) &&
-                Objects.equals(this.md5checksum, referenceSet.md5checksum) &&
-                Objects.equals(this.referenceSetDbId, referenceSet.referenceSetDbId) &&
-                Objects.equals(this.referenceSetName, referenceSet.referenceSetName) &&
-                Objects.equals(this.sourceAccessions, referenceSet.sourceAccessions) &&
-                Objects.equals(this.sourceGermplasm, referenceSet.sourceGermplasm) &&
-                Objects.equals(this.sourceURI, referenceSet.sourceURI) &&
-                Objects.equals(this.species, referenceSet.species);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, assemblyPUI, commonCropName, description, externalReferences, isDerived, md5checksum, referenceSetDbId, referenceSetName, sourceAccessions, sourceGermplasm, sourceURI, species);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ReferenceSet {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    assemblyPUI: ").append(toIndentedString(assemblyPUI)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    isDerived: ").append(toIndentedString(isDerived)).append("\n");
-        sb.append("    md5checksum: ").append(toIndentedString(md5checksum)).append("\n");
-        sb.append("    referenceSetDbId: ").append(toIndentedString(referenceSetDbId)).append("\n");
-        sb.append("    referenceSetName: ").append(toIndentedString(referenceSetName)).append("\n");
-        sb.append("    sourceAccessions: ").append(toIndentedString(sourceAccessions)).append("\n");
-        sb.append("    sourceGermplasm: ").append(toIndentedString(sourceGermplasm)).append("\n");
-        sb.append("    sourceURI: ").append(toIndentedString(sourceURI)).append("\n");
-        sb.append("    species: ").append(toIndentedString(species)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetSourceGermplasm.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetSourceGermplasm.java
deleted file mode 100644
index 069d36d4..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetSourceGermplasm.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ReferenceSetSourceGermplasm
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ReferenceSetSourceGermplasm {
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    public ReferenceSetSourceGermplasm germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm within the given database server
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "d4076594", description = "The ID which uniquely identifies a germplasm within the given database server")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public ReferenceSetSourceGermplasm germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a germplasm
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000003", description = "The human readable name of a germplasm")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ReferenceSetSourceGermplasm referenceSetSourceGermplasm = (ReferenceSetSourceGermplasm) o;
-        return Objects.equals(this.germplasmDbId, referenceSetSourceGermplasm.germplasmDbId) &&
-                Objects.equals(this.germplasmName, referenceSetSourceGermplasm.germplasmName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(germplasmDbId, germplasmName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ReferenceSetSourceGermplasm {\n");
-
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetsListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetsListResponse.java
deleted file mode 100644
index fe2eb207..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetsListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ReferenceSetsListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ReferenceSetsListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ReferenceSetsListResponseResult result = null;
-
-    public ReferenceSetsListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ReferenceSetsListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ReferenceSetsListResponse result(ReferenceSetsListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ReferenceSetsListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ReferenceSetsListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ReferenceSetsListResponse referenceSetsListResponse = (ReferenceSetsListResponse) o;
-        return Objects.equals(this._atContext, referenceSetsListResponse._atContext) &&
-                Objects.equals(this.metadata, referenceSetsListResponse.metadata) &&
-                Objects.equals(this.result, referenceSetsListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ReferenceSetsListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetsListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetsListResponseResult.java
deleted file mode 100644
index 7950e88d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetsListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ReferenceSetsListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ReferenceSetsListResponseResult {
-    @SerializedName("data")
-    private List<ReferenceSet> data = new ArrayList<ReferenceSet>();
-
-    public ReferenceSetsListResponseResult data(List<ReferenceSet> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ReferenceSetsListResponseResult addDataItem(ReferenceSet dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<ReferenceSet> getData() {
-        return data;
-    }
-
-    public void setData(List<ReferenceSet> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ReferenceSetsListResponseResult referenceSetsListResponseResult = (ReferenceSetsListResponseResult) o;
-        return Objects.equals(this.data, referenceSetsListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ReferenceSetsListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetsSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetsSearchRequest.java
deleted file mode 100644
index 86bc328d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetsSearchRequest.java
+++ /dev/null
@@ -1,626 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ReferenceSetsSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ReferenceSetsSearchRequest {
-    @SerializedName("accessions")
-    private List<String> accessions = null;
-
-    @SerializedName("assemblyPUIs")
-    private List<String> assemblyPUIs = null;
-
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("md5checksums")
-    private List<String> md5checksums = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("referenceSetDbIds")
-    private List<String> referenceSetDbIds = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public ReferenceSetsSearchRequest accessions(List<String> accessions) {
-        this.accessions = accessions;
-        return this;
-    }
-
-    public ReferenceSetsSearchRequest addAccessionsItem(String accessionsItem) {
-        if (this.accessions == null) {
-            this.accessions = new ArrayList<String>();
-        }
-        this.accessions.add(accessionsItem);
-        return this;
-    }
-
-    /**
-     * If set, return the reference sets for which the &#x60;accession&#x60; matches this string (case-sensitive, exact match).
-     *
-     * @return accessions
-     **/
-    @Schema(example = "[\"A0009283\",\"A0006657\"]", description = "If set, return the reference sets for which the `accession` matches this string (case-sensitive, exact match).")
-    public List<String> getAccessions() {
-        return accessions;
-    }
-
-    public void setAccessions(List<String> accessions) {
-        this.accessions = accessions;
-    }
-
-    public ReferenceSetsSearchRequest assemblyPUIs(List<String> assemblyPUIs) {
-        this.assemblyPUIs = assemblyPUIs;
-        return this;
-    }
-
-    public ReferenceSetsSearchRequest addAssemblyPUIsItem(String assemblyPUIsItem) {
-        if (this.assemblyPUIs == null) {
-            this.assemblyPUIs = new ArrayList<String>();
-        }
-        this.assemblyPUIs.add(assemblyPUIsItem);
-        return this;
-    }
-
-    /**
-     * If set, return the reference sets for which the &#x60;assemblyId&#x60; matches this string (case-sensitive, exact match).
-     *
-     * @return assemblyPUIs
-     **/
-    @Schema(example = "[\"doi:10.15454/312953986E3\",\"doi:10.15454/312953986E3\"]", description = "If set, return the reference sets for which the `assemblyId` matches this string (case-sensitive, exact match).")
-    public List<String> getAssemblyPUIs() {
-        return assemblyPUIs;
-    }
-
-    public void setAssemblyPUIs(List<String> assemblyPUIs) {
-        this.assemblyPUIs = assemblyPUIs;
-    }
-
-    public ReferenceSetsSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public ReferenceSetsSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public ReferenceSetsSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public ReferenceSetsSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public ReferenceSetsSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public ReferenceSetsSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public ReferenceSetsSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public ReferenceSetsSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public ReferenceSetsSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public ReferenceSetsSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public ReferenceSetsSearchRequest germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public ReferenceSetsSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public ReferenceSetsSearchRequest md5checksums(List<String> md5checksums) {
-        this.md5checksums = md5checksums;
-        return this;
-    }
-
-    public ReferenceSetsSearchRequest addMd5checksumsItem(String md5checksumsItem) {
-        if (this.md5checksums == null) {
-            this.md5checksums = new ArrayList<String>();
-        }
-        this.md5checksums.add(md5checksumsItem);
-        return this;
-    }
-
-    /**
-     * If set, return the reference sets for which the &#x60;md5checksum&#x60; matches this string (case-sensitive, exact match).
-     *
-     * @return md5checksums
-     **/
-    @Schema(example = "[\"c2365e900c81a89cf74d83dab60df146\"]", description = "If set, return the reference sets for which the `md5checksum` matches this string (case-sensitive, exact match).")
-    public List<String> getMd5checksums() {
-        return md5checksums;
-    }
-
-    public void setMd5checksums(List<String> md5checksums) {
-        this.md5checksums = md5checksums;
-    }
-
-    public ReferenceSetsSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public ReferenceSetsSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public ReferenceSetsSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public ReferenceSetsSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public ReferenceSetsSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public ReferenceSetsSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public ReferenceSetsSearchRequest referenceSetDbIds(List<String> referenceSetDbIds) {
-        this.referenceSetDbIds = referenceSetDbIds;
-        return this;
-    }
-
-    public ReferenceSetsSearchRequest addReferenceSetDbIdsItem(String referenceSetDbIdsItem) {
-        if (this.referenceSetDbIds == null) {
-            this.referenceSetDbIds = new ArrayList<String>();
-        }
-        this.referenceSetDbIds.add(referenceSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;ReferenceSets&#x60; to search.
-     *
-     * @return referenceSetDbIds
-     **/
-    @Schema(example = "[\"32a19dd7\",\"2c182c18\"]", description = "The `ReferenceSets` to search.")
-    public List<String> getReferenceSetDbIds() {
-        return referenceSetDbIds;
-    }
-
-    public void setReferenceSetDbIds(List<String> referenceSetDbIds) {
-        this.referenceSetDbIds = referenceSetDbIds;
-    }
-
-    public ReferenceSetsSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public ReferenceSetsSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public ReferenceSetsSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public ReferenceSetsSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public ReferenceSetsSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public ReferenceSetsSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public ReferenceSetsSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public ReferenceSetsSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ReferenceSetsSearchRequest referenceSetsSearchRequest = (ReferenceSetsSearchRequest) o;
-        return Objects.equals(this.accessions, referenceSetsSearchRequest.accessions) &&
-                Objects.equals(this.assemblyPUIs, referenceSetsSearchRequest.assemblyPUIs) &&
-                Objects.equals(this.commonCropNames, referenceSetsSearchRequest.commonCropNames) &&
-                Objects.equals(this.externalReferenceIDs, referenceSetsSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, referenceSetsSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, referenceSetsSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.germplasmDbIds, referenceSetsSearchRequest.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, referenceSetsSearchRequest.germplasmNames) &&
-                Objects.equals(this.md5checksums, referenceSetsSearchRequest.md5checksums) &&
-                Objects.equals(this.page, referenceSetsSearchRequest.page) &&
-                Objects.equals(this.pageSize, referenceSetsSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, referenceSetsSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, referenceSetsSearchRequest.programNames) &&
-                Objects.equals(this.referenceSetDbIds, referenceSetsSearchRequest.referenceSetDbIds) &&
-                Objects.equals(this.studyDbIds, referenceSetsSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, referenceSetsSearchRequest.studyNames) &&
-                Objects.equals(this.trialDbIds, referenceSetsSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, referenceSetsSearchRequest.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(accessions, assemblyPUIs, commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds, germplasmNames, md5checksums, page, pageSize, programDbIds, programNames, referenceSetDbIds, studyDbIds, studyNames, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ReferenceSetsSearchRequest {\n");
-
-        sb.append("    accessions: ").append(toIndentedString(accessions)).append("\n");
-        sb.append("    assemblyPUIs: ").append(toIndentedString(assemblyPUIs)).append("\n");
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    md5checksums: ").append(toIndentedString(md5checksums)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    referenceSetDbIds: ").append(toIndentedString(referenceSetDbIds)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetsSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetsSingleResponse.java
deleted file mode 100644
index abca1669..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSetsSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ReferenceSetsSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ReferenceSetsSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ReferenceSet result = null;
-
-    public ReferenceSetsSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ReferenceSetsSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ReferenceSetsSingleResponse result(ReferenceSet result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ReferenceSet getResult() {
-        return result;
-    }
-
-    public void setResult(ReferenceSet result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ReferenceSetsSingleResponse referenceSetsSingleResponse = (ReferenceSetsSingleResponse) o;
-        return Objects.equals(this._atContext, referenceSetsSingleResponse._atContext) &&
-                Objects.equals(this.metadata, referenceSetsSingleResponse.metadata) &&
-                Objects.equals(this.result, referenceSetsSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ReferenceSetsSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSingleResponse.java
deleted file mode 100644
index cbb8e60b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ReferenceSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ReferenceSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Reference result = null;
-
-    public ReferenceSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ReferenceSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ReferenceSingleResponse result(Reference result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Reference getResult() {
-        return result;
-    }
-
-    public void setResult(Reference result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ReferenceSingleResponse referenceSingleResponse = (ReferenceSingleResponse) o;
-        return Objects.equals(this._atContext, referenceSingleResponse._atContext) &&
-                Objects.equals(this.metadata, referenceSingleResponse.metadata) &&
-                Objects.equals(this.result, referenceSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ReferenceSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSourceGermplasm.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSourceGermplasm.java
deleted file mode 100644
index 78d67d6a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferenceSourceGermplasm.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ReferenceSourceGermplasm
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ReferenceSourceGermplasm {
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    public ReferenceSourceGermplasm germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Germplasm&#x60; within the given database server
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "d4076594", description = "The ID which uniquely identifies a `Germplasm` within the given database server")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public ReferenceSourceGermplasm germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a &#x60;Germplasm&#x60;
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000003", description = "The human readable name of a `Germplasm`")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ReferenceSourceGermplasm referenceSourceGermplasm = (ReferenceSourceGermplasm) o;
-        return Objects.equals(this.germplasmDbId, referenceSourceGermplasm.germplasmDbId) &&
-                Objects.equals(this.germplasmName, referenceSourceGermplasm.germplasmName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(germplasmDbId, germplasmName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ReferenceSourceGermplasm {\n");
-
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferencesListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferencesListResponse.java
deleted file mode 100644
index c604d4dd..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferencesListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ReferencesListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ReferencesListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ReferencesListResponseResult result = null;
-
-    public ReferencesListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ReferencesListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ReferencesListResponse result(ReferencesListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ReferencesListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ReferencesListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ReferencesListResponse referencesListResponse = (ReferencesListResponse) o;
-        return Objects.equals(this._atContext, referencesListResponse._atContext) &&
-                Objects.equals(this.metadata, referencesListResponse.metadata) &&
-                Objects.equals(this.result, referencesListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ReferencesListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferencesListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferencesListResponseResult.java
deleted file mode 100644
index a3604a32..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferencesListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ReferencesListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ReferencesListResponseResult {
-    @SerializedName("data")
-    private List<Reference> data = new ArrayList<Reference>();
-
-    public ReferencesListResponseResult data(List<Reference> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ReferencesListResponseResult addDataItem(Reference dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Reference> getData() {
-        return data;
-    }
-
-    public void setData(List<Reference> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ReferencesListResponseResult referencesListResponseResult = (ReferencesListResponseResult) o;
-        return Objects.equals(this.data, referencesListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ReferencesListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferencesSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferencesSearchRequest.java
deleted file mode 100644
index 73bcdd67..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ReferencesSearchRequest.java
+++ /dev/null
@@ -1,698 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ReferencesSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ReferencesSearchRequest {
-    @SerializedName("accessions")
-    private List<String> accessions = null;
-
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("isDerived")
-    private Boolean isDerived = null;
-
-    @SerializedName("maxLength")
-    private Integer maxLength = null;
-
-    @SerializedName("md5checksums")
-    private List<String> md5checksums = null;
-
-    @SerializedName("minLength")
-    private Integer minLength = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("referenceDbIds")
-    private List<String> referenceDbIds = null;
-
-    @SerializedName("referenceSetDbIds")
-    private List<String> referenceSetDbIds = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public ReferencesSearchRequest accessions(List<String> accessions) {
-        this.accessions = accessions;
-        return this;
-    }
-
-    public ReferencesSearchRequest addAccessionsItem(String accessionsItem) {
-        if (this.accessions == null) {
-            this.accessions = new ArrayList<String>();
-        }
-        this.accessions.add(accessionsItem);
-        return this;
-    }
-
-    /**
-     * If specified, return the references for which the &#x60;accession&#x60; matches this string (case-sensitive, exact match).
-     *
-     * @return accessions
-     **/
-    @Schema(example = "[\"A0009283\",\"A0006657\"]", description = "If specified, return the references for which the `accession` matches this string (case-sensitive, exact match).")
-    public List<String> getAccessions() {
-        return accessions;
-    }
-
-    public void setAccessions(List<String> accessions) {
-        this.accessions = accessions;
-    }
-
-    public ReferencesSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public ReferencesSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public ReferencesSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public ReferencesSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public ReferencesSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public ReferencesSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public ReferencesSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public ReferencesSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public ReferencesSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public ReferencesSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public ReferencesSearchRequest germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public ReferencesSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public ReferencesSearchRequest isDerived(Boolean isDerived) {
-        this.isDerived = isDerived;
-        return this;
-    }
-
-    /**
-     * A sequence X is said to be derived from source sequence Y, if X and Y are of the same length and the per-base sequence divergence at A/C/G/T bases is sufficiently small. Two sequences derived from the same official sequence share the same coordinates and annotations, and can be replaced with the official sequence for certain use cases.
-     *
-     * @return isDerived
-     **/
-    @Schema(description = "A sequence X is said to be derived from source sequence Y, if X and Y are of the same length and the per-base sequence divergence at A/C/G/T bases is sufficiently small. Two sequences derived from the same official sequence share the same coordinates and annotations, and can be replaced with the official sequence for certain use cases.")
-    public Boolean isIsDerived() {
-        return isDerived;
-    }
-
-    public void setIsDerived(Boolean isDerived) {
-        this.isDerived = isDerived;
-    }
-
-    public ReferencesSearchRequest maxLength(Integer maxLength) {
-        this.maxLength = maxLength;
-        return this;
-    }
-
-    /**
-     * The minimum length of this &#x60;References&#x60; sequence.
-     *
-     * @return maxLength
-     **/
-    @Schema(example = "90000", description = "The minimum length of this `References` sequence.")
-    public Integer getMaxLength() {
-        return maxLength;
-    }
-
-    public void setMaxLength(Integer maxLength) {
-        this.maxLength = maxLength;
-    }
-
-    public ReferencesSearchRequest md5checksums(List<String> md5checksums) {
-        this.md5checksums = md5checksums;
-        return this;
-    }
-
-    public ReferencesSearchRequest addMd5checksumsItem(String md5checksumsItem) {
-        if (this.md5checksums == null) {
-            this.md5checksums = new ArrayList<String>();
-        }
-        this.md5checksums.add(md5checksumsItem);
-        return this;
-    }
-
-    /**
-     * If specified, return the references for which the &#x60;md5checksum&#x60; matches this string (case-sensitive, exact match).
-     *
-     * @return md5checksums
-     **/
-    @Schema(example = "[\"c2365e900c81a89cf74d83dab60df146\"]", description = "If specified, return the references for which the `md5checksum` matches this string (case-sensitive, exact match).")
-    public List<String> getMd5checksums() {
-        return md5checksums;
-    }
-
-    public void setMd5checksums(List<String> md5checksums) {
-        this.md5checksums = md5checksums;
-    }
-
-    public ReferencesSearchRequest minLength(Integer minLength) {
-        this.minLength = minLength;
-        return this;
-    }
-
-    /**
-     * The minimum length of this &#x60;References&#x60; sequence.
-     *
-     * @return minLength
-     **/
-    @Schema(example = "4000", description = "The minimum length of this `References` sequence.")
-    public Integer getMinLength() {
-        return minLength;
-    }
-
-    public void setMinLength(Integer minLength) {
-        this.minLength = minLength;
-    }
-
-    public ReferencesSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public ReferencesSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public ReferencesSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public ReferencesSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public ReferencesSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public ReferencesSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public ReferencesSearchRequest referenceDbIds(List<String> referenceDbIds) {
-        this.referenceDbIds = referenceDbIds;
-        return this;
-    }
-
-    public ReferencesSearchRequest addReferenceDbIdsItem(String referenceDbIdsItem) {
-        if (this.referenceDbIds == null) {
-            this.referenceDbIds = new ArrayList<String>();
-        }
-        this.referenceDbIds.add(referenceDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;References&#x60; within the given database server
-     *
-     * @return referenceDbIds
-     **/
-    @Schema(example = "[\"04c83ea7\",\"d0998a34\"]", description = "A list of IDs which uniquely identify `References` within the given database server")
-    public List<String> getReferenceDbIds() {
-        return referenceDbIds;
-    }
-
-    public void setReferenceDbIds(List<String> referenceDbIds) {
-        this.referenceDbIds = referenceDbIds;
-    }
-
-    public ReferencesSearchRequest referenceSetDbIds(List<String> referenceSetDbIds) {
-        this.referenceSetDbIds = referenceSetDbIds;
-        return this;
-    }
-
-    public ReferencesSearchRequest addReferenceSetDbIdsItem(String referenceSetDbIdsItem) {
-        if (this.referenceSetDbIds == null) {
-            this.referenceSetDbIds = new ArrayList<String>();
-        }
-        this.referenceSetDbIds.add(referenceSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;ReferenceSets&#x60; within the given database server
-     *
-     * @return referenceSetDbIds
-     **/
-    @Schema(example = "[\"32a19dd7\",\"2c182c18\"]", description = "A list of IDs which uniquely identify `ReferenceSets` within the given database server")
-    public List<String> getReferenceSetDbIds() {
-        return referenceSetDbIds;
-    }
-
-    public void setReferenceSetDbIds(List<String> referenceSetDbIds) {
-        this.referenceSetDbIds = referenceSetDbIds;
-    }
-
-    public ReferencesSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public ReferencesSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public ReferencesSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public ReferencesSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public ReferencesSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public ReferencesSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public ReferencesSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public ReferencesSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ReferencesSearchRequest referencesSearchRequest = (ReferencesSearchRequest) o;
-        return Objects.equals(this.accessions, referencesSearchRequest.accessions) &&
-                Objects.equals(this.commonCropNames, referencesSearchRequest.commonCropNames) &&
-                Objects.equals(this.externalReferenceIDs, referencesSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, referencesSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, referencesSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.germplasmDbIds, referencesSearchRequest.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, referencesSearchRequest.germplasmNames) &&
-                Objects.equals(this.isDerived, referencesSearchRequest.isDerived) &&
-                Objects.equals(this.maxLength, referencesSearchRequest.maxLength) &&
-                Objects.equals(this.md5checksums, referencesSearchRequest.md5checksums) &&
-                Objects.equals(this.minLength, referencesSearchRequest.minLength) &&
-                Objects.equals(this.page, referencesSearchRequest.page) &&
-                Objects.equals(this.pageSize, referencesSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, referencesSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, referencesSearchRequest.programNames) &&
-                Objects.equals(this.referenceDbIds, referencesSearchRequest.referenceDbIds) &&
-                Objects.equals(this.referenceSetDbIds, referencesSearchRequest.referenceSetDbIds) &&
-                Objects.equals(this.studyDbIds, referencesSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, referencesSearchRequest.studyNames) &&
-                Objects.equals(this.trialDbIds, referencesSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, referencesSearchRequest.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(accessions, commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds, germplasmNames, isDerived, maxLength, md5checksums, minLength, page, pageSize, programDbIds, programNames, referenceDbIds, referenceSetDbIds, studyDbIds, studyNames, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ReferencesSearchRequest {\n");
-
-        sb.append("    accessions: ").append(toIndentedString(accessions)).append("\n");
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    isDerived: ").append(toIndentedString(isDerived)).append("\n");
-        sb.append("    maxLength: ").append(toIndentedString(maxLength)).append("\n");
-        sb.append("    md5checksums: ").append(toIndentedString(md5checksums)).append("\n");
-        sb.append("    minLength: ").append(toIndentedString(minLength)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    referenceDbIds: ").append(toIndentedString(referenceDbIds)).append("\n");
-        sb.append("    referenceSetDbIds: ").append(toIndentedString(referenceSetDbIds)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Sample.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Sample.java
deleted file mode 100644
index f4eb1de7..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Sample.java
+++ /dev/null
@@ -1,611 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * Sample
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class Sample {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("column")
-    private Integer column = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    @SerializedName("plateDbId")
-    private String plateDbId = null;
-
-    @SerializedName("plateName")
-    private String plateName = null;
-
-    @SerializedName("programDbId")
-    private String programDbId = null;
-
-    @SerializedName("row")
-    private String row = null;
-
-    @SerializedName("sampleBarcode")
-    private String sampleBarcode = null;
-
-    @SerializedName("sampleDbId")
-    private String sampleDbId = null;
-
-    @SerializedName("sampleDescription")
-    private String sampleDescription = null;
-
-    @SerializedName("sampleGroupDbId")
-    private String sampleGroupDbId = null;
-
-    @SerializedName("sampleName")
-    private String sampleName = null;
-
-    @SerializedName("samplePUI")
-    private String samplePUI = null;
-
-    @SerializedName("sampleTimestamp")
-    private OffsetDateTime sampleTimestamp = null;
-
-    @SerializedName("sampleType")
-    private String sampleType = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("takenBy")
-    private String takenBy = null;
-
-    @SerializedName("tissueType")
-    private String tissueType = null;
-
-    @SerializedName("trialDbId")
-    private String trialDbId = null;
-
-    @SerializedName("well")
-    private String well = null;
-
-    public Sample additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Sample putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Sample column(Integer column) {
-        this.column = column;
-        return this;
-    }
-
-    /**
-     * The Column identifier for this &#x60;Sample&#x60; location in the &#x60;Plate&#x60;
-     * minimum: 1
-     * maximum: 12
-     *
-     * @return column
-     **/
-    @Schema(example = "6", description = "The Column identifier for this `Sample` location in the `Plate`")
-    public Integer getColumn() {
-        return column;
-    }
-
-    public void setColumn(Integer column) {
-        this.column = column;
-    }
-
-    public Sample externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Sample addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Sample germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Germplasm&#x60;
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "7e08d538", description = "The ID which uniquely identifies a `Germplasm`")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public Sample observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an &#x60;ObservationUnit&#x60;
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "073a3ce5", description = "The ID which uniquely identifies an `ObservationUnit`")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-    public Sample plateDbId(String plateDbId) {
-        this.plateDbId = plateDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Plate&#x60; of &#x60;Sample&#x60;
-     *
-     * @return plateDbId
-     **/
-    @Schema(example = "2dce16d1", description = "The ID which uniquely identifies a `Plate` of `Sample`")
-    public String getPlateDbId() {
-        return plateDbId;
-    }
-
-    public void setPlateDbId(String plateDbId) {
-        this.plateDbId = plateDbId;
-    }
-
-    public Sample plateName(String plateName) {
-        this.plateName = plateName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a &#x60;Plate&#x60;
-     *
-     * @return plateName
-     **/
-    @Schema(example = "Plate_alpha_20191022", description = "The human readable name of a `Plate`")
-    public String getPlateName() {
-        return plateName;
-    }
-
-    public void setPlateName(String plateName) {
-        this.plateName = plateName;
-    }
-
-    public Sample programDbId(String programDbId) {
-        this.programDbId = programDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Program&#x60; within the given database server
-     *
-     * @return programDbId
-     **/
-    @Schema(example = "bd748e00", description = "The ID which uniquely identifies a `Program` within the given database server")
-    public String getProgramDbId() {
-        return programDbId;
-    }
-
-    public void setProgramDbId(String programDbId) {
-        this.programDbId = programDbId;
-    }
-
-    public Sample row(String row) {
-        this.row = row;
-        return this;
-    }
-
-    /**
-     * The Row identifier for this &#x60;Sample&#x60; location in the &#x60;Plate&#x60;
-     *
-     * @return row
-     **/
-    @Schema(example = "B", description = "The Row identifier for this `Sample` location in the `Plate`")
-    public String getRow() {
-        return row;
-    }
-
-    public void setRow(String row) {
-        this.row = row;
-    }
-
-    public Sample sampleBarcode(String sampleBarcode) {
-        this.sampleBarcode = sampleBarcode;
-        return this;
-    }
-
-    /**
-     * A unique identifier physically attached to the &#x60;Sample&#x60;
-     *
-     * @return sampleBarcode
-     **/
-    @Schema(example = "3a027b59", description = "A unique identifier physically attached to the `Sample`")
-    public String getSampleBarcode() {
-        return sampleBarcode;
-    }
-
-    public void setSampleBarcode(String sampleBarcode) {
-        this.sampleBarcode = sampleBarcode;
-    }
-
-    public Sample sampleDbId(String sampleDbId) {
-        this.sampleDbId = sampleDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Sample&#x60; &lt;br&gt; MIAPPE V1.1 (DM-76) Sample ID - Unique identifier for the sample.
-     *
-     * @return sampleDbId
-     **/
-    @Schema(example = "cd06a61d", description = "The ID which uniquely identifies a `Sample` <br> MIAPPE V1.1 (DM-76) Sample ID - Unique identifier for the sample.")
-    public String getSampleDbId() {
-        return sampleDbId;
-    }
-
-    public void setSampleDbId(String sampleDbId) {
-        this.sampleDbId = sampleDbId;
-    }
-
-    public Sample sampleDescription(String sampleDescription) {
-        this.sampleDescription = sampleDescription;
-        return this;
-    }
-
-    /**
-     * Description of a &#x60;Sample&#x60; &lt;br&gt;MIAPPE V1.1 (DM-79) Sample description - Any information not captured by the other sample fields, including quantification, sample treatments and processing.
-     *
-     * @return sampleDescription
-     **/
-    @Schema(example = "This sample was taken from the root of a tree", description = "Description of a `Sample` <br>MIAPPE V1.1 (DM-79) Sample description - Any information not captured by the other sample fields, including quantification, sample treatments and processing.")
-    public String getSampleDescription() {
-        return sampleDescription;
-    }
-
-    public void setSampleDescription(String sampleDescription) {
-        this.sampleDescription = sampleDescription;
-    }
-
-    public Sample sampleGroupDbId(String sampleGroupDbId) {
-        this.sampleGroupDbId = sampleGroupDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a group of &#x60;Samples&#x60;
-     *
-     * @return sampleGroupDbId
-     **/
-    @Schema(example = "8524b436", description = "The ID which uniquely identifies a group of `Samples`")
-    public String getSampleGroupDbId() {
-        return sampleGroupDbId;
-    }
-
-    public void setSampleGroupDbId(String sampleGroupDbId) {
-        this.sampleGroupDbId = sampleGroupDbId;
-    }
-
-    public Sample sampleName(String sampleName) {
-        this.sampleName = sampleName;
-        return this;
-    }
-
-    /**
-     * The human readable name of the &#x60;Sample&#x60;
-     *
-     * @return sampleName
-     **/
-    @Schema(example = "Sample_alpha_20191022", description = "The human readable name of the `Sample`")
-    public String getSampleName() {
-        return sampleName;
-    }
-
-    public void setSampleName(String sampleName) {
-        this.sampleName = sampleName;
-    }
-
-    public Sample samplePUI(String samplePUI) {
-        this.samplePUI = samplePUI;
-        return this;
-    }
-
-    /**
-     * A permanent unique identifier for the &#x60;Sample&#x60; (DOI, URL, UUID, etc) &lt;br&gt; MIAPPE V1.1 (DM-81) External ID - An identifier for the sample in a persistent repository, comprising the name of the repository and the accession number of the observation unit therein. Submission to the EBI Biosamples repository is recommended. URI are recommended when possible.
-     *
-     * @return samplePUI
-     **/
-    @Schema(example = "doi:10.15454/312953986E3", description = "A permanent unique identifier for the `Sample` (DOI, URL, UUID, etc) <br> MIAPPE V1.1 (DM-81) External ID - An identifier for the sample in a persistent repository, comprising the name of the repository and the accession number of the observation unit therein. Submission to the EBI Biosamples repository is recommended. URI are recommended when possible. ")
-    public String getSamplePUI() {
-        return samplePUI;
-    }
-
-    public void setSamplePUI(String samplePUI) {
-        this.samplePUI = samplePUI;
-    }
-
-    public Sample sampleTimestamp(OffsetDateTime sampleTimestamp) {
-        this.sampleTimestamp = sampleTimestamp;
-        return this;
-    }
-
-    /**
-     * The date and time a &#x60;Sample&#x60; was collected from the field &lt;br&gt; MIAPPE V1.1 (DM-80) Collection date - The date and time when the sample was collected / harvested
-     *
-     * @return sampleTimestamp
-     **/
-    @Schema(description = "The date and time a `Sample` was collected from the field <br> MIAPPE V1.1 (DM-80) Collection date - The date and time when the sample was collected / harvested")
-    public OffsetDateTime getSampleTimestamp() {
-        return sampleTimestamp;
-    }
-
-    public void setSampleTimestamp(OffsetDateTime sampleTimestamp) {
-        this.sampleTimestamp = sampleTimestamp;
-    }
-
-    public Sample sampleType(String sampleType) {
-        this.sampleType = sampleType;
-        return this;
-    }
-
-    /**
-     * The type of &#x60;Sample&#x60; taken. ex. &#x27;DNA&#x27;, &#x27;RNA&#x27;, &#x27;Tissue&#x27;, etc
-     *
-     * @return sampleType
-     **/
-    @Schema(example = "Tissue", description = "The type of `Sample` taken. ex. 'DNA', 'RNA', 'Tissue', etc")
-    public String getSampleType() {
-        return sampleType;
-    }
-
-    public void setSampleType(String sampleType) {
-        this.sampleType = sampleType;
-    }
-
-    public Sample studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Study&#x60; within the given database server
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "64bd6bf9", description = "The ID which uniquely identifies a `Study` within the given database server")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public Sample takenBy(String takenBy) {
-        this.takenBy = takenBy;
-        return this;
-    }
-
-    /**
-     * The name or identifier of the entity which took the &#x60;Sample&#x60; from the field
-     *
-     * @return takenBy
-     **/
-    @Schema(example = "Bob", description = "The name or identifier of the entity which took the `Sample` from the field")
-    public String getTakenBy() {
-        return takenBy;
-    }
-
-    public void setTakenBy(String takenBy) {
-        this.takenBy = takenBy;
-    }
-
-    public Sample tissueType(String tissueType) {
-        this.tissueType = tissueType;
-        return this;
-    }
-
-    /**
-     * The type of tissue sampled. ex. &#x27;Leaf&#x27;, &#x27;Root&#x27;, etc. &lt;br&gt; MIAPPE V1.1 (DM-78) Plant anatomical entity - A description of  the plant part (e.g. leaf) or the plant product (e.g. resin) from which the sample was taken, in the form of an accession number to a suitable controlled vocabulary (Plant Ontology).
-     *
-     * @return tissueType
-     **/
-    @Schema(example = "Root", description = "The type of tissue sampled. ex. 'Leaf', 'Root', etc. <br> MIAPPE V1.1 (DM-78) Plant anatomical entity - A description of  the plant part (e.g. leaf) or the plant product (e.g. resin) from which the sample was taken, in the form of an accession number to a suitable controlled vocabulary (Plant Ontology).")
-    public String getTissueType() {
-        return tissueType;
-    }
-
-    public void setTissueType(String tissueType) {
-        this.tissueType = tissueType;
-    }
-
-    public Sample trialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Trial&#x60; within the given database server
-     *
-     * @return trialDbId
-     **/
-    @Schema(example = "d34c5349", description = "The ID which uniquely identifies a `Trial` within the given database server")
-    public String getTrialDbId() {
-        return trialDbId;
-    }
-
-    public void setTrialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-    }
-
-    public Sample well(String well) {
-        this.well = well;
-        return this;
-    }
-
-    /**
-     * The Well identifier for this &#x60;Sample&#x60; location in the &#x60;Plate&#x60;. Usually a concatenation of Row and Column, or just a number if the &#x60;Samples&#x60; are not part of an ordered &#x60;Plate&#x60;.
-     *
-     * @return well
-     **/
-    @Schema(example = "B6", description = "The Well identifier for this `Sample` location in the `Plate`. Usually a concatenation of Row and Column, or just a number if the `Samples` are not part of an ordered `Plate`.")
-    public String getWell() {
-        return well;
-    }
-
-    public void setWell(String well) {
-        this.well = well;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Sample sample = (Sample) o;
-        return Objects.equals(this.additionalInfo, sample.additionalInfo) &&
-                Objects.equals(this.column, sample.column) &&
-                Objects.equals(this.externalReferences, sample.externalReferences) &&
-                Objects.equals(this.germplasmDbId, sample.germplasmDbId) &&
-                Objects.equals(this.observationUnitDbId, sample.observationUnitDbId) &&
-                Objects.equals(this.plateDbId, sample.plateDbId) &&
-                Objects.equals(this.plateName, sample.plateName) &&
-                Objects.equals(this.programDbId, sample.programDbId) &&
-                Objects.equals(this.row, sample.row) &&
-                Objects.equals(this.sampleBarcode, sample.sampleBarcode) &&
-                Objects.equals(this.sampleDbId, sample.sampleDbId) &&
-                Objects.equals(this.sampleDescription, sample.sampleDescription) &&
-                Objects.equals(this.sampleGroupDbId, sample.sampleGroupDbId) &&
-                Objects.equals(this.sampleName, sample.sampleName) &&
-                Objects.equals(this.samplePUI, sample.samplePUI) &&
-                Objects.equals(this.sampleTimestamp, sample.sampleTimestamp) &&
-                Objects.equals(this.sampleType, sample.sampleType) &&
-                Objects.equals(this.studyDbId, sample.studyDbId) &&
-                Objects.equals(this.takenBy, sample.takenBy) &&
-                Objects.equals(this.tissueType, sample.tissueType) &&
-                Objects.equals(this.trialDbId, sample.trialDbId) &&
-                Objects.equals(this.well, sample.well);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, column, externalReferences, germplasmDbId, observationUnitDbId, plateDbId, plateName, programDbId, row, sampleBarcode, sampleDbId, sampleDescription, sampleGroupDbId, sampleName, samplePUI, sampleTimestamp, sampleType, studyDbId, takenBy, tissueType, trialDbId, well);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Sample {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    column: ").append(toIndentedString(column)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("    plateDbId: ").append(toIndentedString(plateDbId)).append("\n");
-        sb.append("    plateName: ").append(toIndentedString(plateName)).append("\n");
-        sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-        sb.append("    row: ").append(toIndentedString(row)).append("\n");
-        sb.append("    sampleBarcode: ").append(toIndentedString(sampleBarcode)).append("\n");
-        sb.append("    sampleDbId: ").append(toIndentedString(sampleDbId)).append("\n");
-        sb.append("    sampleDescription: ").append(toIndentedString(sampleDescription)).append("\n");
-        sb.append("    sampleGroupDbId: ").append(toIndentedString(sampleGroupDbId)).append("\n");
-        sb.append("    sampleName: ").append(toIndentedString(sampleName)).append("\n");
-        sb.append("    samplePUI: ").append(toIndentedString(samplePUI)).append("\n");
-        sb.append("    sampleTimestamp: ").append(toIndentedString(sampleTimestamp)).append("\n");
-        sb.append("    sampleType: ").append(toIndentedString(sampleType)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    takenBy: ").append(toIndentedString(takenBy)).append("\n");
-        sb.append("    tissueType: ").append(toIndentedString(tissueType)).append("\n");
-        sb.append("    trialDbId: ").append(toIndentedString(trialDbId)).append("\n");
-        sb.append("    well: ").append(toIndentedString(well)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleListResponse.java
deleted file mode 100644
index 38125657..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * SampleListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class SampleListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private SampleListResponseResult result = null;
-
-    public SampleListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public SampleListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public SampleListResponse result(SampleListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public SampleListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(SampleListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SampleListResponse sampleListResponse = (SampleListResponse) o;
-        return Objects.equals(this._atContext, sampleListResponse._atContext) &&
-                Objects.equals(this.metadata, sampleListResponse.metadata) &&
-                Objects.equals(this.result, sampleListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SampleListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleListResponseResult.java
deleted file mode 100644
index 6d7a228d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SampleListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class SampleListResponseResult {
-    @SerializedName("data")
-    private List<Sample> data = new ArrayList<Sample>();
-
-    public SampleListResponseResult data(List<Sample> data) {
-        this.data = data;
-        return this;
-    }
-
-    public SampleListResponseResult addDataItem(Sample dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Sample> getData() {
-        return data;
-    }
-
-    public void setData(List<Sample> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SampleListResponseResult sampleListResponseResult = (SampleListResponseResult) o;
-        return Objects.equals(this.data, sampleListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SampleListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleNewRequest.java
deleted file mode 100644
index 6650e2bf..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleNewRequest.java
+++ /dev/null
@@ -1,587 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * SampleNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class SampleNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("column")
-    private Integer column = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    @SerializedName("plateDbId")
-    private String plateDbId = null;
-
-    @SerializedName("plateName")
-    private String plateName = null;
-
-    @SerializedName("programDbId")
-    private String programDbId = null;
-
-    @SerializedName("row")
-    private String row = null;
-
-    @SerializedName("sampleBarcode")
-    private String sampleBarcode = null;
-
-    @SerializedName("sampleDescription")
-    private String sampleDescription = null;
-
-    @SerializedName("sampleGroupDbId")
-    private String sampleGroupDbId = null;
-
-    @SerializedName("sampleName")
-    private String sampleName = null;
-
-    @SerializedName("samplePUI")
-    private String samplePUI = null;
-
-    @SerializedName("sampleTimestamp")
-    private OffsetDateTime sampleTimestamp = null;
-
-    @SerializedName("sampleType")
-    private String sampleType = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("takenBy")
-    private String takenBy = null;
-
-    @SerializedName("tissueType")
-    private String tissueType = null;
-
-    @SerializedName("trialDbId")
-    private String trialDbId = null;
-
-    @SerializedName("well")
-    private String well = null;
-
-    public SampleNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public SampleNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public SampleNewRequest column(Integer column) {
-        this.column = column;
-        return this;
-    }
-
-    /**
-     * The Column identifier for this &#x60;Sample&#x60; location in the &#x60;Plate&#x60;
-     * minimum: 1
-     * maximum: 12
-     *
-     * @return column
-     **/
-    @Schema(example = "6", description = "The Column identifier for this `Sample` location in the `Plate`")
-    public Integer getColumn() {
-        return column;
-    }
-
-    public void setColumn(Integer column) {
-        this.column = column;
-    }
-
-    public SampleNewRequest externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public SampleNewRequest addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public SampleNewRequest germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Germplasm&#x60;
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "7e08d538", description = "The ID which uniquely identifies a `Germplasm`")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public SampleNewRequest observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an &#x60;ObservationUnit&#x60;
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "073a3ce5", description = "The ID which uniquely identifies an `ObservationUnit`")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-    public SampleNewRequest plateDbId(String plateDbId) {
-        this.plateDbId = plateDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Plate&#x60; of &#x60;Sample&#x60;
-     *
-     * @return plateDbId
-     **/
-    @Schema(example = "2dce16d1", description = "The ID which uniquely identifies a `Plate` of `Sample`")
-    public String getPlateDbId() {
-        return plateDbId;
-    }
-
-    public void setPlateDbId(String plateDbId) {
-        this.plateDbId = plateDbId;
-    }
-
-    public SampleNewRequest plateName(String plateName) {
-        this.plateName = plateName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a &#x60;Plate&#x60;
-     *
-     * @return plateName
-     **/
-    @Schema(example = "Plate_alpha_20191022", description = "The human readable name of a `Plate`")
-    public String getPlateName() {
-        return plateName;
-    }
-
-    public void setPlateName(String plateName) {
-        this.plateName = plateName;
-    }
-
-    public SampleNewRequest programDbId(String programDbId) {
-        this.programDbId = programDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Program&#x60; within the given database server
-     *
-     * @return programDbId
-     **/
-    @Schema(example = "bd748e00", description = "The ID which uniquely identifies a `Program` within the given database server")
-    public String getProgramDbId() {
-        return programDbId;
-    }
-
-    public void setProgramDbId(String programDbId) {
-        this.programDbId = programDbId;
-    }
-
-    public SampleNewRequest row(String row) {
-        this.row = row;
-        return this;
-    }
-
-    /**
-     * The Row identifier for this &#x60;Sample&#x60; location in the &#x60;Plate&#x60;
-     *
-     * @return row
-     **/
-    @Schema(example = "B", description = "The Row identifier for this `Sample` location in the `Plate`")
-    public String getRow() {
-        return row;
-    }
-
-    public void setRow(String row) {
-        this.row = row;
-    }
-
-    public SampleNewRequest sampleBarcode(String sampleBarcode) {
-        this.sampleBarcode = sampleBarcode;
-        return this;
-    }
-
-    /**
-     * A unique identifier physically attached to the &#x60;Sample&#x60;
-     *
-     * @return sampleBarcode
-     **/
-    @Schema(example = "3a027b59", description = "A unique identifier physically attached to the `Sample`")
-    public String getSampleBarcode() {
-        return sampleBarcode;
-    }
-
-    public void setSampleBarcode(String sampleBarcode) {
-        this.sampleBarcode = sampleBarcode;
-    }
-
-    public SampleNewRequest sampleDescription(String sampleDescription) {
-        this.sampleDescription = sampleDescription;
-        return this;
-    }
-
-    /**
-     * Description of a &#x60;Sample&#x60; &lt;br&gt;MIAPPE V1.1 (DM-79) Sample description - Any information not captured by the other sample fields, including quantification, sample treatments and processing.
-     *
-     * @return sampleDescription
-     **/
-    @Schema(example = "This sample was taken from the root of a tree", description = "Description of a `Sample` <br>MIAPPE V1.1 (DM-79) Sample description - Any information not captured by the other sample fields, including quantification, sample treatments and processing.")
-    public String getSampleDescription() {
-        return sampleDescription;
-    }
-
-    public void setSampleDescription(String sampleDescription) {
-        this.sampleDescription = sampleDescription;
-    }
-
-    public SampleNewRequest sampleGroupDbId(String sampleGroupDbId) {
-        this.sampleGroupDbId = sampleGroupDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a group of &#x60;Samples&#x60;
-     *
-     * @return sampleGroupDbId
-     **/
-    @Schema(example = "8524b436", description = "The ID which uniquely identifies a group of `Samples`")
-    public String getSampleGroupDbId() {
-        return sampleGroupDbId;
-    }
-
-    public void setSampleGroupDbId(String sampleGroupDbId) {
-        this.sampleGroupDbId = sampleGroupDbId;
-    }
-
-    public SampleNewRequest sampleName(String sampleName) {
-        this.sampleName = sampleName;
-        return this;
-    }
-
-    /**
-     * The human readable name of the &#x60;Sample&#x60;
-     *
-     * @return sampleName
-     **/
-    @Schema(example = "Sample_alpha_20191022", description = "The human readable name of the `Sample`")
-    public String getSampleName() {
-        return sampleName;
-    }
-
-    public void setSampleName(String sampleName) {
-        this.sampleName = sampleName;
-    }
-
-    public SampleNewRequest samplePUI(String samplePUI) {
-        this.samplePUI = samplePUI;
-        return this;
-    }
-
-    /**
-     * A permanent unique identifier for the &#x60;Sample&#x60; (DOI, URL, UUID, etc) &lt;br&gt; MIAPPE V1.1 (DM-81) External ID - An identifier for the sample in a persistent repository, comprising the name of the repository and the accession number of the observation unit therein. Submission to the EBI Biosamples repository is recommended. URI are recommended when possible.
-     *
-     * @return samplePUI
-     **/
-    @Schema(example = "doi:10.15454/312953986E3", description = "A permanent unique identifier for the `Sample` (DOI, URL, UUID, etc) <br> MIAPPE V1.1 (DM-81) External ID - An identifier for the sample in a persistent repository, comprising the name of the repository and the accession number of the observation unit therein. Submission to the EBI Biosamples repository is recommended. URI are recommended when possible. ")
-    public String getSamplePUI() {
-        return samplePUI;
-    }
-
-    public void setSamplePUI(String samplePUI) {
-        this.samplePUI = samplePUI;
-    }
-
-    public SampleNewRequest sampleTimestamp(OffsetDateTime sampleTimestamp) {
-        this.sampleTimestamp = sampleTimestamp;
-        return this;
-    }
-
-    /**
-     * The date and time a &#x60;Sample&#x60; was collected from the field &lt;br&gt; MIAPPE V1.1 (DM-80) Collection date - The date and time when the sample was collected / harvested
-     *
-     * @return sampleTimestamp
-     **/
-    @Schema(description = "The date and time a `Sample` was collected from the field <br> MIAPPE V1.1 (DM-80) Collection date - The date and time when the sample was collected / harvested")
-    public OffsetDateTime getSampleTimestamp() {
-        return sampleTimestamp;
-    }
-
-    public void setSampleTimestamp(OffsetDateTime sampleTimestamp) {
-        this.sampleTimestamp = sampleTimestamp;
-    }
-
-    public SampleNewRequest sampleType(String sampleType) {
-        this.sampleType = sampleType;
-        return this;
-    }
-
-    /**
-     * The type of &#x60;Sample&#x60; taken. ex. &#x27;DNA&#x27;, &#x27;RNA&#x27;, &#x27;Tissue&#x27;, etc
-     *
-     * @return sampleType
-     **/
-    @Schema(example = "Tissue", description = "The type of `Sample` taken. ex. 'DNA', 'RNA', 'Tissue', etc")
-    public String getSampleType() {
-        return sampleType;
-    }
-
-    public void setSampleType(String sampleType) {
-        this.sampleType = sampleType;
-    }
-
-    public SampleNewRequest studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Study&#x60; within the given database server
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "64bd6bf9", description = "The ID which uniquely identifies a `Study` within the given database server")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public SampleNewRequest takenBy(String takenBy) {
-        this.takenBy = takenBy;
-        return this;
-    }
-
-    /**
-     * The name or identifier of the entity which took the &#x60;Sample&#x60; from the field
-     *
-     * @return takenBy
-     **/
-    @Schema(example = "Bob", description = "The name or identifier of the entity which took the `Sample` from the field")
-    public String getTakenBy() {
-        return takenBy;
-    }
-
-    public void setTakenBy(String takenBy) {
-        this.takenBy = takenBy;
-    }
-
-    public SampleNewRequest tissueType(String tissueType) {
-        this.tissueType = tissueType;
-        return this;
-    }
-
-    /**
-     * The type of tissue sampled. ex. &#x27;Leaf&#x27;, &#x27;Root&#x27;, etc. &lt;br&gt; MIAPPE V1.1 (DM-78) Plant anatomical entity - A description of  the plant part (e.g. leaf) or the plant product (e.g. resin) from which the sample was taken, in the form of an accession number to a suitable controlled vocabulary (Plant Ontology).
-     *
-     * @return tissueType
-     **/
-    @Schema(example = "Root", description = "The type of tissue sampled. ex. 'Leaf', 'Root', etc. <br> MIAPPE V1.1 (DM-78) Plant anatomical entity - A description of  the plant part (e.g. leaf) or the plant product (e.g. resin) from which the sample was taken, in the form of an accession number to a suitable controlled vocabulary (Plant Ontology).")
-    public String getTissueType() {
-        return tissueType;
-    }
-
-    public void setTissueType(String tissueType) {
-        this.tissueType = tissueType;
-    }
-
-    public SampleNewRequest trialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Trial&#x60; within the given database server
-     *
-     * @return trialDbId
-     **/
-    @Schema(example = "d34c5349", description = "The ID which uniquely identifies a `Trial` within the given database server")
-    public String getTrialDbId() {
-        return trialDbId;
-    }
-
-    public void setTrialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-    }
-
-    public SampleNewRequest well(String well) {
-        this.well = well;
-        return this;
-    }
-
-    /**
-     * The Well identifier for this &#x60;Sample&#x60; location in the &#x60;Plate&#x60;. Usually a concatenation of Row and Column, or just a number if the &#x60;Samples&#x60; are not part of an ordered &#x60;Plate&#x60;.
-     *
-     * @return well
-     **/
-    @Schema(example = "B6", description = "The Well identifier for this `Sample` location in the `Plate`. Usually a concatenation of Row and Column, or just a number if the `Samples` are not part of an ordered `Plate`.")
-    public String getWell() {
-        return well;
-    }
-
-    public void setWell(String well) {
-        this.well = well;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SampleNewRequest sampleNewRequest = (SampleNewRequest) o;
-        return Objects.equals(this.additionalInfo, sampleNewRequest.additionalInfo) &&
-                Objects.equals(this.column, sampleNewRequest.column) &&
-                Objects.equals(this.externalReferences, sampleNewRequest.externalReferences) &&
-                Objects.equals(this.germplasmDbId, sampleNewRequest.germplasmDbId) &&
-                Objects.equals(this.observationUnitDbId, sampleNewRequest.observationUnitDbId) &&
-                Objects.equals(this.plateDbId, sampleNewRequest.plateDbId) &&
-                Objects.equals(this.plateName, sampleNewRequest.plateName) &&
-                Objects.equals(this.programDbId, sampleNewRequest.programDbId) &&
-                Objects.equals(this.row, sampleNewRequest.row) &&
-                Objects.equals(this.sampleBarcode, sampleNewRequest.sampleBarcode) &&
-                Objects.equals(this.sampleDescription, sampleNewRequest.sampleDescription) &&
-                Objects.equals(this.sampleGroupDbId, sampleNewRequest.sampleGroupDbId) &&
-                Objects.equals(this.sampleName, sampleNewRequest.sampleName) &&
-                Objects.equals(this.samplePUI, sampleNewRequest.samplePUI) &&
-                Objects.equals(this.sampleTimestamp, sampleNewRequest.sampleTimestamp) &&
-                Objects.equals(this.sampleType, sampleNewRequest.sampleType) &&
-                Objects.equals(this.studyDbId, sampleNewRequest.studyDbId) &&
-                Objects.equals(this.takenBy, sampleNewRequest.takenBy) &&
-                Objects.equals(this.tissueType, sampleNewRequest.tissueType) &&
-                Objects.equals(this.trialDbId, sampleNewRequest.trialDbId) &&
-                Objects.equals(this.well, sampleNewRequest.well);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, column, externalReferences, germplasmDbId, observationUnitDbId, plateDbId, plateName, programDbId, row, sampleBarcode, sampleDescription, sampleGroupDbId, sampleName, samplePUI, sampleTimestamp, sampleType, studyDbId, takenBy, tissueType, trialDbId, well);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SampleNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    column: ").append(toIndentedString(column)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("    plateDbId: ").append(toIndentedString(plateDbId)).append("\n");
-        sb.append("    plateName: ").append(toIndentedString(plateName)).append("\n");
-        sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-        sb.append("    row: ").append(toIndentedString(row)).append("\n");
-        sb.append("    sampleBarcode: ").append(toIndentedString(sampleBarcode)).append("\n");
-        sb.append("    sampleDescription: ").append(toIndentedString(sampleDescription)).append("\n");
-        sb.append("    sampleGroupDbId: ").append(toIndentedString(sampleGroupDbId)).append("\n");
-        sb.append("    sampleName: ").append(toIndentedString(sampleName)).append("\n");
-        sb.append("    samplePUI: ").append(toIndentedString(samplePUI)).append("\n");
-        sb.append("    sampleTimestamp: ").append(toIndentedString(sampleTimestamp)).append("\n");
-        sb.append("    sampleType: ").append(toIndentedString(sampleType)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    takenBy: ").append(toIndentedString(takenBy)).append("\n");
-        sb.append("    tissueType: ").append(toIndentedString(tissueType)).append("\n");
-        sb.append("    trialDbId: ").append(toIndentedString(trialDbId)).append("\n");
-        sb.append("    well: ").append(toIndentedString(well)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleSearchRequest.java
deleted file mode 100644
index 0302b7a4..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleSearchRequest.java
+++ /dev/null
@@ -1,690 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SampleSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class SampleSearchRequest {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("observationUnitDbIds")
-    private List<String> observationUnitDbIds = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("plateDbIds")
-    private List<String> plateDbIds = null;
-
-    @SerializedName("plateNames")
-    private List<String> plateNames = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("sampleDbIds")
-    private List<String> sampleDbIds = null;
-
-    @SerializedName("sampleGroupDbIds")
-    private List<String> sampleGroupDbIds = null;
-
-    @SerializedName("sampleNames")
-    private List<String> sampleNames = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public SampleSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public SampleSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public SampleSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public SampleSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public SampleSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public SampleSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public SampleSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public SampleSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public SampleSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public SampleSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Germplasm&#x60;
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"d745e1e2\",\"6dd28d74\"]", description = "The ID which uniquely identifies a `Germplasm`")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public SampleSearchRequest germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public SampleSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public SampleSearchRequest observationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-        return this;
-    }
-
-    public SampleSearchRequest addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-        if (this.observationUnitDbIds == null) {
-            this.observationUnitDbIds = new ArrayList<String>();
-        }
-        this.observationUnitDbIds.add(observationUnitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an &#x60;ObservationUnit&#x60;
-     *
-     * @return observationUnitDbIds
-     **/
-    @Schema(example = "[\"3cd0ca36\",\"983f3b14\"]", description = "The ID which uniquely identifies an `ObservationUnit`")
-    public List<String> getObservationUnitDbIds() {
-        return observationUnitDbIds;
-    }
-
-    public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-    }
-
-    public SampleSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SampleSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public SampleSearchRequest plateDbIds(List<String> plateDbIds) {
-        this.plateDbIds = plateDbIds;
-        return this;
-    }
-
-    public SampleSearchRequest addPlateDbIdsItem(String plateDbIdsItem) {
-        if (this.plateDbIds == null) {
-            this.plateDbIds = new ArrayList<String>();
-        }
-        this.plateDbIds.add(plateDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Plate&#x60; of &#x60;Samples&#x60;
-     *
-     * @return plateDbIds
-     **/
-    @Schema(example = "[\"0cac98b8\",\"b96125fb\"]", description = "The ID which uniquely identifies a `Plate` of `Samples`")
-    public List<String> getPlateDbIds() {
-        return plateDbIds;
-    }
-
-    public void setPlateDbIds(List<String> plateDbIds) {
-        this.plateDbIds = plateDbIds;
-    }
-
-    public SampleSearchRequest plateNames(List<String> plateNames) {
-        this.plateNames = plateNames;
-        return this;
-    }
-
-    public SampleSearchRequest addPlateNamesItem(String plateNamesItem) {
-        if (this.plateNames == null) {
-            this.plateNames = new ArrayList<String>();
-        }
-        this.plateNames.add(plateNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a &#x60;Plate&#x60; of &#x60;Samples&#x60;
-     *
-     * @return plateNames
-     **/
-    @Schema(example = "[\"0cac98b8\",\"b96125fb\"]", description = "The human readable name of a `Plate` of `Samples`")
-    public List<String> getPlateNames() {
-        return plateNames;
-    }
-
-    public void setPlateNames(List<String> plateNames) {
-        this.plateNames = plateNames;
-    }
-
-    public SampleSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public SampleSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public SampleSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public SampleSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public SampleSearchRequest sampleDbIds(List<String> sampleDbIds) {
-        this.sampleDbIds = sampleDbIds;
-        return this;
-    }
-
-    public SampleSearchRequest addSampleDbIdsItem(String sampleDbIdsItem) {
-        if (this.sampleDbIds == null) {
-            this.sampleDbIds = new ArrayList<String>();
-        }
-        this.sampleDbIds.add(sampleDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Sample&#x60;
-     *
-     * @return sampleDbIds
-     **/
-    @Schema(example = "[\"3bece2ca\",\"dd286cc6\"]", description = "The ID which uniquely identifies a `Sample`")
-    public List<String> getSampleDbIds() {
-        return sampleDbIds;
-    }
-
-    public void setSampleDbIds(List<String> sampleDbIds) {
-        this.sampleDbIds = sampleDbIds;
-    }
-
-    public SampleSearchRequest sampleGroupDbIds(List<String> sampleGroupDbIds) {
-        this.sampleGroupDbIds = sampleGroupDbIds;
-        return this;
-    }
-
-    public SampleSearchRequest addSampleGroupDbIdsItem(String sampleGroupDbIdsItem) {
-        if (this.sampleGroupDbIds == null) {
-            this.sampleGroupDbIds = new ArrayList<String>();
-        }
-        this.sampleGroupDbIds.add(sampleGroupDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a group of related &#x60;Samples&#x60;
-     *
-     * @return sampleGroupDbIds
-     **/
-    @Schema(example = "[\"45e1e2d7\",\"6cc6dd28\"]", description = "The unique identifier for a group of related `Samples`")
-    public List<String> getSampleGroupDbIds() {
-        return sampleGroupDbIds;
-    }
-
-    public void setSampleGroupDbIds(List<String> sampleGroupDbIds) {
-        this.sampleGroupDbIds = sampleGroupDbIds;
-    }
-
-    public SampleSearchRequest sampleNames(List<String> sampleNames) {
-        this.sampleNames = sampleNames;
-        return this;
-    }
-
-    public SampleSearchRequest addSampleNamesItem(String sampleNamesItem) {
-        if (this.sampleNames == null) {
-            this.sampleNames = new ArrayList<String>();
-        }
-        this.sampleNames.add(sampleNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of the &#x60;Sample&#x60;
-     *
-     * @return sampleNames
-     **/
-    @Schema(example = "[\"SA_111\",\"SA_222\"]", description = "The human readable name of the `Sample`")
-    public List<String> getSampleNames() {
-        return sampleNames;
-    }
-
-    public void setSampleNames(List<String> sampleNames) {
-        this.sampleNames = sampleNames;
-    }
-
-    public SampleSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public SampleSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public SampleSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public SampleSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public SampleSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public SampleSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public SampleSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public SampleSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SampleSearchRequest sampleSearchRequest = (SampleSearchRequest) o;
-        return Objects.equals(this.commonCropNames, sampleSearchRequest.commonCropNames) &&
-                Objects.equals(this.externalReferenceIDs, sampleSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, sampleSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, sampleSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.germplasmDbIds, sampleSearchRequest.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, sampleSearchRequest.germplasmNames) &&
-                Objects.equals(this.observationUnitDbIds, sampleSearchRequest.observationUnitDbIds) &&
-                Objects.equals(this.page, sampleSearchRequest.page) &&
-                Objects.equals(this.pageSize, sampleSearchRequest.pageSize) &&
-                Objects.equals(this.plateDbIds, sampleSearchRequest.plateDbIds) &&
-                Objects.equals(this.plateNames, sampleSearchRequest.plateNames) &&
-                Objects.equals(this.programDbIds, sampleSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, sampleSearchRequest.programNames) &&
-                Objects.equals(this.sampleDbIds, sampleSearchRequest.sampleDbIds) &&
-                Objects.equals(this.sampleGroupDbIds, sampleSearchRequest.sampleGroupDbIds) &&
-                Objects.equals(this.sampleNames, sampleSearchRequest.sampleNames) &&
-                Objects.equals(this.studyDbIds, sampleSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, sampleSearchRequest.studyNames) &&
-                Objects.equals(this.trialDbIds, sampleSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, sampleSearchRequest.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds, germplasmNames, observationUnitDbIds, page, pageSize, plateDbIds, plateNames, programDbIds, programNames, sampleDbIds, sampleGroupDbIds, sampleNames, studyDbIds, studyNames, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SampleSearchRequest {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    plateDbIds: ").append(toIndentedString(plateDbIds)).append("\n");
-        sb.append("    plateNames: ").append(toIndentedString(plateNames)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    sampleDbIds: ").append(toIndentedString(sampleDbIds)).append("\n");
-        sb.append("    sampleGroupDbIds: ").append(toIndentedString(sampleGroupDbIds)).append("\n");
-        sb.append("    sampleNames: ").append(toIndentedString(sampleNames)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleSingleResponse.java
deleted file mode 100644
index 990230b1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SampleSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * SampleSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class SampleSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Sample result = null;
-
-    public SampleSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public SampleSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public SampleSingleResponse result(Sample result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Sample getResult() {
-        return result;
-    }
-
-    public void setResult(Sample result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SampleSingleResponse sampleSingleResponse = (SampleSingleResponse) o;
-        return Objects.equals(this._atContext, sampleSingleResponse._atContext) &&
-                Objects.equals(this.metadata, sampleSingleResponse.metadata) &&
-                Objects.equals(this.result, sampleSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SampleSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ScaleBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ScaleBaseClass.java
deleted file mode 100644
index 32463444..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ScaleBaseClass.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * A Scale describes the units and acceptable values for an ObservationVariable.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Scale \&quot;inches\&quot; or \&quot;pixels\&quot;.
- */
-@Schema(description = "A Scale describes the units and acceptable values for an ObservationVariable.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Scale \"inches\" or \"pixels\".")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ScaleBaseClass {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypeEnum.Adapter.class)
-    public enum DataTypeEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypeEnum fromValue(String input) {
-            for (DataTypeEnum b : DataTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataType")
-    private DataTypeEnum dataType = null;
-
-    @SerializedName("decimalPlaces")
-    private Integer decimalPlaces = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("ontologyReference")
-    private MethodBaseClassOntologyReference ontologyReference = null;
-
-    @SerializedName("scaleName")
-    private String scaleName = null;
-
-    @SerializedName("scalePUI")
-    private String scalePUI = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    @SerializedName("validValues")
-    private ScaleBaseClassValidValues validValues = null;
-
-    public ScaleBaseClass additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ScaleBaseClass putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ScaleBaseClass dataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-        return this;
-    }
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     *
-     * @return dataType
-     **/
-    @Schema(example = "Numerical", description = "<p>Class of the scale, entries can be</p> <p>\"Code\" -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \"75VD\" means \"75 %\" of the plant is infected and the plant is very delayed.</p> <p>\"Date\" - The date class is for events expressed in a time format, See ISO 8601</p> <p>\"Duration\" - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months</p> <p>\"Nominal\" - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories</p> <p>\"Numerical\" - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches</p> <p>\"Ordinal\" - Ordinal scales are scales composed of ordered categories</p> <p>\"Text\" - A free text is used to express the trait.</p>")
-    public DataTypeEnum getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-    }
-
-    public ScaleBaseClass decimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-        return this;
-    }
-
-    /**
-     * For numerical, number of decimal places to be reported
-     *
-     * @return decimalPlaces
-     **/
-    @Schema(example = "2", description = "For numerical, number of decimal places to be reported")
-    public Integer getDecimalPlaces() {
-        return decimalPlaces;
-    }
-
-    public void setDecimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-    }
-
-    public ScaleBaseClass externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ScaleBaseClass addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ScaleBaseClass ontologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodBaseClassOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public ScaleBaseClass scaleName(String scaleName) {
-        this.scaleName = scaleName;
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleName
-     **/
-    @Schema(example = "Meters", required = true, description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public String getScaleName() {
-        return scaleName;
-    }
-
-    public void setScaleName(String scaleName) {
-        this.scaleName = scaleName;
-    }
-
-    public ScaleBaseClass scalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000112", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public String getScalePUI() {
-        return scalePUI;
-    }
-
-    public void setScalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-    }
-
-    public ScaleBaseClass units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when &#x60;dataType&#x60; is Numeric, but could also be included for other dataTypes when applicable.
-     *
-     * @return units
-     **/
-    @Schema(example = "m", description = "This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when `dataType` is Numeric, but could also be included for other dataTypes when applicable.")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    public ScaleBaseClass validValues(ScaleBaseClassValidValues validValues) {
-        this.validValues = validValues;
-        return this;
-    }
-
-    /**
-     * Get validValues
-     *
-     * @return validValues
-     **/
-    @Schema(description = "")
-    public ScaleBaseClassValidValues getValidValues() {
-        return validValues;
-    }
-
-    public void setValidValues(ScaleBaseClassValidValues validValues) {
-        this.validValues = validValues;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ScaleBaseClass scaleBaseClass = (ScaleBaseClass) o;
-        return Objects.equals(this.additionalInfo, scaleBaseClass.additionalInfo) &&
-                Objects.equals(this.dataType, scaleBaseClass.dataType) &&
-                Objects.equals(this.decimalPlaces, scaleBaseClass.decimalPlaces) &&
-                Objects.equals(this.externalReferences, scaleBaseClass.externalReferences) &&
-                Objects.equals(this.ontologyReference, scaleBaseClass.ontologyReference) &&
-                Objects.equals(this.scaleName, scaleBaseClass.scaleName) &&
-                Objects.equals(this.scalePUI, scaleBaseClass.scalePUI) &&
-                Objects.equals(this.units, scaleBaseClass.units) &&
-                Objects.equals(this.validValues, scaleBaseClass.validValues);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, dataType, decimalPlaces, externalReferences, ontologyReference, scaleName, scalePUI, units, validValues);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScaleBaseClass {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
-        sb.append("    decimalPlaces: ").append(toIndentedString(decimalPlaces)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scaleName: ").append(toIndentedString(scaleName)).append("\n");
-        sb.append("    scalePUI: ").append(toIndentedString(scalePUI)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("    validValues: ").append(toIndentedString(validValues)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ScaleBaseClassValidValues.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ScaleBaseClassValidValues.java
deleted file mode 100644
index dca9cebf..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ScaleBaseClassValidValues.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ScaleBaseClassValidValues
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ScaleBaseClassValidValues {
-    @SerializedName("categories")
-    private List<ScaleBaseClassValidValuesCategories> categories = null;
-
-    @SerializedName("max")
-    private Integer max = null;
-
-    @SerializedName("maximumValue")
-    private String maximumValue = null;
-
-    @SerializedName("min")
-    private Integer min = null;
-
-    @SerializedName("minimumValue")
-    private String minimumValue = null;
-
-    public ScaleBaseClassValidValues categories(List<ScaleBaseClassValidValuesCategories> categories) {
-        this.categories = categories;
-        return this;
-    }
-
-    public ScaleBaseClassValidValues addCategoriesItem(ScaleBaseClassValidValuesCategories categoriesItem) {
-        if (this.categories == null) {
-            this.categories = new ArrayList<ScaleBaseClassValidValuesCategories>();
-        }
-        this.categories.add(categoriesItem);
-        return this;
-    }
-
-    /**
-     * List of possible values with optional labels
-     *
-     * @return categories
-     **/
-    @Schema(example = "[{\"label\":\"low\",\"value\":\"0\"},{\"label\":\"medium\",\"value\":\"5\"},{\"label\":\"high\",\"value\":\"10\"}]", description = "List of possible values with optional labels")
-    public List<ScaleBaseClassValidValuesCategories> getCategories() {
-        return categories;
-    }
-
-    public void setCategories(List<ScaleBaseClassValidValuesCategories> categories) {
-        this.categories = categories;
-    }
-
-    public ScaleBaseClassValidValues max(Integer max) {
-        this.max = max;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;maximumValue&#x60;. Github issue number #450  &lt;br&gt;Maximum value for numerical scales. Typically used for data capture control and QC.
-     *
-     * @return max
-     **/
-    @Schema(example = "9999", description = "**Deprecated in v2.1** Please use `maximumValue`. Github issue number #450  <br>Maximum value for numerical scales. Typically used for data capture control and QC.")
-    public Integer getMax() {
-        return max;
-    }
-
-    public void setMax(Integer max) {
-        this.max = max;
-    }
-
-    public ScaleBaseClassValidValues maximumValue(String maximumValue) {
-        this.maximumValue = maximumValue;
-        return this;
-    }
-
-    /**
-     * Maximum value for numerical, date, and time scales. Typically used for data capture control and QC.
-     *
-     * @return maximumValue
-     **/
-    @Schema(example = "9999", description = "Maximum value for numerical, date, and time scales. Typically used for data capture control and QC.")
-    public String getMaximumValue() {
-        return maximumValue;
-    }
-
-    public void setMaximumValue(String maximumValue) {
-        this.maximumValue = maximumValue;
-    }
-
-    public ScaleBaseClassValidValues min(Integer min) {
-        this.min = min;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;minimumValue&#x60;. Github issue number #450  &lt;br&gt;Minimum value for numerical scales. Typically used for data capture control and QC.
-     *
-     * @return min
-     **/
-    @Schema(example = "2", description = "**Deprecated in v2.1** Please use `minimumValue`. Github issue number #450  <br>Minimum value for numerical scales. Typically used for data capture control and QC.")
-    public Integer getMin() {
-        return min;
-    }
-
-    public void setMin(Integer min) {
-        this.min = min;
-    }
-
-    public ScaleBaseClassValidValues minimumValue(String minimumValue) {
-        this.minimumValue = minimumValue;
-        return this;
-    }
-
-    /**
-     * Minimum value for numerical, date, and time scales. Typically used for data capture control and QC.
-     *
-     * @return minimumValue
-     **/
-    @Schema(example = "2", description = "Minimum value for numerical, date, and time scales. Typically used for data capture control and QC.")
-    public String getMinimumValue() {
-        return minimumValue;
-    }
-
-    public void setMinimumValue(String minimumValue) {
-        this.minimumValue = minimumValue;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ScaleBaseClassValidValues scaleBaseClassValidValues = (ScaleBaseClassValidValues) o;
-        return Objects.equals(this.categories, scaleBaseClassValidValues.categories) &&
-                Objects.equals(this.max, scaleBaseClassValidValues.max) &&
-                Objects.equals(this.maximumValue, scaleBaseClassValidValues.maximumValue) &&
-                Objects.equals(this.min, scaleBaseClassValidValues.min) &&
-                Objects.equals(this.minimumValue, scaleBaseClassValidValues.minimumValue);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(categories, max, maximumValue, min, minimumValue);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScaleBaseClassValidValues {\n");
-
-        sb.append("    categories: ").append(toIndentedString(categories)).append("\n");
-        sb.append("    max: ").append(toIndentedString(max)).append("\n");
-        sb.append("    maximumValue: ").append(toIndentedString(maximumValue)).append("\n");
-        sb.append("    min: ").append(toIndentedString(min)).append("\n");
-        sb.append("    minimumValue: ").append(toIndentedString(minimumValue)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ScaleBaseClassValidValuesCategories.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ScaleBaseClassValidValuesCategories.java
deleted file mode 100644
index 058150d0..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ScaleBaseClassValidValuesCategories.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ScaleBaseClassValidValuesCategories
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ScaleBaseClassValidValuesCategories {
-    @SerializedName("label")
-    private String label = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    public ScaleBaseClassValidValuesCategories label(String label) {
-        this.label = label;
-        return this;
-    }
-
-    /**
-     * A text label for a category
-     *
-     * @return label
-     **/
-    @Schema(description = "A text label for a category")
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    public ScaleBaseClassValidValuesCategories value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * The actual value for a category
-     *
-     * @return value
-     **/
-    @Schema(description = "The actual value for a category")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ScaleBaseClassValidValuesCategories scaleBaseClassValidValuesCategories = (ScaleBaseClassValidValuesCategories) o;
-        return Objects.equals(this.label, scaleBaseClassValidValuesCategories.label) &&
-                Objects.equals(this.value, scaleBaseClassValidValuesCategories.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(label, value);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScaleBaseClassValidValuesCategories {\n");
-
-        sb.append("    label: ").append(toIndentedString(label)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersCommonCropNames.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersCommonCropNames.java
deleted file mode 100644
index 06a0fd5e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersCommonCropNames.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersCommonCropNames
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class SearchRequestParametersCommonCropNames {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    public SearchRequestParametersCommonCropNames commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public SearchRequestParametersCommonCropNames addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersCommonCropNames searchRequestParametersCommonCropNames = (SearchRequestParametersCommonCropNames) o;
-        return Objects.equals(this.commonCropNames, searchRequestParametersCommonCropNames.commonCropNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersCommonCropNames {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersExternalReferences.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersExternalReferences.java
deleted file mode 100644
index fc83f75e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersExternalReferences.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersExternalReferences
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class SearchRequestParametersExternalReferences {
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    public SearchRequestParametersExternalReferences externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public SearchRequestParametersExternalReferences addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public SearchRequestParametersExternalReferences externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public SearchRequestParametersExternalReferences addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public SearchRequestParametersExternalReferences externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public SearchRequestParametersExternalReferences addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersExternalReferences searchRequestParametersExternalReferences = (SearchRequestParametersExternalReferences) o;
-        return Objects.equals(this.externalReferenceIDs, searchRequestParametersExternalReferences.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, searchRequestParametersExternalReferences.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, searchRequestParametersExternalReferences.externalReferenceSources);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(externalReferenceIDs, externalReferenceIds, externalReferenceSources);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersExternalReferences {\n");
-
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersGermplasm.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersGermplasm.java
deleted file mode 100644
index 3bf7d083..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersGermplasm.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersGermplasm
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class SearchRequestParametersGermplasm {
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    public SearchRequestParametersGermplasm germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersGermplasm addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public SearchRequestParametersGermplasm germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public SearchRequestParametersGermplasm addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersGermplasm searchRequestParametersGermplasm = (SearchRequestParametersGermplasm) o;
-        return Objects.equals(this.germplasmDbIds, searchRequestParametersGermplasm.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, searchRequestParametersGermplasm.germplasmNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(germplasmDbIds, germplasmNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersGermplasm {\n");
-
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersLocations.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersLocations.java
deleted file mode 100644
index 6ed1a73f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersLocations.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersLocations
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class SearchRequestParametersLocations {
-    @SerializedName("locationDbIds")
-    private List<String> locationDbIds = null;
-
-    @SerializedName("locationNames")
-    private List<String> locationNames = null;
-
-    public SearchRequestParametersLocations locationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersLocations addLocationDbIdsItem(String locationDbIdsItem) {
-        if (this.locationDbIds == null) {
-            this.locationDbIds = new ArrayList<String>();
-        }
-        this.locationDbIds.add(locationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The location ids to search for
-     *
-     * @return locationDbIds
-     **/
-    @Schema(example = "[\"b28911cf\",\"5071d1e4\"]", description = "The location ids to search for")
-    public List<String> getLocationDbIds() {
-        return locationDbIds;
-    }
-
-    public void setLocationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-    }
-
-    public SearchRequestParametersLocations locationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-        return this;
-    }
-
-    public SearchRequestParametersLocations addLocationNamesItem(String locationNamesItem) {
-        if (this.locationNames == null) {
-            this.locationNames = new ArrayList<String>();
-        }
-        this.locationNames.add(locationNamesItem);
-        return this;
-    }
-
-    /**
-     * A human readable names to search for
-     *
-     * @return locationNames
-     **/
-    @Schema(example = "[\"Location Alpha\",\"The Large Hadron Collider\"]", description = "A human readable names to search for")
-    public List<String> getLocationNames() {
-        return locationNames;
-    }
-
-    public void setLocationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersLocations searchRequestParametersLocations = (SearchRequestParametersLocations) o;
-        return Objects.equals(this.locationDbIds, searchRequestParametersLocations.locationDbIds) &&
-                Objects.equals(this.locationNames, searchRequestParametersLocations.locationNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(locationDbIds, locationNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersLocations {\n");
-
-        sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-        sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersObservationVariables.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersObservationVariables.java
deleted file mode 100644
index 2757069d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersObservationVariables.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersObservationVariables
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class SearchRequestParametersObservationVariables {
-    @SerializedName("observationVariableDbIds")
-    private List<String> observationVariableDbIds = null;
-
-    @SerializedName("observationVariableNames")
-    private List<String> observationVariableNames = null;
-
-    @SerializedName("observationVariablePUIs")
-    private List<String> observationVariablePUIs = null;
-
-    public SearchRequestParametersObservationVariables observationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersObservationVariables addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-        if (this.observationVariableDbIds == null) {
-            this.observationVariableDbIds = new ArrayList<String>();
-        }
-        this.observationVariableDbIds.add(observationVariableDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The DbIds of Variables to search for
-     *
-     * @return observationVariableDbIds
-     **/
-    @Schema(example = "[\"a646187d\",\"6d23513b\"]", description = "The DbIds of Variables to search for")
-    public List<String> getObservationVariableDbIds() {
-        return observationVariableDbIds;
-    }
-
-    public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-    }
-
-    public SearchRequestParametersObservationVariables observationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-        return this;
-    }
-
-    public SearchRequestParametersObservationVariables addObservationVariableNamesItem(String observationVariableNamesItem) {
-        if (this.observationVariableNames == null) {
-            this.observationVariableNames = new ArrayList<String>();
-        }
-        this.observationVariableNames.add(observationVariableNamesItem);
-        return this;
-    }
-
-    /**
-     * The names of Variables to search for
-     *
-     * @return observationVariableNames
-     **/
-    @Schema(example = "[\"Plant Height in meters\",\"Wheat rust score 1-5\"]", description = "The names of Variables to search for")
-    public List<String> getObservationVariableNames() {
-        return observationVariableNames;
-    }
-
-    public void setObservationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-    }
-
-    public SearchRequestParametersObservationVariables observationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-        return this;
-    }
-
-    public SearchRequestParametersObservationVariables addObservationVariablePUIsItem(String observationVariablePUIsItem) {
-        if (this.observationVariablePUIs == null) {
-            this.observationVariablePUIs = new ArrayList<String>();
-        }
-        this.observationVariablePUIs.add(observationVariablePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI
-     *
-     * @return observationVariablePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008012\",\"http://my-traits.com/trait/CO_123:0007261\"]", description = "The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI")
-    public List<String> getObservationVariablePUIs() {
-        return observationVariablePUIs;
-    }
-
-    public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersObservationVariables searchRequestParametersObservationVariables = (SearchRequestParametersObservationVariables) o;
-        return Objects.equals(this.observationVariableDbIds, searchRequestParametersObservationVariables.observationVariableDbIds) &&
-                Objects.equals(this.observationVariableNames, searchRequestParametersObservationVariables.observationVariableNames) &&
-                Objects.equals(this.observationVariablePUIs, searchRequestParametersObservationVariables.observationVariablePUIs);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(observationVariableDbIds, observationVariableNames, observationVariablePUIs);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersObservationVariables {\n");
-
-        sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-        sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
-        sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersPaging.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersPaging.java
deleted file mode 100644
index dff445af..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersPaging.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * SearchRequestParametersPaging
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class SearchRequestParametersPaging {
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    public SearchRequestParametersPaging page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SearchRequestParametersPaging pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersPaging searchRequestParametersPaging = (SearchRequestParametersPaging) o;
-        return Objects.equals(this.page, searchRequestParametersPaging.page) &&
-                Objects.equals(this.pageSize, searchRequestParametersPaging.pageSize);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(page, pageSize);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersPaging {\n");
-
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersPrograms.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersPrograms.java
deleted file mode 100644
index c4254ee2..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersPrograms.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersPrograms
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class SearchRequestParametersPrograms {
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    public SearchRequestParametersPrograms programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersPrograms addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public SearchRequestParametersPrograms programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public SearchRequestParametersPrograms addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersPrograms searchRequestParametersPrograms = (SearchRequestParametersPrograms) o;
-        return Objects.equals(this.programDbIds, searchRequestParametersPrograms.programDbIds) &&
-                Objects.equals(this.programNames, searchRequestParametersPrograms.programNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(programDbIds, programNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersPrograms {\n");
-
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersStudies.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersStudies.java
deleted file mode 100644
index 533cafd8..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersStudies.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersStudies
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class SearchRequestParametersStudies {
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    public SearchRequestParametersStudies studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersStudies addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public SearchRequestParametersStudies studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public SearchRequestParametersStudies addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersStudies searchRequestParametersStudies = (SearchRequestParametersStudies) o;
-        return Objects.equals(this.studyDbIds, searchRequestParametersStudies.studyDbIds) &&
-                Objects.equals(this.studyNames, searchRequestParametersStudies.studyNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(studyDbIds, studyNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersStudies {\n");
-
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersTokenPaging.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersTokenPaging.java
deleted file mode 100644
index c045fc5c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersTokenPaging.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * SearchRequestParametersTokenPaging
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class SearchRequestParametersTokenPaging {
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("pageToken")
-    private String pageToken = null;
-
-    public SearchRequestParametersTokenPaging page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SearchRequestParametersTokenPaging pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public SearchRequestParametersTokenPaging pageToken(String pageToken) {
-        this.pageToken = pageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;Used to request a specific page of data to be returned. &lt;br&gt;Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.
-     *
-     * @return pageToken
-     **/
-    @Schema(example = "33c27874", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>Used to request a specific page of data to be returned. <br>Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively. ")
-    public String getPageToken() {
-        return pageToken;
-    }
-
-    public void setPageToken(String pageToken) {
-        this.pageToken = pageToken;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersTokenPaging searchRequestParametersTokenPaging = (SearchRequestParametersTokenPaging) o;
-        return Objects.equals(this.page, searchRequestParametersTokenPaging.page) &&
-                Objects.equals(this.pageSize, searchRequestParametersTokenPaging.pageSize) &&
-                Objects.equals(this.pageToken, searchRequestParametersTokenPaging.pageToken);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(page, pageSize, pageToken);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersTokenPaging {\n");
-
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    pageToken: ").append(toIndentedString(pageToken)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersTrials.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersTrials.java
deleted file mode 100644
index aeb9b964..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersTrials.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersTrials
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class SearchRequestParametersTrials {
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public SearchRequestParametersTrials trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersTrials addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public SearchRequestParametersTrials trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public SearchRequestParametersTrials addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersTrials searchRequestParametersTrials = (SearchRequestParametersTrials) o;
-        return Objects.equals(this.trialDbIds, searchRequestParametersTrials.trialDbIds) &&
-                Objects.equals(this.trialNames, searchRequestParametersTrials.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersTrials {\n");
-
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersVariableBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersVariableBaseClass.java
deleted file mode 100644
index 7c455f2b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/SearchRequestParametersVariableBaseClass.java
+++ /dev/null
@@ -1,1034 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersVariableBaseClass
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class SearchRequestParametersVariableBaseClass {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypesEnum.Adapter.class)
-    public enum DataTypesEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypesEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypesEnum fromValue(String input) {
-            for (DataTypesEnum b : DataTypesEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypesEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypesEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypesEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypesEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataTypes")
-    private List<DataTypesEnum> dataTypes = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("methodDbIds")
-    private List<String> methodDbIds = null;
-
-    @SerializedName("methodNames")
-    private List<String> methodNames = null;
-
-    @SerializedName("methodPUIs")
-    private List<String> methodPUIs = null;
-
-    @SerializedName("ontologyDbIds")
-    private List<String> ontologyDbIds = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("scaleDbIds")
-    private List<String> scaleDbIds = null;
-
-    @SerializedName("scaleNames")
-    private List<String> scaleNames = null;
-
-    @SerializedName("scalePUIs")
-    private List<String> scalePUIs = null;
-
-    @SerializedName("studyDbId")
-    private List<String> studyDbId = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("traitAttributePUIs")
-    private List<String> traitAttributePUIs = null;
-
-    @SerializedName("traitAttributes")
-    private List<String> traitAttributes = null;
-
-    @SerializedName("traitClasses")
-    private List<String> traitClasses = null;
-
-    @SerializedName("traitDbIds")
-    private List<String> traitDbIds = null;
-
-    @SerializedName("traitEntities")
-    private List<String> traitEntities = null;
-
-    @SerializedName("traitEntityPUIs")
-    private List<String> traitEntityPUIs = null;
-
-    @SerializedName("traitNames")
-    private List<String> traitNames = null;
-
-    @SerializedName("traitPUIs")
-    private List<String> traitPUIs = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public SearchRequestParametersVariableBaseClass commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass dataTypes(List<DataTypesEnum> dataTypes) {
-        this.dataTypes = dataTypes;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addDataTypesItem(DataTypesEnum dataTypesItem) {
-        if (this.dataTypes == null) {
-            this.dataTypes = new ArrayList<DataTypesEnum>();
-        }
-        this.dataTypes.add(dataTypesItem);
-        return this;
-    }
-
-    /**
-     * List of scale data types to filter search results
-     *
-     * @return dataTypes
-     **/
-    @Schema(example = "[\"Numerical\",\"Ordinal\",\"Text\"]", description = "List of scale data types to filter search results")
-    public List<DataTypesEnum> getDataTypes() {
-        return dataTypes;
-    }
-
-    public void setDataTypes(List<DataTypesEnum> dataTypes) {
-        this.dataTypes = dataTypes;
-    }
-
-    public SearchRequestParametersVariableBaseClass externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public SearchRequestParametersVariableBaseClass externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public SearchRequestParametersVariableBaseClass methodDbIds(List<String> methodDbIds) {
-        this.methodDbIds = methodDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addMethodDbIdsItem(String methodDbIdsItem) {
-        if (this.methodDbIds == null) {
-            this.methodDbIds = new ArrayList<String>();
-        }
-        this.methodDbIds.add(methodDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of methods to filter search results
-     *
-     * @return methodDbIds
-     **/
-    @Schema(example = "[\"07e34f83\",\"d3d5517a\"]", description = "List of methods to filter search results")
-    public List<String> getMethodDbIds() {
-        return methodDbIds;
-    }
-
-    public void setMethodDbIds(List<String> methodDbIds) {
-        this.methodDbIds = methodDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass methodNames(List<String> methodNames) {
-        this.methodNames = methodNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addMethodNamesItem(String methodNamesItem) {
-        if (this.methodNames == null) {
-            this.methodNames = new ArrayList<String>();
-        }
-        this.methodNames.add(methodNamesItem);
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodNames
-     **/
-    @Schema(example = "[\"Measuring Tape\",\"Spectrometer\"]", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public List<String> getMethodNames() {
-        return methodNames;
-    }
-
-    public void setMethodNames(List<String> methodNames) {
-        this.methodNames = methodNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass methodPUIs(List<String> methodPUIs) {
-        this.methodPUIs = methodPUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addMethodPUIsItem(String methodPUIsItem) {
-        if (this.methodPUIs == null) {
-            this.methodPUIs = new ArrayList<String>();
-        }
-        this.methodPUIs.add(methodPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000212\",\"http://my-traits.com/trait/CO_123:0003557\"]", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public List<String> getMethodPUIs() {
-        return methodPUIs;
-    }
-
-    public void setMethodPUIs(List<String> methodPUIs) {
-        this.methodPUIs = methodPUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass ontologyDbIds(List<String> ontologyDbIds) {
-        this.ontologyDbIds = ontologyDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addOntologyDbIdsItem(String ontologyDbIdsItem) {
-        if (this.ontologyDbIds == null) {
-            this.ontologyDbIds = new ArrayList<String>();
-        }
-        this.ontologyDbIds.add(ontologyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of ontology IDs to search for
-     *
-     * @return ontologyDbIds
-     **/
-    @Schema(example = "[\"f44f7b23\",\"a26b576e\"]", description = "List of ontology IDs to search for")
-    public List<String> getOntologyDbIds() {
-        return ontologyDbIds;
-    }
-
-    public void setOntologyDbIds(List<String> ontologyDbIds) {
-        this.ontologyDbIds = ontologyDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SearchRequestParametersVariableBaseClass pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public SearchRequestParametersVariableBaseClass programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass scaleDbIds(List<String> scaleDbIds) {
-        this.scaleDbIds = scaleDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addScaleDbIdsItem(String scaleDbIdsItem) {
-        if (this.scaleDbIds == null) {
-            this.scaleDbIds = new ArrayList<String>();
-        }
-        this.scaleDbIds.add(scaleDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Scale
-     *
-     * @return scaleDbIds
-     **/
-    @Schema(example = "[\"a13ecffa\",\"7e1afe4f\"]", description = "The unique identifier for a Scale")
-    public List<String> getScaleDbIds() {
-        return scaleDbIds;
-    }
-
-    public void setScaleDbIds(List<String> scaleDbIds) {
-        this.scaleDbIds = scaleDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass scaleNames(List<String> scaleNames) {
-        this.scaleNames = scaleNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addScaleNamesItem(String scaleNamesItem) {
-        if (this.scaleNames == null) {
-            this.scaleNames = new ArrayList<String>();
-        }
-        this.scaleNames.add(scaleNamesItem);
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleNames
-     **/
-    @Schema(example = "[\"Meters\",\"Liters\"]", description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public List<String> getScaleNames() {
-        return scaleNames;
-    }
-
-    public void setScaleNames(List<String> scaleNames) {
-        this.scaleNames = scaleNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass scalePUIs(List<String> scalePUIs) {
-        this.scalePUIs = scalePUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addScalePUIsItem(String scalePUIsItem) {
-        if (this.scalePUIs == null) {
-            this.scalePUIs = new ArrayList<String>();
-        }
-        this.scalePUIs.add(scalePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000336\",\"http://my-traits.com/trait/CO_123:0000560\"]", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public List<String> getScalePUIs() {
-        return scalePUIs;
-    }
-
-    public void setScalePUIs(List<String> scalePUIs) {
-        this.scalePUIs = scalePUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass studyDbId(List<String> studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addStudyDbIdItem(String studyDbIdItem) {
-        if (this.studyDbId == null) {
-            this.studyDbId = new ArrayList<String>();
-        }
-        this.studyDbId.add(studyDbIdItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;studyDbIds&#x60;. Github issue number #483  &lt;br&gt;The unique ID of a studies to filter on
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "[\"5bcac0ae\",\"7f48e22d\"]", description = "**Deprecated in v2.1** Please use `studyDbIds`. Github issue number #483  <br>The unique ID of a studies to filter on")
-    public List<String> getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(List<String> studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public SearchRequestParametersVariableBaseClass studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitAttributePUIs(List<String> traitAttributePUIs) {
-        this.traitAttributePUIs = traitAttributePUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitAttributePUIsItem(String traitAttributePUIsItem) {
-        if (this.traitAttributePUIs == null) {
-            this.traitAttributePUIs = new ArrayList<String>();
-        }
-        this.traitAttributePUIs.add(traitAttributePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return traitAttributePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008336\",\"http://my-traits.com/trait/CO_123:0001092\"]", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public List<String> getTraitAttributePUIs() {
-        return traitAttributePUIs;
-    }
-
-    public void setTraitAttributePUIs(List<String> traitAttributePUIs) {
-        this.traitAttributePUIs = traitAttributePUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitAttributes(List<String> traitAttributes) {
-        this.traitAttributes = traitAttributes;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitAttributesItem(String traitAttributesItem) {
-        if (this.traitAttributes == null) {
-            this.traitAttributes = new ArrayList<String>();
-        }
-        this.traitAttributes.add(traitAttributesItem);
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return traitAttributes
-     **/
-    @Schema(example = "[\"Height\",\"Color\"]", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public List<String> getTraitAttributes() {
-        return traitAttributes;
-    }
-
-    public void setTraitAttributes(List<String> traitAttributes) {
-        this.traitAttributes = traitAttributes;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitClasses(List<String> traitClasses) {
-        this.traitClasses = traitClasses;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitClassesItem(String traitClassesItem) {
-        if (this.traitClasses == null) {
-            this.traitClasses = new ArrayList<String>();
-        }
-        this.traitClasses.add(traitClassesItem);
-        return this;
-    }
-
-    /**
-     * List of trait classes to filter search results
-     *
-     * @return traitClasses
-     **/
-    @Schema(example = "[\"morphological\",\"phenological\",\"agronomical\"]", description = "List of trait classes to filter search results")
-    public List<String> getTraitClasses() {
-        return traitClasses;
-    }
-
-    public void setTraitClasses(List<String> traitClasses) {
-        this.traitClasses = traitClasses;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitDbIds(List<String> traitDbIds) {
-        this.traitDbIds = traitDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitDbIdsItem(String traitDbIdsItem) {
-        if (this.traitDbIds == null) {
-            this.traitDbIds = new ArrayList<String>();
-        }
-        this.traitDbIds.add(traitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Trait
-     *
-     * @return traitDbIds
-     **/
-    @Schema(example = "[\"ef81147b\",\"78d82fad\"]", description = "The unique identifier for a Trait")
-    public List<String> getTraitDbIds() {
-        return traitDbIds;
-    }
-
-    public void setTraitDbIds(List<String> traitDbIds) {
-        this.traitDbIds = traitDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitEntities(List<String> traitEntities) {
-        this.traitEntities = traitEntities;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitEntitiesItem(String traitEntitiesItem) {
-        if (this.traitEntities == null) {
-            this.traitEntities = new ArrayList<String>();
-        }
-        this.traitEntities.add(traitEntitiesItem);
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return traitEntities
-     **/
-    @Schema(example = "[\"Stalk\",\"Root\"]", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public List<String> getTraitEntities() {
-        return traitEntities;
-    }
-
-    public void setTraitEntities(List<String> traitEntities) {
-        this.traitEntities = traitEntities;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitEntityPUIs(List<String> traitEntityPUIs) {
-        this.traitEntityPUIs = traitEntityPUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitEntityPUIsItem(String traitEntityPUIsItem) {
-        if (this.traitEntityPUIs == null) {
-            this.traitEntityPUIs = new ArrayList<String>();
-        }
-        this.traitEntityPUIs.add(traitEntityPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return traitEntityPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0004098\",\"http://my-traits.com/trait/CO_123:0002366\"]", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public List<String> getTraitEntityPUIs() {
-        return traitEntityPUIs;
-    }
-
-    public void setTraitEntityPUIs(List<String> traitEntityPUIs) {
-        this.traitEntityPUIs = traitEntityPUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitNames(List<String> traitNames) {
-        this.traitNames = traitNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitNamesItem(String traitNamesItem) {
-        if (this.traitNames == null) {
-            this.traitNames = new ArrayList<String>();
-        }
-        this.traitNames.add(traitNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitNames
-     **/
-    @Schema(example = "[\"Stalk Height\",\"Root Color\"]", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public List<String> getTraitNames() {
-        return traitNames;
-    }
-
-    public void setTraitNames(List<String> traitNames) {
-        this.traitNames = traitNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitPUIs(List<String> traitPUIs) {
-        this.traitPUIs = traitPUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitPUIsItem(String traitPUIsItem) {
-        if (this.traitPUIs == null) {
-            this.traitPUIs = new ArrayList<String>();
-        }
-        this.traitPUIs.add(traitPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000456\",\"http://my-traits.com/trait/CO_123:0000820\"]", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public List<String> getTraitPUIs() {
-        return traitPUIs;
-    }
-
-    public void setTraitPUIs(List<String> traitPUIs) {
-        this.traitPUIs = traitPUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersVariableBaseClass searchRequestParametersVariableBaseClass = (SearchRequestParametersVariableBaseClass) o;
-        return Objects.equals(this.commonCropNames, searchRequestParametersVariableBaseClass.commonCropNames) &&
-                Objects.equals(this.dataTypes, searchRequestParametersVariableBaseClass.dataTypes) &&
-                Objects.equals(this.externalReferenceIDs, searchRequestParametersVariableBaseClass.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, searchRequestParametersVariableBaseClass.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, searchRequestParametersVariableBaseClass.externalReferenceSources) &&
-                Objects.equals(this.methodDbIds, searchRequestParametersVariableBaseClass.methodDbIds) &&
-                Objects.equals(this.methodNames, searchRequestParametersVariableBaseClass.methodNames) &&
-                Objects.equals(this.methodPUIs, searchRequestParametersVariableBaseClass.methodPUIs) &&
-                Objects.equals(this.ontologyDbIds, searchRequestParametersVariableBaseClass.ontologyDbIds) &&
-                Objects.equals(this.page, searchRequestParametersVariableBaseClass.page) &&
-                Objects.equals(this.pageSize, searchRequestParametersVariableBaseClass.pageSize) &&
-                Objects.equals(this.programDbIds, searchRequestParametersVariableBaseClass.programDbIds) &&
-                Objects.equals(this.programNames, searchRequestParametersVariableBaseClass.programNames) &&
-                Objects.equals(this.scaleDbIds, searchRequestParametersVariableBaseClass.scaleDbIds) &&
-                Objects.equals(this.scaleNames, searchRequestParametersVariableBaseClass.scaleNames) &&
-                Objects.equals(this.scalePUIs, searchRequestParametersVariableBaseClass.scalePUIs) &&
-                Objects.equals(this.studyDbId, searchRequestParametersVariableBaseClass.studyDbId) &&
-                Objects.equals(this.studyDbIds, searchRequestParametersVariableBaseClass.studyDbIds) &&
-                Objects.equals(this.studyNames, searchRequestParametersVariableBaseClass.studyNames) &&
-                Objects.equals(this.traitAttributePUIs, searchRequestParametersVariableBaseClass.traitAttributePUIs) &&
-                Objects.equals(this.traitAttributes, searchRequestParametersVariableBaseClass.traitAttributes) &&
-                Objects.equals(this.traitClasses, searchRequestParametersVariableBaseClass.traitClasses) &&
-                Objects.equals(this.traitDbIds, searchRequestParametersVariableBaseClass.traitDbIds) &&
-                Objects.equals(this.traitEntities, searchRequestParametersVariableBaseClass.traitEntities) &&
-                Objects.equals(this.traitEntityPUIs, searchRequestParametersVariableBaseClass.traitEntityPUIs) &&
-                Objects.equals(this.traitNames, searchRequestParametersVariableBaseClass.traitNames) &&
-                Objects.equals(this.traitPUIs, searchRequestParametersVariableBaseClass.traitPUIs) &&
-                Objects.equals(this.trialDbIds, searchRequestParametersVariableBaseClass.trialDbIds) &&
-                Objects.equals(this.trialNames, searchRequestParametersVariableBaseClass.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, dataTypes, externalReferenceIDs, externalReferenceIds, externalReferenceSources, methodDbIds, methodNames, methodPUIs, ontologyDbIds, page, pageSize, programDbIds, programNames, scaleDbIds, scaleNames, scalePUIs, studyDbId, studyDbIds, studyNames, traitAttributePUIs, traitAttributes, traitClasses, traitDbIds, traitEntities, traitEntityPUIs, traitNames, traitPUIs, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersVariableBaseClass {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    dataTypes: ").append(toIndentedString(dataTypes)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    methodDbIds: ").append(toIndentedString(methodDbIds)).append("\n");
-        sb.append("    methodNames: ").append(toIndentedString(methodNames)).append("\n");
-        sb.append("    methodPUIs: ").append(toIndentedString(methodPUIs)).append("\n");
-        sb.append("    ontologyDbIds: ").append(toIndentedString(ontologyDbIds)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    scaleDbIds: ").append(toIndentedString(scaleDbIds)).append("\n");
-        sb.append("    scaleNames: ").append(toIndentedString(scaleNames)).append("\n");
-        sb.append("    scalePUIs: ").append(toIndentedString(scalePUIs)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    traitAttributePUIs: ").append(toIndentedString(traitAttributePUIs)).append("\n");
-        sb.append("    traitAttributes: ").append(toIndentedString(traitAttributes)).append("\n");
-        sb.append("    traitClasses: ").append(toIndentedString(traitClasses)).append("\n");
-        sb.append("    traitDbIds: ").append(toIndentedString(traitDbIds)).append("\n");
-        sb.append("    traitEntities: ").append(toIndentedString(traitEntities)).append("\n");
-        sb.append("    traitEntityPUIs: ").append(toIndentedString(traitEntityPUIs)).append("\n");
-        sb.append("    traitNames: ").append(toIndentedString(traitNames)).append("\n");
-        sb.append("    traitPUIs: ").append(toIndentedString(traitPUIs)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ShipmentForm.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ShipmentForm.java
deleted file mode 100644
index 9399bb4e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/ShipmentForm.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ShipmentForm
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class ShipmentForm {
-    @SerializedName("fileDescription")
-    private String fileDescription = null;
-
-    @SerializedName("fileName")
-    private String fileName = null;
-
-    @SerializedName("fileURL")
-    private String fileURL = null;
-
-    public ShipmentForm fileDescription(String fileDescription) {
-        this.fileDescription = fileDescription;
-        return this;
-    }
-
-    /**
-     * The human readable long description for this form
-     *
-     * @return fileDescription
-     **/
-    @Schema(example = "This is a shipment manifest form", description = "The human readable long description for this form")
-    public String getFileDescription() {
-        return fileDescription;
-    }
-
-    public void setFileDescription(String fileDescription) {
-        this.fileDescription = fileDescription;
-    }
-
-    public ShipmentForm fileName(String fileName) {
-        this.fileName = fileName;
-        return this;
-    }
-
-    /**
-     * The human readable name for this form
-     *
-     * @return fileName
-     **/
-    @Schema(example = "Shipment Manifest", description = "The human readable name for this form")
-    public String getFileName() {
-        return fileName;
-    }
-
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
-    public ShipmentForm fileURL(String fileURL) {
-        this.fileURL = fileURL;
-        return this;
-    }
-
-    /**
-     * The URL to download this form
-     *
-     * @return fileURL
-     **/
-    @Schema(example = "https://vendor.org/forms/manifest.pdf", required = true, description = "The URL to download this form")
-    public String getFileURL() {
-        return fileURL;
-    }
-
-    public void setFileURL(String fileURL) {
-        this.fileURL = fileURL;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ShipmentForm shipmentForm = (ShipmentForm) o;
-        return Objects.equals(this.fileDescription, shipmentForm.fileDescription) &&
-                Objects.equals(this.fileName, shipmentForm.fileName) &&
-                Objects.equals(this.fileURL, shipmentForm.fileURL);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(fileDescription, fileName, fileURL);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ShipmentForm {\n");
-
-        sb.append("    fileDescription: ").append(toIndentedString(fileDescription)).append("\n");
-        sb.append("    fileName: ").append(toIndentedString(fileName)).append("\n");
-        sb.append("    fileURL: ").append(toIndentedString(fileURL)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Status.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Status.java
deleted file mode 100644
index 17e8f618..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Status.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * An array of status messages to convey technical logging information from the server to the client.
- */
-@Schema(description = "An array of status messages to convey technical logging information from the server to the client.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class Status {
-    @SerializedName("message")
-    private String message = null;
-
-    /**
-     * The logging level for the attached message
-     */
-    @JsonAdapter(MessageTypeEnum.Adapter.class)
-    public enum MessageTypeEnum {
-        DEBUG("DEBUG"),
-        ERROR("ERROR"),
-        WARNING("WARNING"),
-        INFO("INFO");
-
-        private String value;
-
-        MessageTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static MessageTypeEnum fromValue(String input) {
-            for (MessageTypeEnum b : MessageTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<MessageTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final MessageTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public MessageTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return MessageTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("messageType")
-    private MessageTypeEnum messageType = null;
-
-    public Status message(String message) {
-        this.message = message;
-        return this;
-    }
-
-    /**
-     * A short message concerning the status of this request/response
-     *
-     * @return message
-     **/
-    @Schema(example = "Request accepted, response successful", required = true, description = "A short message concerning the status of this request/response")
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public Status messageType(MessageTypeEnum messageType) {
-        this.messageType = messageType;
-        return this;
-    }
-
-    /**
-     * The logging level for the attached message
-     *
-     * @return messageType
-     **/
-    @Schema(example = "INFO", required = true, description = "The logging level for the attached message")
-    public MessageTypeEnum getMessageType() {
-        return messageType;
-    }
-
-    public void setMessageType(MessageTypeEnum messageType) {
-        this.messageType = messageType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Status status = (Status) o;
-        return Objects.equals(this.message, status.message) &&
-                Objects.equals(this.messageType, status.messageType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(message, messageType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Status {\n");
-
-        sb.append("    message: ").append(toIndentedString(message)).append("\n");
-        sb.append("    messageType: ").append(toIndentedString(messageType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/TokenPagination.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/TokenPagination.java
deleted file mode 100644
index 06f59c1d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/TokenPagination.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The pagination object is applicable only when the payload contains a \&quot;data\&quot; key. It describes the pagination of the data contained in the \&quot;data\&quot; array, as a way to identify which subset of data is being returned.  &lt;br&gt;Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken to construct an additional query and move to the next or previous page respectively.
- */
-@Schema(description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The pagination object is applicable only when the payload contains a \"data\" key. It describes the pagination of the data contained in the \"data\" array, as a way to identify which subset of data is being returned.  <br>Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken to construct an additional query and move to the next or previous page respectively.  ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class TokenPagination {
-    @SerializedName("currentPage")
-    private Integer currentPage = 0;
-
-    @SerializedName("currentPageToken")
-    private String currentPageToken = null;
-
-    @SerializedName("nextPageToken")
-    private String nextPageToken = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = 1000;
-
-    @SerializedName("prevPageToken")
-    private String prevPageToken = null;
-
-    @SerializedName("totalCount")
-    private Integer totalCount = null;
-
-    @SerializedName("totalPages")
-    private Integer totalPages = null;
-
-    public TokenPagination currentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-        return this;
-    }
-
-    /**
-     * The index number for the returned page of data. This should always match the requested page number or the default page (0).
-     *
-     * @return currentPage
-     **/
-    @Schema(example = "0", description = "The index number for the returned page of data. This should always match the requested page number or the default page (0).")
-    public Integer getCurrentPage() {
-        return currentPage;
-    }
-
-    public void setCurrentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-    }
-
-    public TokenPagination currentPageToken(String currentPageToken) {
-        this.currentPageToken = currentPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the current page of data.
-     *
-     * @return currentPageToken
-     **/
-    @Schema(example = "48bc6ac1", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the current page of data.")
-    public String getCurrentPageToken() {
-        return currentPageToken;
-    }
-
-    public void setCurrentPageToken(String currentPageToken) {
-        this.currentPageToken = currentPageToken;
-    }
-
-    public TokenPagination nextPageToken(String nextPageToken) {
-        this.nextPageToken = nextPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the next page of data.
-     *
-     * @return nextPageToken
-     **/
-    @Schema(example = "cb668f63", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the next page of data.")
-    public String getNextPageToken() {
-        return nextPageToken;
-    }
-
-    public void setNextPageToken(String nextPageToken) {
-        this.nextPageToken = nextPageToken;
-    }
-
-    public TokenPagination pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public TokenPagination prevPageToken(String prevPageToken) {
-        this.prevPageToken = prevPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the previous page of data.
-     *
-     * @return prevPageToken
-     **/
-    @Schema(example = "9659857e", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the previous page of data.")
-    public String getPrevPageToken() {
-        return prevPageToken;
-    }
-
-    public void setPrevPageToken(String prevPageToken) {
-        this.prevPageToken = prevPageToken;
-    }
-
-    public TokenPagination totalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-        return this;
-    }
-
-    /**
-     * The total number of elements that are available on the server and match the requested query parameters.
-     *
-     * @return totalCount
-     **/
-    @Schema(example = "10", description = "The total number of elements that are available on the server and match the requested query parameters.")
-    public Integer getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public TokenPagination totalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-        return this;
-    }
-
-    /**
-     * The total number of pages of elements available on the server. This should be calculated with the following formula.  &lt;br&gt; totalPages &#x3D; CEILING( totalCount / requested_page_size)
-     *
-     * @return totalPages
-     **/
-    @Schema(example = "1", description = "The total number of pages of elements available on the server. This should be calculated with the following formula.  <br> totalPages = CEILING( totalCount / requested_page_size)")
-    public Integer getTotalPages() {
-        return totalPages;
-    }
-
-    public void setTotalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TokenPagination tokenPagination = (TokenPagination) o;
-        return Objects.equals(this.currentPage, tokenPagination.currentPage) &&
-                Objects.equals(this.currentPageToken, tokenPagination.currentPageToken) &&
-                Objects.equals(this.nextPageToken, tokenPagination.nextPageToken) &&
-                Objects.equals(this.pageSize, tokenPagination.pageSize) &&
-                Objects.equals(this.prevPageToken, tokenPagination.prevPageToken) &&
-                Objects.equals(this.totalCount, tokenPagination.totalCount) &&
-                Objects.equals(this.totalPages, tokenPagination.totalPages);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(currentPage, currentPageToken, nextPageToken, pageSize, prevPageToken, totalCount, totalPages);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TokenPagination {\n");
-
-        sb.append("    currentPage: ").append(toIndentedString(currentPage)).append("\n");
-        sb.append("    currentPageToken: ").append(toIndentedString(currentPageToken)).append("\n");
-        sb.append("    nextPageToken: ").append(toIndentedString(nextPageToken)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    prevPageToken: ").append(toIndentedString(prevPageToken)).append("\n");
-        sb.append("    totalCount: ").append(toIndentedString(totalCount)).append("\n");
-        sb.append("    totalPages: ").append(toIndentedString(totalPages)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/TraitBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/TraitBaseClass.java
deleted file mode 100644
index 3aa0a44e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/TraitBaseClass.java
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A Trait describes what property is being observed.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Trait \&quot;Leaf length\&quot; or \&quot;Flower height\&quot;.
- */
-@Schema(description = "A Trait describes what property is being observed.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Trait \"Leaf length\" or \"Flower height\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class TraitBaseClass {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("alternativeAbbreviations")
-    private List<String> alternativeAbbreviations = null;
-
-    @SerializedName("attribute")
-    private String attribute = null;
-
-    @SerializedName("attributePUI")
-    private String attributePUI = null;
-
-    @SerializedName("entity")
-    private String entity = null;
-
-    @SerializedName("entityPUI")
-    private String entityPUI = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("mainAbbreviation")
-    private String mainAbbreviation = null;
-
-    @SerializedName("ontologyReference")
-    private MethodBaseClassOntologyReference ontologyReference = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("traitClass")
-    private String traitClass = null;
-
-    @SerializedName("traitDescription")
-    private String traitDescription = null;
-
-    @SerializedName("traitName")
-    private String traitName = null;
-
-    @SerializedName("traitPUI")
-    private String traitPUI = null;
-
-    public TraitBaseClass additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public TraitBaseClass putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public TraitBaseClass alternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-        return this;
-    }
-
-    public TraitBaseClass addAlternativeAbbreviationsItem(String alternativeAbbreviationsItem) {
-        if (this.alternativeAbbreviations == null) {
-            this.alternativeAbbreviations = new ArrayList<String>();
-        }
-        this.alternativeAbbreviations.add(alternativeAbbreviationsItem);
-        return this;
-    }
-
-    /**
-     * A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.
-     *
-     * @return alternativeAbbreviations
-     **/
-    @Schema(example = "[\"H\",\"PH\",\"H1\"]", description = "A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.")
-    public List<String> getAlternativeAbbreviations() {
-        return alternativeAbbreviations;
-    }
-
-    public void setAlternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-    }
-
-    public TraitBaseClass attribute(String attribute) {
-        this.attribute = attribute;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attribute
-     **/
-    @Schema(example = "height", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    public TraitBaseClass attributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attributePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PO:00012345", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttributePUI() {
-        return attributePUI;
-    }
-
-    public void setAttributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-    }
-
-    public TraitBaseClass entity(String entity) {
-        this.entity = entity;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entity
-     **/
-    @Schema(example = "Stalk", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public String getEntity() {
-        return entity;
-    }
-
-    public void setEntity(String entity) {
-        this.entity = entity;
-    }
-
-    public TraitBaseClass entityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A Trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the Entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entityPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PATO:00098765", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A Trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the Entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public String getEntityPUI() {
-        return entityPUI;
-    }
-
-    public void setEntityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-    }
-
-    public TraitBaseClass externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public TraitBaseClass addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public TraitBaseClass mainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Trait
-     *
-     * @return mainAbbreviation
-     **/
-    @Schema(example = "PH", description = "A shortened version of the human readable name for a Trait")
-    public String getMainAbbreviation() {
-        return mainAbbreviation;
-    }
-
-    public void setMainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-    }
-
-    public TraitBaseClass ontologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodBaseClassOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public TraitBaseClass status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Trait status (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Trait status (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public TraitBaseClass synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public TraitBaseClass addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other trait names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Height\",\"Plant Height\",\"Stalk Height\",\"Canopy Height\"]", description = "Other trait names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public TraitBaseClass traitClass(String traitClass) {
-        this.traitClass = traitClass;
-        return this;
-    }
-
-    /**
-     * A classification to describe the type of trait and the context it should be considered in. &lt;br/&gt; examples- \&quot;morphological\&quot;, \&quot;phenological\&quot;, \&quot;agronomical\&quot;, \&quot;physiological\&quot;, \&quot;abiotic stress\&quot;, \&quot;biotic stress\&quot;, \&quot;biochemical\&quot;, \&quot;quality traits\&quot;, \&quot;fertility\&quot;, etc.
-     *
-     * @return traitClass
-     **/
-    @Schema(example = "phenological", description = "A classification to describe the type of trait and the context it should be considered in. <br/> examples- \"morphological\", \"phenological\", \"agronomical\", \"physiological\", \"abiotic stress\", \"biotic stress\", \"biochemical\", \"quality traits\", \"fertility\", etc.")
-    public String getTraitClass() {
-        return traitClass;
-    }
-
-    public void setTraitClass(String traitClass) {
-        this.traitClass = traitClass;
-    }
-
-    public TraitBaseClass traitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-        return this;
-    }
-
-    /**
-     * The description of a trait
-     *
-     * @return traitDescription
-     **/
-    @Schema(example = "The height of the plant", description = "The description of a trait")
-    public String getTraitDescription() {
-        return traitDescription;
-    }
-
-    public void setTraitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-    }
-
-    public TraitBaseClass traitName(String traitName) {
-        this.traitName = traitName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitName
-     **/
-    @Schema(example = "Height", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public String getTraitName() {
-        return traitName;
-    }
-
-    public void setTraitName(String traitName) {
-        this.traitName = traitName;
-    }
-
-    public TraitBaseClass traitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000012", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public String getTraitPUI() {
-        return traitPUI;
-    }
-
-    public void setTraitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TraitBaseClass traitBaseClass = (TraitBaseClass) o;
-        return Objects.equals(this.additionalInfo, traitBaseClass.additionalInfo) &&
-                Objects.equals(this.alternativeAbbreviations, traitBaseClass.alternativeAbbreviations) &&
-                Objects.equals(this.attribute, traitBaseClass.attribute) &&
-                Objects.equals(this.attributePUI, traitBaseClass.attributePUI) &&
-                Objects.equals(this.entity, traitBaseClass.entity) &&
-                Objects.equals(this.entityPUI, traitBaseClass.entityPUI) &&
-                Objects.equals(this.externalReferences, traitBaseClass.externalReferences) &&
-                Objects.equals(this.mainAbbreviation, traitBaseClass.mainAbbreviation) &&
-                Objects.equals(this.ontologyReference, traitBaseClass.ontologyReference) &&
-                Objects.equals(this.status, traitBaseClass.status) &&
-                Objects.equals(this.synonyms, traitBaseClass.synonyms) &&
-                Objects.equals(this.traitClass, traitBaseClass.traitClass) &&
-                Objects.equals(this.traitDescription, traitBaseClass.traitDescription) &&
-                Objects.equals(this.traitName, traitBaseClass.traitName) &&
-                Objects.equals(this.traitPUI, traitBaseClass.traitPUI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, alternativeAbbreviations, attribute, attributePUI, entity, entityPUI, externalReferences, mainAbbreviation, ontologyReference, status, synonyms, traitClass, traitDescription, traitName, traitPUI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TraitBaseClass {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    alternativeAbbreviations: ").append(toIndentedString(alternativeAbbreviations)).append("\n");
-        sb.append("    attribute: ").append(toIndentedString(attribute)).append("\n");
-        sb.append("    attributePUI: ").append(toIndentedString(attributePUI)).append("\n");
-        sb.append("    entity: ").append(toIndentedString(entity)).append("\n");
-        sb.append("    entityPUI: ").append(toIndentedString(entityPUI)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    mainAbbreviation: ").append(toIndentedString(mainAbbreviation)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    traitClass: ").append(toIndentedString(traitClass)).append("\n");
-        sb.append("    traitDescription: ").append(toIndentedString(traitDescription)).append("\n");
-        sb.append("    traitName: ").append(toIndentedString(traitName)).append("\n");
-        sb.append("    traitPUI: ").append(toIndentedString(traitPUI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/TraitDataType.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/TraitDataType.java
deleted file mode 100644
index f1ef81f6..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/TraitDataType.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-/**
- * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
- */
-@JsonAdapter(TraitDataType.Adapter.class)
-public enum TraitDataType {
-    CODE("Code"),
-    DATE("Date"),
-    DURATION("Duration"),
-    NOMINAL("Nominal"),
-    NUMERICAL("Numerical"),
-    ORDINAL("Ordinal"),
-    TEXT("Text");
-
-    private final String value;
-
-    TraitDataType(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    public static TraitDataType fromValue(String input) {
-        for (TraitDataType b : TraitDataType.values()) {
-            if (b.value.equals(input)) {
-                return b;
-            }
-        }
-        return null;
-    }
-
-    public static class Adapter extends TypeAdapter<TraitDataType> {
-        @Override
-        public void write(final JsonWriter jsonWriter, final TraitDataType enumeration) throws IOException {
-            jsonWriter.value(String.valueOf(enumeration.getValue()));
-        }
-
-        @Override
-        public TraitDataType read(final JsonReader jsonReader) throws IOException {
-            Object value = jsonReader.nextString();
-            return TraitDataType.fromValue((String) (value));
-        }
-    }
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariableBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariableBaseClass.java
deleted file mode 100644
index aeb5b6c0..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariableBaseClass.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * VariableBaseClass
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VariableBaseClass {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("contextOfUse")
-    private List<String> contextOfUse = null;
-
-    @SerializedName("defaultValue")
-    private String defaultValue = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("externalReferences")
-    private ExternalReferences externalReferences = null;
-
-    @SerializedName("growthStage")
-    private String growthStage = null;
-
-    @SerializedName("institution")
-    private String institution = null;
-
-    @SerializedName("language")
-    private String language = null;
-
-    @SerializedName("method")
-    private VariableBaseClassMethod method = null;
-
-    @SerializedName("ontologyReference")
-    private OntologyReference ontologyReference = null;
-
-    @SerializedName("scale")
-    private VariableBaseClassScale scale = null;
-
-    @SerializedName("scientist")
-    private String scientist = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("submissionTimestamp")
-    private OffsetDateTime submissionTimestamp = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("trait")
-    private VariableBaseClassTrait trait = null;
-
-    public VariableBaseClass additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public VariableBaseClass putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public VariableBaseClass commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Crop name (examples: \&quot;Maize\&quot;, \&quot;Wheat\&quot;)
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Maize", description = "Crop name (examples: \"Maize\", \"Wheat\")")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public VariableBaseClass contextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-        return this;
-    }
-
-    public VariableBaseClass addContextOfUseItem(String contextOfUseItem) {
-        if (this.contextOfUse == null) {
-            this.contextOfUse = new ArrayList<String>();
-        }
-        this.contextOfUse.add(contextOfUseItem);
-        return this;
-    }
-
-    /**
-     * Indication of how trait is routinely used. (examples: [\&quot;Trial evaluation\&quot;, \&quot;Nursery evaluation\&quot;])
-     *
-     * @return contextOfUse
-     **/
-    @Schema(example = "[\"Trial evaluation\",\"Nursery evaluation\"]", description = "Indication of how trait is routinely used. (examples: [\"Trial evaluation\", \"Nursery evaluation\"])")
-    public List<String> getContextOfUse() {
-        return contextOfUse;
-    }
-
-    public void setContextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-    }
-
-    public VariableBaseClass defaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-        return this;
-    }
-
-    /**
-     * Variable default value. (examples: \&quot;red\&quot;, \&quot;2.3\&quot;, etc.)
-     *
-     * @return defaultValue
-     **/
-    @Schema(example = "2.0", description = "Variable default value. (examples: \"red\", \"2.3\", etc.)")
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    public void setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    public VariableBaseClass documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/documentation.html", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public VariableBaseClass externalReferences(ExternalReferences externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    /**
-     * Get externalReferences
-     *
-     * @return externalReferences
-     **/
-    @Schema(description = "")
-    public ExternalReferences getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(ExternalReferences externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public VariableBaseClass growthStage(String growthStage) {
-        this.growthStage = growthStage;
-        return this;
-    }
-
-    /**
-     * Growth stage at which measurement is made (examples: \&quot;flowering\&quot;)
-     *
-     * @return growthStage
-     **/
-    @Schema(example = "flowering", description = "Growth stage at which measurement is made (examples: \"flowering\")")
-    public String getGrowthStage() {
-        return growthStage;
-    }
-
-    public void setGrowthStage(String growthStage) {
-        this.growthStage = growthStage;
-    }
-
-    public VariableBaseClass institution(String institution) {
-        this.institution = institution;
-        return this;
-    }
-
-    /**
-     * Name of institution submitting the variable
-     *
-     * @return institution
-     **/
-    @Schema(example = "The BrAPI Institute", description = "Name of institution submitting the variable")
-    public String getInstitution() {
-        return institution;
-    }
-
-    public void setInstitution(String institution) {
-        this.institution = institution;
-    }
-
-    public VariableBaseClass language(String language) {
-        this.language = language;
-        return this;
-    }
-
-    /**
-     * 2 letter ISO 639-1 code for the language of submission of the variable.
-     *
-     * @return language
-     **/
-    @Schema(example = "en", description = "2 letter ISO 639-1 code for the language of submission of the variable.")
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public VariableBaseClass method(VariableBaseClassMethod method) {
-        this.method = method;
-        return this;
-    }
-
-    /**
-     * Get method
-     *
-     * @return method
-     **/
-    @Schema(required = true, description = "")
-    public VariableBaseClassMethod getMethod() {
-        return method;
-    }
-
-    public void setMethod(VariableBaseClassMethod method) {
-        this.method = method;
-    }
-
-    public VariableBaseClass ontologyReference(OntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public OntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(OntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public VariableBaseClass scale(VariableBaseClassScale scale) {
-        this.scale = scale;
-        return this;
-    }
-
-    /**
-     * Get scale
-     *
-     * @return scale
-     **/
-    @Schema(required = true, description = "")
-    public VariableBaseClassScale getScale() {
-        return scale;
-    }
-
-    public void setScale(VariableBaseClassScale scale) {
-        this.scale = scale;
-    }
-
-    public VariableBaseClass scientist(String scientist) {
-        this.scientist = scientist;
-        return this;
-    }
-
-    /**
-     * Name of scientist submitting the variable.
-     *
-     * @return scientist
-     **/
-    @Schema(example = "Dr. Bob Robertson", description = "Name of scientist submitting the variable.")
-    public String getScientist() {
-        return scientist;
-    }
-
-    public void setScientist(String scientist) {
-        this.scientist = scientist;
-    }
-
-    public VariableBaseClass status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Variable status. (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Variable status. (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public VariableBaseClass submissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-        return this;
-    }
-
-    /**
-     * Timestamp when the Variable was added (ISO 8601)
-     *
-     * @return submissionTimestamp
-     **/
-    @Schema(description = "Timestamp when the Variable was added (ISO 8601)")
-    public OffsetDateTime getSubmissionTimestamp() {
-        return submissionTimestamp;
-    }
-
-    public void setSubmissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-    }
-
-    public VariableBaseClass synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public VariableBaseClass addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other variable names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Maize Height\",\"Stalk Height\",\"Corn Height\"]", description = "Other variable names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public VariableBaseClass trait(VariableBaseClassTrait trait) {
-        this.trait = trait;
-        return this;
-    }
-
-    /**
-     * Get trait
-     *
-     * @return trait
-     **/
-    @Schema(required = true, description = "")
-    public VariableBaseClassTrait getTrait() {
-        return trait;
-    }
-
-    public void setTrait(VariableBaseClassTrait trait) {
-        this.trait = trait;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariableBaseClass variableBaseClass = (VariableBaseClass) o;
-        return Objects.equals(this.additionalInfo, variableBaseClass.additionalInfo) &&
-                Objects.equals(this.commonCropName, variableBaseClass.commonCropName) &&
-                Objects.equals(this.contextOfUse, variableBaseClass.contextOfUse) &&
-                Objects.equals(this.defaultValue, variableBaseClass.defaultValue) &&
-                Objects.equals(this.documentationURL, variableBaseClass.documentationURL) &&
-                Objects.equals(this.externalReferences, variableBaseClass.externalReferences) &&
-                Objects.equals(this.growthStage, variableBaseClass.growthStage) &&
-                Objects.equals(this.institution, variableBaseClass.institution) &&
-                Objects.equals(this.language, variableBaseClass.language) &&
-                Objects.equals(this.method, variableBaseClass.method) &&
-                Objects.equals(this.ontologyReference, variableBaseClass.ontologyReference) &&
-                Objects.equals(this.scale, variableBaseClass.scale) &&
-                Objects.equals(this.scientist, variableBaseClass.scientist) &&
-                Objects.equals(this.status, variableBaseClass.status) &&
-                Objects.equals(this.submissionTimestamp, variableBaseClass.submissionTimestamp) &&
-                Objects.equals(this.synonyms, variableBaseClass.synonyms) &&
-                Objects.equals(this.trait, variableBaseClass.trait);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, commonCropName, contextOfUse, defaultValue, documentationURL, externalReferences, growthStage, institution, language, method, ontologyReference, scale, scientist, status, submissionTimestamp, synonyms, trait);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariableBaseClass {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    contextOfUse: ").append(toIndentedString(contextOfUse)).append("\n");
-        sb.append("    defaultValue: ").append(toIndentedString(defaultValue)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    growthStage: ").append(toIndentedString(growthStage)).append("\n");
-        sb.append("    institution: ").append(toIndentedString(institution)).append("\n");
-        sb.append("    language: ").append(toIndentedString(language)).append("\n");
-        sb.append("    method: ").append(toIndentedString(method)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scale: ").append(toIndentedString(scale)).append("\n");
-        sb.append("    scientist: ").append(toIndentedString(scientist)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    submissionTimestamp: ").append(toIndentedString(submissionTimestamp)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    trait: ").append(toIndentedString(trait)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariableBaseClassMethod.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariableBaseClassMethod.java
deleted file mode 100644
index 7a5152b2..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariableBaseClassMethod.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A description of the way an Observation should be collected.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Method \&quot;estimation\&quot; or \&quot;drone image processing\&quot;.
- */
-@Schema(description = "A description of the way an Observation should be collected.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Method \"estimation\" or \"drone image processing\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VariableBaseClassMethod {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("bibliographicalReference")
-    private String bibliographicalReference = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("formula")
-    private String formula = null;
-
-    @SerializedName("methodClass")
-    private String methodClass = null;
-
-    @SerializedName("methodDbId")
-    private String methodDbId = null;
-
-    @SerializedName("methodName")
-    private String methodName = null;
-
-    @SerializedName("methodPUI")
-    private String methodPUI = null;
-
-    @SerializedName("ontologyReference")
-    private MethodBaseClassOntologyReference ontologyReference = null;
-
-    public VariableBaseClassMethod additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public VariableBaseClassMethod putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public VariableBaseClassMethod bibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-        return this;
-    }
-
-    /**
-     * Bibliographical reference describing the method. &lt;br/&gt;MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.
-     *
-     * @return bibliographicalReference
-     **/
-    @Schema(example = "Smith, 1893, Really Cool Paper, Popular Journal", description = "Bibliographical reference describing the method. <br/>MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.")
-    public String getBibliographicalReference() {
-        return bibliographicalReference;
-    }
-
-    public void setBibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-    }
-
-    public VariableBaseClassMethod description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Method description &lt;br/&gt;MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)
-     *
-     * @return description
-     **/
-    @Schema(example = "A measuring tape was used", description = "Method description <br/>MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public VariableBaseClassMethod externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public VariableBaseClassMethod addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public VariableBaseClassMethod formula(String formula) {
-        this.formula = formula;
-        return this;
-    }
-
-    /**
-     * For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation
-     *
-     * @return formula
-     **/
-    @Schema(example = "a^2 + b^2 = c^2", description = "For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation")
-    public String getFormula() {
-        return formula;
-    }
-
-    public void setFormula(String formula) {
-        this.formula = formula;
-    }
-
-    public VariableBaseClassMethod methodClass(String methodClass) {
-        this.methodClass = methodClass;
-        return this;
-    }
-
-    /**
-     * Method class (examples: \&quot;Measurement\&quot;, \&quot;Counting\&quot;, \&quot;Estimation\&quot;, \&quot;Computation\&quot;, etc.)
-     *
-     * @return methodClass
-     **/
-    @Schema(example = "Measurement", description = "Method class (examples: \"Measurement\", \"Counting\", \"Estimation\", \"Computation\", etc.)")
-    public String getMethodClass() {
-        return methodClass;
-    }
-
-    public void setMethodClass(String methodClass) {
-        this.methodClass = methodClass;
-    }
-
-    public VariableBaseClassMethod methodDbId(String methodDbId) {
-        this.methodDbId = methodDbId;
-        return this;
-    }
-
-    /**
-     * Method unique identifier
-     *
-     * @return methodDbId
-     **/
-    @Schema(example = "0adb2764", description = "Method unique identifier")
-    public String getMethodDbId() {
-        return methodDbId;
-    }
-
-    public void setMethodDbId(String methodDbId) {
-        this.methodDbId = methodDbId;
-    }
-
-    public VariableBaseClassMethod methodName(String methodName) {
-        this.methodName = methodName;
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodName
-     **/
-    @Schema(example = "Measuring Tape", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public String getMethodName() {
-        return methodName;
-    }
-
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
-    public VariableBaseClassMethod methodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000212", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public String getMethodPUI() {
-        return methodPUI;
-    }
-
-    public void setMethodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-    }
-
-    public VariableBaseClassMethod ontologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodBaseClassOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariableBaseClassMethod variableBaseClassMethod = (VariableBaseClassMethod) o;
-        return Objects.equals(this.additionalInfo, variableBaseClassMethod.additionalInfo) &&
-                Objects.equals(this.bibliographicalReference, variableBaseClassMethod.bibliographicalReference) &&
-                Objects.equals(this.description, variableBaseClassMethod.description) &&
-                Objects.equals(this.externalReferences, variableBaseClassMethod.externalReferences) &&
-                Objects.equals(this.formula, variableBaseClassMethod.formula) &&
-                Objects.equals(this.methodClass, variableBaseClassMethod.methodClass) &&
-                Objects.equals(this.methodDbId, variableBaseClassMethod.methodDbId) &&
-                Objects.equals(this.methodName, variableBaseClassMethod.methodName) &&
-                Objects.equals(this.methodPUI, variableBaseClassMethod.methodPUI) &&
-                Objects.equals(this.ontologyReference, variableBaseClassMethod.ontologyReference);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, bibliographicalReference, description, externalReferences, formula, methodClass, methodDbId, methodName, methodPUI, ontologyReference);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariableBaseClassMethod {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    bibliographicalReference: ").append(toIndentedString(bibliographicalReference)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    formula: ").append(toIndentedString(formula)).append("\n");
-        sb.append("    methodClass: ").append(toIndentedString(methodClass)).append("\n");
-        sb.append("    methodDbId: ").append(toIndentedString(methodDbId)).append("\n");
-        sb.append("    methodName: ").append(toIndentedString(methodName)).append("\n");
-        sb.append("    methodPUI: ").append(toIndentedString(methodPUI)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariableBaseClassScale.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariableBaseClassScale.java
deleted file mode 100644
index 457b0d76..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariableBaseClassScale.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * A Scale describes the units and acceptable values for an ObservationVariable.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Scale \&quot;inches\&quot; or \&quot;pixels\&quot;.
- */
-@Schema(description = "A Scale describes the units and acceptable values for an ObservationVariable.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Scale \"inches\" or \"pixels\".")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VariableBaseClassScale {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypeEnum.Adapter.class)
-    public enum DataTypeEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypeEnum fromValue(String input) {
-            for (DataTypeEnum b : DataTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataType")
-    private DataTypeEnum dataType = null;
-
-    @SerializedName("decimalPlaces")
-    private Integer decimalPlaces = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("ontologyReference")
-    private MethodBaseClassOntologyReference ontologyReference = null;
-
-    @SerializedName("scaleDbId")
-    private String scaleDbId = null;
-
-    @SerializedName("scaleName")
-    private String scaleName = null;
-
-    @SerializedName("scalePUI")
-    private String scalePUI = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    @SerializedName("validValues")
-    private ScaleBaseClassValidValues validValues = null;
-
-    public VariableBaseClassScale additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public VariableBaseClassScale putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public VariableBaseClassScale dataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-        return this;
-    }
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     *
-     * @return dataType
-     **/
-    @Schema(example = "Numerical", description = "<p>Class of the scale, entries can be</p> <p>\"Code\" -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \"75VD\" means \"75 %\" of the plant is infected and the plant is very delayed.</p> <p>\"Date\" - The date class is for events expressed in a time format, See ISO 8601</p> <p>\"Duration\" - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months</p> <p>\"Nominal\" - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories</p> <p>\"Numerical\" - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches</p> <p>\"Ordinal\" - Ordinal scales are scales composed of ordered categories</p> <p>\"Text\" - A free text is used to express the trait.</p>")
-    public DataTypeEnum getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-    }
-
-    public VariableBaseClassScale decimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-        return this;
-    }
-
-    /**
-     * For numerical, number of decimal places to be reported
-     *
-     * @return decimalPlaces
-     **/
-    @Schema(example = "2", description = "For numerical, number of decimal places to be reported")
-    public Integer getDecimalPlaces() {
-        return decimalPlaces;
-    }
-
-    public void setDecimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-    }
-
-    public VariableBaseClassScale externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public VariableBaseClassScale addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public VariableBaseClassScale ontologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodBaseClassOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public VariableBaseClassScale scaleDbId(String scaleDbId) {
-        this.scaleDbId = scaleDbId;
-        return this;
-    }
-
-    /**
-     * Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.
-     *
-     * @return scaleDbId
-     **/
-    @Schema(example = "af730171", description = "Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.")
-    public String getScaleDbId() {
-        return scaleDbId;
-    }
-
-    public void setScaleDbId(String scaleDbId) {
-        this.scaleDbId = scaleDbId;
-    }
-
-    public VariableBaseClassScale scaleName(String scaleName) {
-        this.scaleName = scaleName;
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleName
-     **/
-    @Schema(example = "Meters", description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public String getScaleName() {
-        return scaleName;
-    }
-
-    public void setScaleName(String scaleName) {
-        this.scaleName = scaleName;
-    }
-
-    public VariableBaseClassScale scalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000112", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public String getScalePUI() {
-        return scalePUI;
-    }
-
-    public void setScalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-    }
-
-    public VariableBaseClassScale units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when &#x60;dataType&#x60; is Numeric, but could also be included for other dataTypes when applicable.
-     *
-     * @return units
-     **/
-    @Schema(example = "m", description = "This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when `dataType` is Numeric, but could also be included for other dataTypes when applicable.")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    public VariableBaseClassScale validValues(ScaleBaseClassValidValues validValues) {
-        this.validValues = validValues;
-        return this;
-    }
-
-    /**
-     * Get validValues
-     *
-     * @return validValues
-     **/
-    @Schema(description = "")
-    public ScaleBaseClassValidValues getValidValues() {
-        return validValues;
-    }
-
-    public void setValidValues(ScaleBaseClassValidValues validValues) {
-        this.validValues = validValues;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariableBaseClassScale variableBaseClassScale = (VariableBaseClassScale) o;
-        return Objects.equals(this.additionalInfo, variableBaseClassScale.additionalInfo) &&
-                Objects.equals(this.dataType, variableBaseClassScale.dataType) &&
-                Objects.equals(this.decimalPlaces, variableBaseClassScale.decimalPlaces) &&
-                Objects.equals(this.externalReferences, variableBaseClassScale.externalReferences) &&
-                Objects.equals(this.ontologyReference, variableBaseClassScale.ontologyReference) &&
-                Objects.equals(this.scaleDbId, variableBaseClassScale.scaleDbId) &&
-                Objects.equals(this.scaleName, variableBaseClassScale.scaleName) &&
-                Objects.equals(this.scalePUI, variableBaseClassScale.scalePUI) &&
-                Objects.equals(this.units, variableBaseClassScale.units) &&
-                Objects.equals(this.validValues, variableBaseClassScale.validValues);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, dataType, decimalPlaces, externalReferences, ontologyReference, scaleDbId, scaleName, scalePUI, units, validValues);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariableBaseClassScale {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
-        sb.append("    decimalPlaces: ").append(toIndentedString(decimalPlaces)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scaleDbId: ").append(toIndentedString(scaleDbId)).append("\n");
-        sb.append("    scaleName: ").append(toIndentedString(scaleName)).append("\n");
-        sb.append("    scalePUI: ").append(toIndentedString(scalePUI)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("    validValues: ").append(toIndentedString(validValues)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariableBaseClassTrait.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariableBaseClassTrait.java
deleted file mode 100644
index 348b7dbb..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariableBaseClassTrait.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A Trait describes what property is being observed.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Trait \&quot;Leaf length\&quot; or \&quot;Flower height\&quot;.
- */
-@Schema(description = "A Trait describes what property is being observed.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Trait \"Leaf length\" or \"Flower height\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VariableBaseClassTrait {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("alternativeAbbreviations")
-    private List<String> alternativeAbbreviations = null;
-
-    @SerializedName("attribute")
-    private String attribute = null;
-
-    @SerializedName("attributePUI")
-    private String attributePUI = null;
-
-    @SerializedName("entity")
-    private String entity = null;
-
-    @SerializedName("entityPUI")
-    private String entityPUI = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("mainAbbreviation")
-    private String mainAbbreviation = null;
-
-    @SerializedName("ontologyReference")
-    private MethodBaseClassOntologyReference ontologyReference = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("traitClass")
-    private String traitClass = null;
-
-    @SerializedName("traitDbId")
-    private String traitDbId = null;
-
-    @SerializedName("traitDescription")
-    private String traitDescription = null;
-
-    @SerializedName("traitName")
-    private String traitName = null;
-
-    @SerializedName("traitPUI")
-    private String traitPUI = null;
-
-    public VariableBaseClassTrait additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public VariableBaseClassTrait putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public VariableBaseClassTrait alternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-        return this;
-    }
-
-    public VariableBaseClassTrait addAlternativeAbbreviationsItem(String alternativeAbbreviationsItem) {
-        if (this.alternativeAbbreviations == null) {
-            this.alternativeAbbreviations = new ArrayList<String>();
-        }
-        this.alternativeAbbreviations.add(alternativeAbbreviationsItem);
-        return this;
-    }
-
-    /**
-     * A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.
-     *
-     * @return alternativeAbbreviations
-     **/
-    @Schema(example = "[\"H\",\"PH\",\"H1\"]", description = "A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.")
-    public List<String> getAlternativeAbbreviations() {
-        return alternativeAbbreviations;
-    }
-
-    public void setAlternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-    }
-
-    public VariableBaseClassTrait attribute(String attribute) {
-        this.attribute = attribute;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attribute
-     **/
-    @Schema(example = "height", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    public VariableBaseClassTrait attributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attributePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PO:00012345", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttributePUI() {
-        return attributePUI;
-    }
-
-    public void setAttributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-    }
-
-    public VariableBaseClassTrait entity(String entity) {
-        this.entity = entity;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entity
-     **/
-    @Schema(example = "Stalk", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public String getEntity() {
-        return entity;
-    }
-
-    public void setEntity(String entity) {
-        this.entity = entity;
-    }
-
-    public VariableBaseClassTrait entityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A Trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the Entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entityPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PATO:00098765", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A Trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the Entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public String getEntityPUI() {
-        return entityPUI;
-    }
-
-    public void setEntityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-    }
-
-    public VariableBaseClassTrait externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public VariableBaseClassTrait addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public VariableBaseClassTrait mainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Trait
-     *
-     * @return mainAbbreviation
-     **/
-    @Schema(example = "PH", description = "A shortened version of the human readable name for a Trait")
-    public String getMainAbbreviation() {
-        return mainAbbreviation;
-    }
-
-    public void setMainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-    }
-
-    public VariableBaseClassTrait ontologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodBaseClassOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodBaseClassOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public VariableBaseClassTrait status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Trait status (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Trait status (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public VariableBaseClassTrait synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public VariableBaseClassTrait addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other trait names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Height\",\"Plant Height\",\"Stalk Height\",\"Canopy Height\"]", description = "Other trait names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public VariableBaseClassTrait traitClass(String traitClass) {
-        this.traitClass = traitClass;
-        return this;
-    }
-
-    /**
-     * A classification to describe the type of trait and the context it should be considered in. &lt;br/&gt; examples- \&quot;morphological\&quot;, \&quot;phenological\&quot;, \&quot;agronomical\&quot;, \&quot;physiological\&quot;, \&quot;abiotic stress\&quot;, \&quot;biotic stress\&quot;, \&quot;biochemical\&quot;, \&quot;quality traits\&quot;, \&quot;fertility\&quot;, etc.
-     *
-     * @return traitClass
-     **/
-    @Schema(example = "phenological", description = "A classification to describe the type of trait and the context it should be considered in. <br/> examples- \"morphological\", \"phenological\", \"agronomical\", \"physiological\", \"abiotic stress\", \"biotic stress\", \"biochemical\", \"quality traits\", \"fertility\", etc.")
-    public String getTraitClass() {
-        return traitClass;
-    }
-
-    public void setTraitClass(String traitClass) {
-        this.traitClass = traitClass;
-    }
-
-    public VariableBaseClassTrait traitDbId(String traitDbId) {
-        this.traitDbId = traitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trait
-     *
-     * @return traitDbId
-     **/
-    @Schema(example = "9b2e34f5", description = "The ID which uniquely identifies a trait")
-    public String getTraitDbId() {
-        return traitDbId;
-    }
-
-    public void setTraitDbId(String traitDbId) {
-        this.traitDbId = traitDbId;
-    }
-
-    public VariableBaseClassTrait traitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-        return this;
-    }
-
-    /**
-     * The description of a trait
-     *
-     * @return traitDescription
-     **/
-    @Schema(example = "The height of the plant", description = "The description of a trait")
-    public String getTraitDescription() {
-        return traitDescription;
-    }
-
-    public void setTraitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-    }
-
-    public VariableBaseClassTrait traitName(String traitName) {
-        this.traitName = traitName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitName
-     **/
-    @Schema(example = "Height", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public String getTraitName() {
-        return traitName;
-    }
-
-    public void setTraitName(String traitName) {
-        this.traitName = traitName;
-    }
-
-    public VariableBaseClassTrait traitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000012", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public String getTraitPUI() {
-        return traitPUI;
-    }
-
-    public void setTraitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariableBaseClassTrait variableBaseClassTrait = (VariableBaseClassTrait) o;
-        return Objects.equals(this.additionalInfo, variableBaseClassTrait.additionalInfo) &&
-                Objects.equals(this.alternativeAbbreviations, variableBaseClassTrait.alternativeAbbreviations) &&
-                Objects.equals(this.attribute, variableBaseClassTrait.attribute) &&
-                Objects.equals(this.attributePUI, variableBaseClassTrait.attributePUI) &&
-                Objects.equals(this.entity, variableBaseClassTrait.entity) &&
-                Objects.equals(this.entityPUI, variableBaseClassTrait.entityPUI) &&
-                Objects.equals(this.externalReferences, variableBaseClassTrait.externalReferences) &&
-                Objects.equals(this.mainAbbreviation, variableBaseClassTrait.mainAbbreviation) &&
-                Objects.equals(this.ontologyReference, variableBaseClassTrait.ontologyReference) &&
-                Objects.equals(this.status, variableBaseClassTrait.status) &&
-                Objects.equals(this.synonyms, variableBaseClassTrait.synonyms) &&
-                Objects.equals(this.traitClass, variableBaseClassTrait.traitClass) &&
-                Objects.equals(this.traitDbId, variableBaseClassTrait.traitDbId) &&
-                Objects.equals(this.traitDescription, variableBaseClassTrait.traitDescription) &&
-                Objects.equals(this.traitName, variableBaseClassTrait.traitName) &&
-                Objects.equals(this.traitPUI, variableBaseClassTrait.traitPUI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, alternativeAbbreviations, attribute, attributePUI, entity, entityPUI, externalReferences, mainAbbreviation, ontologyReference, status, synonyms, traitClass, traitDbId, traitDescription, traitName, traitPUI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariableBaseClassTrait {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    alternativeAbbreviations: ").append(toIndentedString(alternativeAbbreviations)).append("\n");
-        sb.append("    attribute: ").append(toIndentedString(attribute)).append("\n");
-        sb.append("    attributePUI: ").append(toIndentedString(attributePUI)).append("\n");
-        sb.append("    entity: ").append(toIndentedString(entity)).append("\n");
-        sb.append("    entityPUI: ").append(toIndentedString(entityPUI)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    mainAbbreviation: ").append(toIndentedString(mainAbbreviation)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    traitClass: ").append(toIndentedString(traitClass)).append("\n");
-        sb.append("    traitDbId: ").append(toIndentedString(traitDbId)).append("\n");
-        sb.append("    traitDescription: ").append(toIndentedString(traitDescription)).append("\n");
-        sb.append("    traitName: ").append(toIndentedString(traitName)).append("\n");
-        sb.append("    traitPUI: ").append(toIndentedString(traitPUI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Variant.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Variant.java
deleted file mode 100644
index bdd14669..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/Variant.java
+++ /dev/null
@@ -1,655 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * A &#x60;Variant&#x60; represents a change in DNA sequence relative to some reference. For example, a variant could represent a classic marker, a SNP, or an insertion. This is equivalent to a row in VCF.
- */
-@Schema(description = "A `Variant` represents a change in DNA sequence relative to some reference. For example, a variant could represent a classic marker, a SNP, or an insertion. This is equivalent to a row in VCF.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class Variant {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("alternateBases")
-    private List<String> alternateBases = null;
-
-//https://github.com/plantbreeding/BrAPI/issues/549
-//  @SerializedName("alternate_bases")
-//  private List<String> alternateBases = null;
-
-    @SerializedName("ciend")
-    private List<Integer> ciend = null;
-
-    @SerializedName("cipos")
-    private List<Integer> cipos = null;
-
-    @SerializedName("created")
-    private OffsetDateTime created = null;
-
-    @SerializedName("end")
-    private Integer end = null;
-
-    @SerializedName("externalReferences")
-    private ExternalReferences externalReferences = null;
-
-    @SerializedName("filtersApplied")
-    private Boolean filtersApplied = null;
-
-    @SerializedName("filtersFailed")
-    private List<String> filtersFailed = null;
-
-    @SerializedName("filtersPassed")
-    private Boolean filtersPassed = null;
-
-    @SerializedName("referenceBases")
-    private String referenceBases = null;
-
-    @SerializedName("referenceDbId")
-    private String referenceDbId = null;
-
-    @SerializedName("referenceName")
-    private String referenceName = null;
-
-    @SerializedName("referenceSetDbId")
-    private String referenceSetDbId = null;
-
-    @SerializedName("referenceSetName")
-    private String referenceSetName = null;
-
-    @SerializedName("start")
-    private Integer start = null;
-
-    @SerializedName("svlen")
-    private Integer svlen = null;
-
-    @SerializedName("updated")
-    private OffsetDateTime updated = null;
-
-    @SerializedName("variantDbId")
-    private String variantDbId = null;
-
-    @SerializedName("variantNames")
-    private List<String> variantNames = null;
-
-    @SerializedName("variantSetDbId")
-    private List<String> variantSetDbId = null;
-
-    @SerializedName("variantType")
-    private String variantType = null;
-
-    public Variant additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Variant putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Variant alternateBases(List<String> alternateBases) {
-        this.alternateBases = alternateBases;
-        return this;
-    }
-
-    public Variant addAlternateBasesItem(String alternateBasesItem) {
-        if (this.alternateBases == null) {
-            this.alternateBases = new ArrayList<String>();
-        }
-        this.alternateBases.add(alternateBasesItem);
-        return this;
-    }
-
-    /**
-     * The bases that appear instead of the reference bases. Multiple alternate alleles are possible.
-     *
-     * @return alternateBases
-     **/
-    @Schema(example = "[\"T\",\"TAC\"]", description = "The bases that appear instead of the reference bases. Multiple alternate alleles are possible.")
-    public List<String> getAlternateBases() {
-        return alternateBases;
-    }
-
-    public void setAlternateBases(List<String> alternateBases) {
-        this.alternateBases = alternateBases;
-    }
-
-    public Variant ciend(List<Integer> ciend) {
-        this.ciend = ciend;
-        return this;
-    }
-
-    public Variant addCiendItem(Integer ciendItem) {
-        if (this.ciend == null) {
-            this.ciend = new ArrayList<Integer>();
-        }
-        this.ciend.add(ciendItem);
-        return this;
-    }
-
-    /**
-     * Similar to \&quot;cipos\&quot;, but for the variant&#x27;s end position (which is derived from start + svlen).
-     *
-     * @return ciend
-     **/
-    @Schema(example = "[-1000,0]", description = "Similar to \"cipos\", but for the variant's end position (which is derived from start + svlen).")
-    public List<Integer> getCiend() {
-        return ciend;
-    }
-
-    public void setCiend(List<Integer> ciend) {
-        this.ciend = ciend;
-    }
-
-    public Variant cipos(List<Integer> cipos) {
-        this.cipos = cipos;
-        return this;
-    }
-
-    public Variant addCiposItem(Integer ciposItem) {
-        if (this.cipos == null) {
-            this.cipos = new ArrayList<Integer>();
-        }
-        this.cipos.add(ciposItem);
-        return this;
-    }
-
-    /**
-     * In the case of structural variants, start and end of the variant may not be known with an exact base position. \&quot;cipos\&quot; provides an interval with high confidence for the start position. The interval is provided by 0 or 2 signed integers which are added to the start position. Based on the use in VCF v4.2
-     *
-     * @return cipos
-     **/
-    @Schema(example = "[-12000,1000]", description = "In the case of structural variants, start and end of the variant may not be known with an exact base position. \"cipos\" provides an interval with high confidence for the start position. The interval is provided by 0 or 2 signed integers which are added to the start position. Based on the use in VCF v4.2")
-    public List<Integer> getCipos() {
-        return cipos;
-    }
-
-    public void setCipos(List<Integer> cipos) {
-        this.cipos = cipos;
-    }
-
-    public Variant created(OffsetDateTime created) {
-        this.created = created;
-        return this;
-    }
-
-    /**
-     * The timestamp when this variant was created.
-     *
-     * @return created
-     **/
-    @Schema(description = "The timestamp when this variant was created.")
-    public OffsetDateTime getCreated() {
-        return created;
-    }
-
-    public void setCreated(OffsetDateTime created) {
-        this.created = created;
-    }
-
-    public Variant end(Integer end) {
-        this.end = end;
-        return this;
-    }
-
-    /**
-     * This field is optional and may be ignored if there is no relevant map or reference to be associated with. &lt;br&gt;The end position (exclusive), resulting in [start, end) closed-open interval. This is typically calculated  by &#x60;start + referenceBases.length&#x60;.
-     *
-     * @return end
-     **/
-    @Schema(example = "518", description = "This field is optional and may be ignored if there is no relevant map or reference to be associated with. <br>The end position (exclusive), resulting in [start, end) closed-open interval. This is typically calculated  by `start + referenceBases.length`.")
-    public Integer getEnd() {
-        return end;
-    }
-
-    public void setEnd(Integer end) {
-        this.end = end;
-    }
-
-    public Variant externalReferences(ExternalReferences externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    /**
-     * Get externalReferences
-     *
-     * @return externalReferences
-     **/
-    @Schema(description = "")
-    public ExternalReferences getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(ExternalReferences externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Variant filtersApplied(Boolean filtersApplied) {
-        this.filtersApplied = filtersApplied;
-        return this;
-    }
-
-    /**
-     * True if filters were applied for this variant. VCF column 7 \&quot;FILTER\&quot; any value other than the missing value.
-     *
-     * @return filtersApplied
-     **/
-    @Schema(example = "true", description = "True if filters were applied for this variant. VCF column 7 \"FILTER\" any value other than the missing value.")
-    public Boolean isFiltersApplied() {
-        return filtersApplied;
-    }
-
-    public void setFiltersApplied(Boolean filtersApplied) {
-        this.filtersApplied = filtersApplied;
-    }
-
-    public Variant filtersFailed(List<String> filtersFailed) {
-        this.filtersFailed = filtersFailed;
-        return this;
-    }
-
-    public Variant addFiltersFailedItem(String filtersFailedItem) {
-        if (this.filtersFailed == null) {
-            this.filtersFailed = new ArrayList<String>();
-        }
-        this.filtersFailed.add(filtersFailedItem);
-        return this;
-    }
-
-    /**
-     * Zero or more filters that failed for this variant. VCF column 7 \&quot;FILTER\&quot; shared across all alleles in the same VCF record.
-     *
-     * @return filtersFailed
-     **/
-    @Schema(example = "[\"d629a669\",\"3f14f578\"]", description = "Zero or more filters that failed for this variant. VCF column 7 \"FILTER\" shared across all alleles in the same VCF record.")
-    public List<String> getFiltersFailed() {
-        return filtersFailed;
-    }
-
-    public void setFiltersFailed(List<String> filtersFailed) {
-        this.filtersFailed = filtersFailed;
-    }
-
-    public Variant filtersPassed(Boolean filtersPassed) {
-        this.filtersPassed = filtersPassed;
-        return this;
-    }
-
-    /**
-     * True if all filters for this variant passed. VCF column 7 \&quot;FILTER\&quot; value PASS.
-     *
-     * @return filtersPassed
-     **/
-    @Schema(example = "true", description = "True if all filters for this variant passed. VCF column 7 \"FILTER\" value PASS.")
-    public Boolean isFiltersPassed() {
-        return filtersPassed;
-    }
-
-    public void setFiltersPassed(Boolean filtersPassed) {
-        this.filtersPassed = filtersPassed;
-    }
-
-    public Variant referenceBases(String referenceBases) {
-        this.referenceBases = referenceBases;
-        return this;
-    }
-
-    /**
-     * The reference bases for this variant. They start at the given start position.
-     *
-     * @return referenceBases
-     **/
-    @Schema(example = "A", description = "The reference bases for this variant. They start at the given start position.")
-    public String getReferenceBases() {
-        return referenceBases;
-    }
-
-    public void setReferenceBases(String referenceBases) {
-        this.referenceBases = referenceBases;
-    }
-
-    public Variant referenceDbId(String referenceDbId) {
-        this.referenceDbId = referenceDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Reference
-     *
-     * @return referenceDbId
-     **/
-    @Schema(example = "fc0a81d0", description = "The unique identifier for a Reference")
-    public String getReferenceDbId() {
-        return referenceDbId;
-    }
-
-    public void setReferenceDbId(String referenceDbId) {
-        this.referenceDbId = referenceDbId;
-    }
-
-    public Variant referenceName(String referenceName) {
-        this.referenceName = referenceName;
-        return this;
-    }
-
-    /**
-     * The reference on which this variant occurs. (e.g. &#x60;chr_20&#x60; or &#x60;X&#x60;)
-     *
-     * @return referenceName
-     **/
-    @Schema(example = "chr_20", description = "The reference on which this variant occurs. (e.g. `chr_20` or `X`)")
-    public String getReferenceName() {
-        return referenceName;
-    }
-
-    public void setReferenceName(String referenceName) {
-        this.referenceName = referenceName;
-    }
-
-    public Variant referenceSetDbId(String referenceSetDbId) {
-        this.referenceSetDbId = referenceSetDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a ReferenceSet
-     *
-     * @return referenceSetDbId
-     **/
-    @Schema(example = "c1ecfef1", description = "The unique identifier for a ReferenceSet")
-    public String getReferenceSetDbId() {
-        return referenceSetDbId;
-    }
-
-    public void setReferenceSetDbId(String referenceSetDbId) {
-        this.referenceSetDbId = referenceSetDbId;
-    }
-
-    public Variant referenceSetName(String referenceSetName) {
-        this.referenceSetName = referenceSetName;
-        return this;
-    }
-
-    /**
-     * The human readable name of the ReferenceSet
-     *
-     * @return referenceSetName
-     **/
-    @Schema(example = "The Best Assembly Ever", description = "The human readable name of the ReferenceSet")
-    public String getReferenceSetName() {
-        return referenceSetName;
-    }
-
-    public void setReferenceSetName(String referenceSetName) {
-        this.referenceSetName = referenceSetName;
-    }
-
-    public Variant start(Integer start) {
-        this.start = start;
-        return this;
-    }
-
-    /**
-     * This field is optional and may be ignored if there is no relevant map or reference to be associated with. &lt;br&gt; The start position at which this variant occurs (0-based). This corresponds to the first base of the string  of reference bases. Genomic positions are non-negative integers less than reference length. Variants spanning  the join of circular genomes are represented as two variants one on each side of the join (position 0).
-     *
-     * @return start
-     **/
-    @Schema(example = "500", description = "This field is optional and may be ignored if there is no relevant map or reference to be associated with. <br> The start position at which this variant occurs (0-based). This corresponds to the first base of the string  of reference bases. Genomic positions are non-negative integers less than reference length. Variants spanning  the join of circular genomes are represented as two variants one on each side of the join (position 0).")
-    public Integer getStart() {
-        return start;
-    }
-
-    public void setStart(Integer start) {
-        this.start = start;
-    }
-
-    public Variant svlen(Integer svlen) {
-        this.svlen = svlen;
-        return this;
-    }
-
-    /**
-     * Length of the - if labeled as such in variant_type - structural variation. Based on the use in VCF v4.2
-     *
-     * @return svlen
-     **/
-    @Schema(example = "1500", description = "Length of the - if labeled as such in variant_type - structural variation. Based on the use in VCF v4.2")
-    public Integer getSvlen() {
-        return svlen;
-    }
-
-    public void setSvlen(Integer svlen) {
-        this.svlen = svlen;
-    }
-
-    public Variant updated(OffsetDateTime updated) {
-        this.updated = updated;
-        return this;
-    }
-
-    /**
-     * The time at which this variant was last updated.
-     *
-     * @return updated
-     **/
-    @Schema(description = "The time at which this variant was last updated.")
-    public OffsetDateTime getUpdated() {
-        return updated;
-    }
-
-    public void setUpdated(OffsetDateTime updated) {
-        this.updated = updated;
-    }
-
-    public Variant variantDbId(String variantDbId) {
-        this.variantDbId = variantDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a &#x60;Variant&#x60;
-     *
-     * @return variantDbId
-     **/
-    @Schema(example = "628e89c5", description = "The ID which uniquely identifies a `Variant`")
-    public String getVariantDbId() {
-        return variantDbId;
-    }
-
-    public void setVariantDbId(String variantDbId) {
-        this.variantDbId = variantDbId;
-    }
-
-    public Variant variantNames(List<String> variantNames) {
-        this.variantNames = variantNames;
-        return this;
-    }
-
-    public Variant addVariantNamesItem(String variantNamesItem) {
-        if (this.variantNames == null) {
-            this.variantNames = new ArrayList<String>();
-        }
-        this.variantNames.add(variantNamesItem);
-        return this;
-    }
-
-    /**
-     * A human readable name associated with a &#x60;Variant&#x60;
-     *
-     * @return variantNames
-     **/
-    @Schema(example = "[\"RefSNP_ID_1\",\"06ea312e\"]", description = "A human readable name associated with a `Variant`")
-    public List<String> getVariantNames() {
-        return variantNames;
-    }
-
-    public void setVariantNames(List<String> variantNames) {
-        this.variantNames = variantNames;
-    }
-
-    public Variant variantSetDbId(List<String> variantSetDbId) {
-        this.variantSetDbId = variantSetDbId;
-        return this;
-    }
-
-    public Variant addVariantSetDbIdItem(String variantSetDbIdItem) {
-        if (this.variantSetDbId == null) {
-            this.variantSetDbId = new ArrayList<String>();
-        }
-        this.variantSetDbId.add(variantSetDbIdItem);
-        return this;
-    }
-
-    /**
-     * An array of &#x60;VariantSet&#x60; IDs this variant belongs to. This also defines the &#x60;ReferenceSet&#x60; against which the &#x60;Variant&#x60; is to be interpreted.
-     *
-     * @return variantSetDbId
-     **/
-    @Schema(example = "[\"c8ae400b\",\"ef2c204b\"]", description = "An array of `VariantSet` IDs this variant belongs to. This also defines the `ReferenceSet` against which the `Variant` is to be interpreted.")
-    public List<String> getVariantSetDbId() {
-        return variantSetDbId;
-    }
-
-    public void setVariantSetDbId(List<String> variantSetDbId) {
-        this.variantSetDbId = variantSetDbId;
-    }
-
-    public Variant variantType(String variantType) {
-        this.variantType = variantType;
-        return this;
-    }
-
-    /**
-     * The \&quot;variant_type\&quot; is used to denote e.g. structural variants. Examples:   DUP  : duplication of sequence following \&quot;start\&quot;   DEL  : deletion of sequence following \&quot;start\&quot;
-     *
-     * @return variantType
-     **/
-    @Schema(example = "DUP", description = "The \"variant_type\" is used to denote e.g. structural variants. Examples:   DUP  : duplication of sequence following \"start\"   DEL  : deletion of sequence following \"start\"")
-    public String getVariantType() {
-        return variantType;
-    }
-
-    public void setVariantType(String variantType) {
-        this.variantType = variantType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Variant variant = (Variant) o;
-        return Objects.equals(this.additionalInfo, variant.additionalInfo) &&
-                Objects.equals(this.alternateBases, variant.alternateBases) &&
-                Objects.equals(this.alternateBases, variant.alternateBases) &&
-                Objects.equals(this.ciend, variant.ciend) &&
-                Objects.equals(this.cipos, variant.cipos) &&
-                Objects.equals(this.created, variant.created) &&
-                Objects.equals(this.end, variant.end) &&
-                Objects.equals(this.externalReferences, variant.externalReferences) &&
-                Objects.equals(this.filtersApplied, variant.filtersApplied) &&
-                Objects.equals(this.filtersFailed, variant.filtersFailed) &&
-                Objects.equals(this.filtersPassed, variant.filtersPassed) &&
-                Objects.equals(this.referenceBases, variant.referenceBases) &&
-                Objects.equals(this.referenceDbId, variant.referenceDbId) &&
-                Objects.equals(this.referenceName, variant.referenceName) &&
-                Objects.equals(this.referenceSetDbId, variant.referenceSetDbId) &&
-                Objects.equals(this.referenceSetName, variant.referenceSetName) &&
-                Objects.equals(this.start, variant.start) &&
-                Objects.equals(this.svlen, variant.svlen) &&
-                Objects.equals(this.updated, variant.updated) &&
-                Objects.equals(this.variantDbId, variant.variantDbId) &&
-                Objects.equals(this.variantNames, variant.variantNames) &&
-                Objects.equals(this.variantSetDbId, variant.variantSetDbId) &&
-                Objects.equals(this.variantType, variant.variantType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, alternateBases, alternateBases, ciend, cipos, created, end, externalReferences, filtersApplied, filtersFailed, filtersPassed, referenceBases, referenceDbId, referenceName, referenceSetDbId, referenceSetName, start, svlen, updated, variantDbId, variantNames, variantSetDbId, variantType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Variant {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    alternateBases: ").append(toIndentedString(alternateBases)).append("\n");
-        sb.append("    alternateBases: ").append(toIndentedString(alternateBases)).append("\n");
-        sb.append("    ciend: ").append(toIndentedString(ciend)).append("\n");
-        sb.append("    cipos: ").append(toIndentedString(cipos)).append("\n");
-        sb.append("    created: ").append(toIndentedString(created)).append("\n");
-        sb.append("    end: ").append(toIndentedString(end)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    filtersApplied: ").append(toIndentedString(filtersApplied)).append("\n");
-        sb.append("    filtersFailed: ").append(toIndentedString(filtersFailed)).append("\n");
-        sb.append("    filtersPassed: ").append(toIndentedString(filtersPassed)).append("\n");
-        sb.append("    referenceBases: ").append(toIndentedString(referenceBases)).append("\n");
-        sb.append("    referenceDbId: ").append(toIndentedString(referenceDbId)).append("\n");
-        sb.append("    referenceName: ").append(toIndentedString(referenceName)).append("\n");
-        sb.append("    referenceSetDbId: ").append(toIndentedString(referenceSetDbId)).append("\n");
-        sb.append("    referenceSetName: ").append(toIndentedString(referenceSetName)).append("\n");
-        sb.append("    start: ").append(toIndentedString(start)).append("\n");
-        sb.append("    svlen: ").append(toIndentedString(svlen)).append("\n");
-        sb.append("    updated: ").append(toIndentedString(updated)).append("\n");
-        sb.append("    variantDbId: ").append(toIndentedString(variantDbId)).append("\n");
-        sb.append("    variantNames: ").append(toIndentedString(variantNames)).append("\n");
-        sb.append("    variantSetDbId: ").append(toIndentedString(variantSetDbId)).append("\n");
-        sb.append("    variantType: ").append(toIndentedString(variantType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSet.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSet.java
deleted file mode 100644
index 25b3c40a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSet.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A VariantSet is a collection of variants and variant calls intended to be analyzed together.
- */
-@Schema(description = "A VariantSet is a collection of variants and variant calls intended to be analyzed together.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VariantSet {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("analysis")
-    private List<Analysis> analysis = null;
-
-    @SerializedName("availableFormats")
-    private List<AvailableFormat> availableFormats = null;
-
-    @SerializedName("callSetCount")
-    private Integer callSetCount = null;
-
-    @SerializedName("externalReferences")
-    private ExternalReferences externalReferences = null;
-
-    @SerializedName("metadataFields")
-    private List<VariantSetMetadataFields> metadataFields = null;
-
-    @SerializedName("referenceSetDbId")
-    private String referenceSetDbId = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("variantCount")
-    private Integer variantCount = null;
-
-    @SerializedName("variantSetDbId")
-    private String variantSetDbId = null;
-
-    @SerializedName("variantSetName")
-    private String variantSetName = null;
-
-    public VariantSet additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public VariantSet putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public VariantSet analysis(List<Analysis> analysis) {
-        this.analysis = analysis;
-        return this;
-    }
-
-    public VariantSet addAnalysisItem(Analysis analysisItem) {
-        if (this.analysis == null) {
-            this.analysis = new ArrayList<Analysis>();
-        }
-        this.analysis.add(analysisItem);
-        return this;
-    }
-
-    /**
-     * Set of Analysis descriptors for this VariantSet
-     *
-     * @return analysis
-     **/
-    @Schema(description = "Set of Analysis descriptors for this VariantSet")
-    public List<Analysis> getAnalysis() {
-        return analysis;
-    }
-
-    public void setAnalysis(List<Analysis> analysis) {
-        this.analysis = analysis;
-    }
-
-    public VariantSet availableFormats(List<AvailableFormat> availableFormats) {
-        this.availableFormats = availableFormats;
-        return this;
-    }
-
-    public VariantSet addAvailableFormatsItem(AvailableFormat availableFormatsItem) {
-        if (this.availableFormats == null) {
-            this.availableFormats = new ArrayList<AvailableFormat>();
-        }
-        this.availableFormats.add(availableFormatsItem);
-        return this;
-    }
-
-    /**
-     * When the data for a VariantSet is retrieved, it can be retrieved in a variety of data formats and file formats.  &lt;br/&gt;&#x27;dataFormat&#x27; defines the structure of the data within a file (ie DartSeq, VCF, Hapmap, tabular, etc) &lt;br/&gt;&#x27;fileFormat&#x27; defines the MIME type of the file (ie text/csv, application/excel, application/zip). This should also be reflected in the Accept and ContentType HTTP headers for every relevant request and response.
-     *
-     * @return availableFormats
-     **/
-    @Schema(description = "When the data for a VariantSet is retrieved, it can be retrieved in a variety of data formats and file formats.  <br/>'dataFormat' defines the structure of the data within a file (ie DartSeq, VCF, Hapmap, tabular, etc) <br/>'fileFormat' defines the MIME type of the file (ie text/csv, application/excel, application/zip). This should also be reflected in the Accept and ContentType HTTP headers for every relevant request and response.")
-    public List<AvailableFormat> getAvailableFormats() {
-        return availableFormats;
-    }
-
-    public void setAvailableFormats(List<AvailableFormat> availableFormats) {
-        this.availableFormats = availableFormats;
-    }
-
-    public VariantSet callSetCount(Integer callSetCount) {
-        this.callSetCount = callSetCount;
-        return this;
-    }
-
-    /**
-     * The number of CallSets included in this VariantSet
-     *
-     * @return callSetCount
-     **/
-    @Schema(example = "341", description = "The number of CallSets included in this VariantSet")
-    public Integer getCallSetCount() {
-        return callSetCount;
-    }
-
-    public void setCallSetCount(Integer callSetCount) {
-        this.callSetCount = callSetCount;
-    }
-
-    public VariantSet externalReferences(ExternalReferences externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    /**
-     * Get externalReferences
-     *
-     * @return externalReferences
-     **/
-    @Schema(description = "")
-    public ExternalReferences getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(ExternalReferences externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public VariantSet metadataFields(List<VariantSetMetadataFields> metadataFields) {
-        this.metadataFields = metadataFields;
-        return this;
-    }
-
-    public VariantSet addMetadataFieldsItem(VariantSetMetadataFields metadataFieldsItem) {
-        if (this.metadataFields == null) {
-            this.metadataFields = new ArrayList<VariantSetMetadataFields>();
-        }
-        this.metadataFields.add(metadataFieldsItem);
-        return this;
-    }
-
-    /**
-     * The &#x27;metadataFields&#x27; array indicates which types of genotyping data and metadata are available in the VariantSet.  &lt;br&gt; When possible, these field names and abbreviations should follow the VCF standard
-     *
-     * @return metadataFields
-     **/
-    @Schema(description = "The 'metadataFields' array indicates which types of genotyping data and metadata are available in the VariantSet.  <br> When possible, these field names and abbreviations should follow the VCF standard ")
-    public List<VariantSetMetadataFields> getMetadataFields() {
-        return metadataFields;
-    }
-
-    public void setMetadataFields(List<VariantSetMetadataFields> metadataFields) {
-        this.metadataFields = metadataFields;
-    }
-
-    public VariantSet referenceSetDbId(String referenceSetDbId) {
-        this.referenceSetDbId = referenceSetDbId;
-        return this;
-    }
-
-    /**
-     * The ID of the reference set that describes the sequences used by the variants in this set.
-     *
-     * @return referenceSetDbId
-     **/
-    @Schema(example = "57eae639", description = "The ID of the reference set that describes the sequences used by the variants in this set.")
-    public String getReferenceSetDbId() {
-        return referenceSetDbId;
-    }
-
-    public void setReferenceSetDbId(String referenceSetDbId) {
-        this.referenceSetDbId = referenceSetDbId;
-    }
-
-    public VariantSet studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID of the dataset this variant set belongs to.
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "2fc3b034", description = "The ID of the dataset this variant set belongs to.")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public VariantSet variantCount(Integer variantCount) {
-        this.variantCount = variantCount;
-        return this;
-    }
-
-    /**
-     * The number of Variants included in this VariantSet
-     *
-     * @return variantCount
-     **/
-    @Schema(example = "250", description = "The number of Variants included in this VariantSet")
-    public Integer getVariantCount() {
-        return variantCount;
-    }
-
-    public void setVariantCount(Integer variantCount) {
-        this.variantCount = variantCount;
-    }
-
-    public VariantSet variantSetDbId(String variantSetDbId) {
-        this.variantSetDbId = variantSetDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a VariantSet
-     *
-     * @return variantSetDbId
-     **/
-    @Schema(example = "87a6ac1e", description = "The unique identifier for a VariantSet")
-    public String getVariantSetDbId() {
-        return variantSetDbId;
-    }
-
-    public void setVariantSetDbId(String variantSetDbId) {
-        this.variantSetDbId = variantSetDbId;
-    }
-
-    public VariantSet variantSetName(String variantSetName) {
-        this.variantSetName = variantSetName;
-        return this;
-    }
-
-    /**
-     * The human readable name for a VariantSet
-     *
-     * @return variantSetName
-     **/
-    @Schema(example = "Maize QC DataSet 002334", description = "The human readable name for a VariantSet")
-    public String getVariantSetName() {
-        return variantSetName;
-    }
-
-    public void setVariantSetName(String variantSetName) {
-        this.variantSetName = variantSetName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariantSet variantSet = (VariantSet) o;
-        return Objects.equals(this.additionalInfo, variantSet.additionalInfo) &&
-                Objects.equals(this.analysis, variantSet.analysis) &&
-                Objects.equals(this.availableFormats, variantSet.availableFormats) &&
-                Objects.equals(this.callSetCount, variantSet.callSetCount) &&
-                Objects.equals(this.externalReferences, variantSet.externalReferences) &&
-                Objects.equals(this.metadataFields, variantSet.metadataFields) &&
-                Objects.equals(this.referenceSetDbId, variantSet.referenceSetDbId) &&
-                Objects.equals(this.studyDbId, variantSet.studyDbId) &&
-                Objects.equals(this.variantCount, variantSet.variantCount) &&
-                Objects.equals(this.variantSetDbId, variantSet.variantSetDbId) &&
-                Objects.equals(this.variantSetName, variantSet.variantSetName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, analysis, availableFormats, callSetCount, externalReferences, metadataFields, referenceSetDbId, studyDbId, variantCount, variantSetDbId, variantSetName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariantSet {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    analysis: ").append(toIndentedString(analysis)).append("\n");
-        sb.append("    availableFormats: ").append(toIndentedString(availableFormats)).append("\n");
-        sb.append("    callSetCount: ").append(toIndentedString(callSetCount)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    metadataFields: ").append(toIndentedString(metadataFields)).append("\n");
-        sb.append("    referenceSetDbId: ").append(toIndentedString(referenceSetDbId)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    variantCount: ").append(toIndentedString(variantCount)).append("\n");
-        sb.append("    variantSetDbId: ").append(toIndentedString(variantSetDbId)).append("\n");
-        sb.append("    variantSetName: ").append(toIndentedString(variantSetName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetMetadataFields.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetMetadataFields.java
deleted file mode 100644
index e6e4d644..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetMetadataFields.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * This represents a type of genotyping data or metadata available in this VariantSet
- */
-@Schema(description = "This represents a type of genotyping data or metadata available in this VariantSet")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VariantSetMetadataFields {
-    /**
-     * The type of field represented in this Genotype Field. This is intended to help parse the data out of JSON.
-     */
-    @JsonAdapter(DataTypeEnum.Adapter.class)
-    public enum DataTypeEnum {
-        STRING("string"),
-        INTEGER("integer"),
-        FLOAT("float"),
-        BOOLEAN("boolean");
-
-        private String value;
-
-        DataTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypeEnum fromValue(String input) {
-            for (DataTypeEnum b : DataTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataType")
-    private DataTypeEnum dataType = null;
-
-    @SerializedName("fieldAbbreviation")
-    private String fieldAbbreviation = null;
-
-    @SerializedName("fieldName")
-    private String fieldName = null;
-
-    public VariantSetMetadataFields dataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-        return this;
-    }
-
-    /**
-     * The type of field represented in this Genotype Field. This is intended to help parse the data out of JSON.
-     *
-     * @return dataType
-     **/
-    @Schema(example = "integer", description = "The type of field represented in this Genotype Field. This is intended to help parse the data out of JSON.")
-    public DataTypeEnum getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-    }
-
-    public VariantSetMetadataFields fieldAbbreviation(String fieldAbbreviation) {
-        this.fieldAbbreviation = fieldAbbreviation;
-        return this;
-    }
-
-    /**
-     * The abbreviated code of the field represented in this Genotype Field. These codes should match the VCF standard when possible. Examples include: \&quot;GQ\&quot;, \&quot;RD\&quot;, and \&quot;HQ\&quot;
-     *
-     * @return fieldAbbreviation
-     **/
-    @Schema(example = "GQ", description = "The abbreviated code of the field represented in this Genotype Field. These codes should match the VCF standard when possible. Examples include: \"GQ\", \"RD\", and \"HQ\"")
-    public String getFieldAbbreviation() {
-        return fieldAbbreviation;
-    }
-
-    public void setFieldAbbreviation(String fieldAbbreviation) {
-        this.fieldAbbreviation = fieldAbbreviation;
-    }
-
-    public VariantSetMetadataFields fieldName(String fieldName) {
-        this.fieldName = fieldName;
-        return this;
-    }
-
-    /**
-     * The name of the field represented in this Genotype Field. Examples include: \&quot;Genotype Quality\&quot;, \&quot;Read Depth\&quot;, and \&quot;Haplotype Quality\&quot;
-     *
-     * @return fieldName
-     **/
-    @Schema(example = "Genotype Quality", description = "The name of the field represented in this Genotype Field. Examples include: \"Genotype Quality\", \"Read Depth\", and \"Haplotype Quality\"")
-    public String getFieldName() {
-        return fieldName;
-    }
-
-    public void setFieldName(String fieldName) {
-        this.fieldName = fieldName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariantSetMetadataFields variantSetMetadataFields = (VariantSetMetadataFields) o;
-        return Objects.equals(this.dataType, variantSetMetadataFields.dataType) &&
-                Objects.equals(this.fieldAbbreviation, variantSetMetadataFields.fieldAbbreviation) &&
-                Objects.equals(this.fieldName, variantSetMetadataFields.fieldName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(dataType, fieldAbbreviation, fieldName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariantSetMetadataFields {\n");
-
-        sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
-        sb.append("    fieldAbbreviation: ").append(toIndentedString(fieldAbbreviation)).append("\n");
-        sb.append("    fieldName: ").append(toIndentedString(fieldName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetResponse.java
deleted file mode 100644
index e166319d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * VariantSetResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VariantSetResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private VariantSet result = null;
-
-    public VariantSetResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public VariantSetResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public VariantSetResponse result(VariantSet result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public VariantSet getResult() {
-        return result;
-    }
-
-    public void setResult(VariantSet result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariantSetResponse variantSetResponse = (VariantSetResponse) o;
-        return Objects.equals(this._atContext, variantSetResponse._atContext) &&
-                Objects.equals(this.metadata, variantSetResponse.metadata) &&
-                Objects.equals(this.result, variantSetResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariantSetResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetsExtractRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetsExtractRequest.java
deleted file mode 100644
index d5f5afea..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetsExtractRequest.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Request object for extracting data subsets as new Variant Sets
- */
-@Schema(description = "Request object for extracting data subsets as new Variant Sets")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VariantSetsExtractRequest {
-    @SerializedName("callSetDbIds")
-    private List<String> callSetDbIds = null;
-
-    @SerializedName("expandHomozygotes")
-    private Boolean expandHomozygotes = null;
-
-    @SerializedName("sepPhased")
-    private String sepPhased = null;
-
-    @SerializedName("sepUnphased")
-    private String sepUnphased = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("unknownString")
-    private String unknownString = null;
-
-    @SerializedName("variantDbIds")
-    private List<String> variantDbIds = null;
-
-    @SerializedName("variantSetDbIds")
-    private List<String> variantSetDbIds = null;
-
-    public VariantSetsExtractRequest callSetDbIds(List<String> callSetDbIds) {
-        this.callSetDbIds = callSetDbIds;
-        return this;
-    }
-
-    public VariantSetsExtractRequest addCallSetDbIdsItem(String callSetDbIdsItem) {
-        if (this.callSetDbIds == null) {
-            this.callSetDbIds = new ArrayList<String>();
-        }
-        this.callSetDbIds.add(callSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The CallSet to search.
-     *
-     * @return callSetDbIds
-     **/
-    @Schema(example = "[\"9569cfc4\",\"da1e888c\"]", description = "The CallSet to search.")
-    public List<String> getCallSetDbIds() {
-        return callSetDbIds;
-    }
-
-    public void setCallSetDbIds(List<String> callSetDbIds) {
-        this.callSetDbIds = callSetDbIds;
-    }
-
-    public VariantSetsExtractRequest expandHomozygotes(Boolean expandHomozygotes) {
-        this.expandHomozygotes = expandHomozygotes;
-        return this;
-    }
-
-    /**
-     * Should homozygotes be expanded (true) or collapsed into a single occurrence (false)
-     *
-     * @return expandHomozygotes
-     **/
-    @Schema(example = "true", description = "Should homozygotes be expanded (true) or collapsed into a single occurrence (false)")
-    public Boolean isExpandHomozygotes() {
-        return expandHomozygotes;
-    }
-
-    public void setExpandHomozygotes(Boolean expandHomozygotes) {
-        this.expandHomozygotes = expandHomozygotes;
-    }
-
-    public VariantSetsExtractRequest sepPhased(String sepPhased) {
-        this.sepPhased = sepPhased;
-        return this;
-    }
-
-    /**
-     * The string used as a separator for phased allele calls.
-     *
-     * @return sepPhased
-     **/
-    @Schema(example = "~", description = "The string used as a separator for phased allele calls.")
-    public String getSepPhased() {
-        return sepPhased;
-    }
-
-    public void setSepPhased(String sepPhased) {
-        this.sepPhased = sepPhased;
-    }
-
-    public VariantSetsExtractRequest sepUnphased(String sepUnphased) {
-        this.sepUnphased = sepUnphased;
-        return this;
-    }
-
-    /**
-     * The string used as a separator for unphased allele calls.
-     *
-     * @return sepUnphased
-     **/
-    @Schema(example = "|", description = "The string used as a separator for unphased allele calls.")
-    public String getSepUnphased() {
-        return sepUnphased;
-    }
-
-    public void setSepUnphased(String sepUnphased) {
-        this.sepUnphased = sepUnphased;
-    }
-
-    public VariantSetsExtractRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public VariantSetsExtractRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public VariantSetsExtractRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public VariantSetsExtractRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public VariantSetsExtractRequest unknownString(String unknownString) {
-        this.unknownString = unknownString;
-        return this;
-    }
-
-    /**
-     * The string used as a representation for missing data.
-     *
-     * @return unknownString
-     **/
-    @Schema(example = "-", description = "The string used as a representation for missing data.")
-    public String getUnknownString() {
-        return unknownString;
-    }
-
-    public void setUnknownString(String unknownString) {
-        this.unknownString = unknownString;
-    }
-
-    public VariantSetsExtractRequest variantDbIds(List<String> variantDbIds) {
-        this.variantDbIds = variantDbIds;
-        return this;
-    }
-
-    public VariantSetsExtractRequest addVariantDbIdsItem(String variantDbIdsItem) {
-        if (this.variantDbIds == null) {
-            this.variantDbIds = new ArrayList<String>();
-        }
-        this.variantDbIds.add(variantDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The Variant to search.
-     *
-     * @return variantDbIds
-     **/
-    @Schema(example = "[\"c80f068b\",\"eb7c5f50\"]", description = "The Variant to search.")
-    public List<String> getVariantDbIds() {
-        return variantDbIds;
-    }
-
-    public void setVariantDbIds(List<String> variantDbIds) {
-        this.variantDbIds = variantDbIds;
-    }
-
-    public VariantSetsExtractRequest variantSetDbIds(List<String> variantSetDbIds) {
-        this.variantSetDbIds = variantSetDbIds;
-        return this;
-    }
-
-    public VariantSetsExtractRequest addVariantSetDbIdsItem(String variantSetDbIdsItem) {
-        if (this.variantSetDbIds == null) {
-            this.variantSetDbIds = new ArrayList<String>();
-        }
-        this.variantSetDbIds.add(variantSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The VariantSet to search.
-     *
-     * @return variantSetDbIds
-     **/
-    @Schema(example = "[\"b2903842\",\"dcbb8558\"]", description = "The VariantSet to search.")
-    public List<String> getVariantSetDbIds() {
-        return variantSetDbIds;
-    }
-
-    public void setVariantSetDbIds(List<String> variantSetDbIds) {
-        this.variantSetDbIds = variantSetDbIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariantSetsExtractRequest variantSetsExtractRequest = (VariantSetsExtractRequest) o;
-        return Objects.equals(this.callSetDbIds, variantSetsExtractRequest.callSetDbIds) &&
-                Objects.equals(this.expandHomozygotes, variantSetsExtractRequest.expandHomozygotes) &&
-                Objects.equals(this.sepPhased, variantSetsExtractRequest.sepPhased) &&
-                Objects.equals(this.sepUnphased, variantSetsExtractRequest.sepUnphased) &&
-                Objects.equals(this.studyDbIds, variantSetsExtractRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, variantSetsExtractRequest.studyNames) &&
-                Objects.equals(this.unknownString, variantSetsExtractRequest.unknownString) &&
-                Objects.equals(this.variantDbIds, variantSetsExtractRequest.variantDbIds) &&
-                Objects.equals(this.variantSetDbIds, variantSetsExtractRequest.variantSetDbIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(callSetDbIds, expandHomozygotes, sepPhased, sepUnphased, studyDbIds, studyNames, unknownString, variantDbIds, variantSetDbIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariantSetsExtractRequest {\n");
-
-        sb.append("    callSetDbIds: ").append(toIndentedString(callSetDbIds)).append("\n");
-        sb.append("    expandHomozygotes: ").append(toIndentedString(expandHomozygotes)).append("\n");
-        sb.append("    sepPhased: ").append(toIndentedString(sepPhased)).append("\n");
-        sb.append("    sepUnphased: ").append(toIndentedString(sepUnphased)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    unknownString: ").append(toIndentedString(unknownString)).append("\n");
-        sb.append("    variantDbIds: ").append(toIndentedString(variantDbIds)).append("\n");
-        sb.append("    variantSetDbIds: ").append(toIndentedString(variantSetDbIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetsListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetsListResponse.java
deleted file mode 100644
index b4898c0e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetsListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * VariantSetsListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VariantSetsListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private VariantSetsListResponseResult result = null;
-
-    public VariantSetsListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public VariantSetsListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public VariantSetsListResponse result(VariantSetsListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public VariantSetsListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(VariantSetsListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariantSetsListResponse variantSetsListResponse = (VariantSetsListResponse) o;
-        return Objects.equals(this._atContext, variantSetsListResponse._atContext) &&
-                Objects.equals(this.metadata, variantSetsListResponse.metadata) &&
-                Objects.equals(this.result, variantSetsListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariantSetsListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetsListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetsListResponseResult.java
deleted file mode 100644
index 8222b3af..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetsListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * VariantSetsListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VariantSetsListResponseResult {
-    @SerializedName("data")
-    private List<VariantSet> data = new ArrayList<VariantSet>();
-
-    public VariantSetsListResponseResult data(List<VariantSet> data) {
-        this.data = data;
-        return this;
-    }
-
-    public VariantSetsListResponseResult addDataItem(VariantSet dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<VariantSet> getData() {
-        return data;
-    }
-
-    public void setData(List<VariantSet> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariantSetsListResponseResult variantSetsListResponseResult = (VariantSetsListResponseResult) o;
-        return Objects.equals(this.data, variantSetsListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariantSetsListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetsSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetsSearchRequest.java
deleted file mode 100644
index e3f3215e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSetsSearchRequest.java
+++ /dev/null
@@ -1,594 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * VariantSetsSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VariantSetsSearchRequest {
-    @SerializedName("callSetDbIds")
-    private List<String> callSetDbIds = null;
-
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("referenceDbIds")
-    private List<String> referenceDbIds = null;
-
-    @SerializedName("referenceSetDbIds")
-    private List<String> referenceSetDbIds = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    @SerializedName("variantDbIds")
-    private List<String> variantDbIds = null;
-
-    @SerializedName("variantSetDbIds")
-    private List<String> variantSetDbIds = null;
-
-    public VariantSetsSearchRequest callSetDbIds(List<String> callSetDbIds) {
-        this.callSetDbIds = callSetDbIds;
-        return this;
-    }
-
-    public VariantSetsSearchRequest addCallSetDbIdsItem(String callSetDbIdsItem) {
-        if (this.callSetDbIds == null) {
-            this.callSetDbIds = new ArrayList<String>();
-        }
-        this.callSetDbIds.add(callSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier representing a CallSet
-     *
-     * @return callSetDbIds
-     **/
-    @Schema(example = "[\"9569cfc4\",\"da1e888c\"]", description = "The unique identifier representing a CallSet")
-    public List<String> getCallSetDbIds() {
-        return callSetDbIds;
-    }
-
-    public void setCallSetDbIds(List<String> callSetDbIds) {
-        this.callSetDbIds = callSetDbIds;
-    }
-
-    public VariantSetsSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public VariantSetsSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public VariantSetsSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public VariantSetsSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public VariantSetsSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public VariantSetsSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public VariantSetsSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public VariantSetsSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public VariantSetsSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public VariantSetsSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public VariantSetsSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public VariantSetsSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public VariantSetsSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public VariantSetsSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public VariantSetsSearchRequest referenceDbIds(List<String> referenceDbIds) {
-        this.referenceDbIds = referenceDbIds;
-        return this;
-    }
-
-    public VariantSetsSearchRequest addReferenceDbIdsItem(String referenceDbIdsItem) {
-        if (this.referenceDbIds == null) {
-            this.referenceDbIds = new ArrayList<String>();
-        }
-        this.referenceDbIds.add(referenceDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier representing a genotype Reference
-     *
-     * @return referenceDbIds
-     **/
-    @Schema(example = "[\"89ab4d17\",\"74d3b63d\"]", description = "The unique identifier representing a genotype Reference")
-    public List<String> getReferenceDbIds() {
-        return referenceDbIds;
-    }
-
-    public void setReferenceDbIds(List<String> referenceDbIds) {
-        this.referenceDbIds = referenceDbIds;
-    }
-
-    public VariantSetsSearchRequest referenceSetDbIds(List<String> referenceSetDbIds) {
-        this.referenceSetDbIds = referenceSetDbIds;
-        return this;
-    }
-
-    public VariantSetsSearchRequest addReferenceSetDbIdsItem(String referenceSetDbIdsItem) {
-        if (this.referenceSetDbIds == null) {
-            this.referenceSetDbIds = new ArrayList<String>();
-        }
-        this.referenceSetDbIds.add(referenceSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier representing a genotype ReferenceSet
-     *
-     * @return referenceSetDbIds
-     **/
-    @Schema(example = "[\"d3b63d4d\",\"3b63d74b\"]", description = "The unique identifier representing a genotype ReferenceSet")
-    public List<String> getReferenceSetDbIds() {
-        return referenceSetDbIds;
-    }
-
-    public void setReferenceSetDbIds(List<String> referenceSetDbIds) {
-        this.referenceSetDbIds = referenceSetDbIds;
-    }
-
-    public VariantSetsSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public VariantSetsSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public VariantSetsSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public VariantSetsSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public VariantSetsSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public VariantSetsSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public VariantSetsSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public VariantSetsSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-    public VariantSetsSearchRequest variantDbIds(List<String> variantDbIds) {
-        this.variantDbIds = variantDbIds;
-        return this;
-    }
-
-    public VariantSetsSearchRequest addVariantDbIdsItem(String variantDbIdsItem) {
-        if (this.variantDbIds == null) {
-            this.variantDbIds = new ArrayList<String>();
-        }
-        this.variantDbIds.add(variantDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier representing a Variant
-     *
-     * @return variantDbIds
-     **/
-    @Schema(example = "[\"c80f068b\",\"eb7c5f50\"]", description = "The unique identifier representing a Variant")
-    public List<String> getVariantDbIds() {
-        return variantDbIds;
-    }
-
-    public void setVariantDbIds(List<String> variantDbIds) {
-        this.variantDbIds = variantDbIds;
-    }
-
-    public VariantSetsSearchRequest variantSetDbIds(List<String> variantSetDbIds) {
-        this.variantSetDbIds = variantSetDbIds;
-        return this;
-    }
-
-    public VariantSetsSearchRequest addVariantSetDbIdsItem(String variantSetDbIdsItem) {
-        if (this.variantSetDbIds == null) {
-            this.variantSetDbIds = new ArrayList<String>();
-        }
-        this.variantSetDbIds.add(variantSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier representing a VariantSet
-     *
-     * @return variantSetDbIds
-     **/
-    @Schema(example = "[\"b2903842\",\"dcbb8558\"]", description = "The unique identifier representing a VariantSet")
-    public List<String> getVariantSetDbIds() {
-        return variantSetDbIds;
-    }
-
-    public void setVariantSetDbIds(List<String> variantSetDbIds) {
-        this.variantSetDbIds = variantSetDbIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariantSetsSearchRequest variantSetsSearchRequest = (VariantSetsSearchRequest) o;
-        return Objects.equals(this.callSetDbIds, variantSetsSearchRequest.callSetDbIds) &&
-                Objects.equals(this.commonCropNames, variantSetsSearchRequest.commonCropNames) &&
-                Objects.equals(this.externalReferenceIDs, variantSetsSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, variantSetsSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, variantSetsSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.page, variantSetsSearchRequest.page) &&
-                Objects.equals(this.pageSize, variantSetsSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, variantSetsSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, variantSetsSearchRequest.programNames) &&
-                Objects.equals(this.referenceDbIds, variantSetsSearchRequest.referenceDbIds) &&
-                Objects.equals(this.referenceSetDbIds, variantSetsSearchRequest.referenceSetDbIds) &&
-                Objects.equals(this.studyDbIds, variantSetsSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, variantSetsSearchRequest.studyNames) &&
-                Objects.equals(this.trialDbIds, variantSetsSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, variantSetsSearchRequest.trialNames) &&
-                Objects.equals(this.variantDbIds, variantSetsSearchRequest.variantDbIds) &&
-                Objects.equals(this.variantSetDbIds, variantSetsSearchRequest.variantSetDbIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(callSetDbIds, commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, page, pageSize, programDbIds, programNames, referenceDbIds, referenceSetDbIds, studyDbIds, studyNames, trialDbIds, trialNames, variantDbIds, variantSetDbIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariantSetsSearchRequest {\n");
-
-        sb.append("    callSetDbIds: ").append(toIndentedString(callSetDbIds)).append("\n");
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    referenceDbIds: ").append(toIndentedString(referenceDbIds)).append("\n");
-        sb.append("    referenceSetDbIds: ").append(toIndentedString(referenceSetDbIds)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("    variantDbIds: ").append(toIndentedString(variantDbIds)).append("\n");
-        sb.append("    variantSetDbIds: ").append(toIndentedString(variantSetDbIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSingleResponse.java
deleted file mode 100644
index 4848e822..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * VariantSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VariantSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Variant result = null;
-
-    public VariantSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public VariantSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public VariantSingleResponse result(Variant result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Variant getResult() {
-        return result;
-    }
-
-    public void setResult(Variant result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariantSingleResponse variantSingleResponse = (VariantSingleResponse) o;
-        return Objects.equals(this._atContext, variantSingleResponse._atContext) &&
-                Objects.equals(this.metadata, variantSingleResponse.metadata) &&
-                Objects.equals(this.result, variantSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariantSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantsListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantsListResponse.java
deleted file mode 100644
index bcd9492d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantsListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.MetadataTokenPagination;
-
-import java.util.Objects;
-
-/**
- * VariantsListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VariantsListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private MetadataTokenPagination metadata = null;
-
-    @SerializedName("result")
-    private VariantsListResponseResult result = null;
-
-    public VariantsListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public VariantsListResponse metadata(MetadataTokenPagination metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public MetadataTokenPagination getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(MetadataTokenPagination metadata) {
-        this.metadata = metadata;
-    }
-
-    public VariantsListResponse result(VariantsListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public VariantsListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(VariantsListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariantsListResponse variantsListResponse = (VariantsListResponse) o;
-        return Objects.equals(this._atContext, variantsListResponse._atContext) &&
-                Objects.equals(this.metadata, variantsListResponse.metadata) &&
-                Objects.equals(this.result, variantsListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariantsListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantsListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantsListResponseResult.java
deleted file mode 100644
index 863b9f07..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantsListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * VariantsListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VariantsListResponseResult {
-    @SerializedName("data")
-    private List<Variant> data = new ArrayList<Variant>();
-
-    public VariantsListResponseResult data(List<Variant> data) {
-        this.data = data;
-        return this;
-    }
-
-    public VariantsListResponseResult addDataItem(Variant dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Variant> getData() {
-        return data;
-    }
-
-    public void setData(List<Variant> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariantsListResponseResult variantsListResponseResult = (VariantsListResponseResult) o;
-        return Objects.equals(this.data, variantsListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariantsListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantsSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantsSearchRequest.java
deleted file mode 100644
index ddbc500c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VariantsSearchRequest.java
+++ /dev/null
@@ -1,690 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * VariantsSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VariantsSearchRequest {
-    @SerializedName("callSetDbIds")
-    private List<String> callSetDbIds = null;
-
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("end")
-    private Integer end = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("pageToken")
-    private String pageToken = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("referenceDbId")
-    private String referenceDbId = null;
-
-    @SerializedName("referenceDbIds")
-    private List<String> referenceDbIds = null;
-
-    @SerializedName("referenceSetDbIds")
-    private List<String> referenceSetDbIds = null;
-
-    @SerializedName("start")
-    private Integer start = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    @SerializedName("variantDbIds")
-    private List<String> variantDbIds = null;
-
-    @SerializedName("variantSetDbIds")
-    private List<String> variantSetDbIds = null;
-
-    public VariantsSearchRequest callSetDbIds(List<String> callSetDbIds) {
-        this.callSetDbIds = callSetDbIds;
-        return this;
-    }
-
-    public VariantsSearchRequest addCallSetDbIdsItem(String callSetDbIdsItem) {
-        if (this.callSetDbIds == null) {
-            this.callSetDbIds = new ArrayList<String>();
-        }
-        this.callSetDbIds.add(callSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Parameter unnecessary. Github issue number #474  &lt;br/&gt;Only return variant calls which belong to call sets with these IDs. If unspecified, return all variants and no variant call objects.
-     *
-     * @return callSetDbIds
-     **/
-    @Schema(example = "[\"4639fe3e\",\"b60d900b\"]", description = "**Deprecated in v2.1** Parameter unnecessary. Github issue number #474  <br/>Only return variant calls which belong to call sets with these IDs. If unspecified, return all variants and no variant call objects.")
-    public List<String> getCallSetDbIds() {
-        return callSetDbIds;
-    }
-
-    public void setCallSetDbIds(List<String> callSetDbIds) {
-        this.callSetDbIds = callSetDbIds;
-    }
-
-    public VariantsSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public VariantsSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public VariantsSearchRequest end(Integer end) {
-        this.end = end;
-        return this;
-    }
-
-    /**
-     * The end of the window (0-based, exclusive) for which overlapping variants should be returned.
-     *
-     * @return end
-     **/
-    @Schema(example = "1500", description = "The end of the window (0-based, exclusive) for which overlapping variants should be returned.")
-    public Integer getEnd() {
-        return end;
-    }
-
-    public void setEnd(Integer end) {
-        this.end = end;
-    }
-
-    public VariantsSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public VariantsSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public VariantsSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public VariantsSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public VariantsSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public VariantsSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public VariantsSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public VariantsSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public VariantsSearchRequest pageToken(String pageToken) {
-        this.pageToken = pageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;Used to request a specific page of data to be returned. &lt;br&gt;Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.
-     *
-     * @return pageToken
-     **/
-    @Schema(example = "33c27874", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>Used to request a specific page of data to be returned. <br>Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively. ")
-    public String getPageToken() {
-        return pageToken;
-    }
-
-    public void setPageToken(String pageToken) {
-        this.pageToken = pageToken;
-    }
-
-    public VariantsSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public VariantsSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public VariantsSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public VariantsSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public VariantsSearchRequest referenceDbId(String referenceDbId) {
-        this.referenceDbId = referenceDbId;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;referenceDbIds&#x60;. Github issue number #472 &lt;br/&gt;Only return variants on this reference.
-     *
-     * @return referenceDbId
-     **/
-    @Schema(example = "120a2d5c", description = "**Deprecated in v2.1** Please use `referenceDbIds`. Github issue number #472 <br/>Only return variants on this reference.")
-    public String getReferenceDbId() {
-        return referenceDbId;
-    }
-
-    public void setReferenceDbId(String referenceDbId) {
-        this.referenceDbId = referenceDbId;
-    }
-
-    public VariantsSearchRequest referenceDbIds(List<String> referenceDbIds) {
-        this.referenceDbIds = referenceDbIds;
-        return this;
-    }
-
-    public VariantsSearchRequest addReferenceDbIdsItem(String referenceDbIdsItem) {
-        if (this.referenceDbIds == null) {
-            this.referenceDbIds = new ArrayList<String>();
-        }
-        this.referenceDbIds.add(referenceDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier representing a genotype &#x60;Reference&#x60;
-     *
-     * @return referenceDbIds
-     **/
-    @Schema(example = "[\"89ab4d17\",\"74d3b63d\"]", description = "The unique identifier representing a genotype `Reference`")
-    public List<String> getReferenceDbIds() {
-        return referenceDbIds;
-    }
-
-    public void setReferenceDbIds(List<String> referenceDbIds) {
-        this.referenceDbIds = referenceDbIds;
-    }
-
-    public VariantsSearchRequest referenceSetDbIds(List<String> referenceSetDbIds) {
-        this.referenceSetDbIds = referenceSetDbIds;
-        return this;
-    }
-
-    public VariantsSearchRequest addReferenceSetDbIdsItem(String referenceSetDbIdsItem) {
-        if (this.referenceSetDbIds == null) {
-            this.referenceSetDbIds = new ArrayList<String>();
-        }
-        this.referenceSetDbIds.add(referenceSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier representing a genotype &#x60;ReferenceSet&#x60;
-     *
-     * @return referenceSetDbIds
-     **/
-    @Schema(example = "[\"d3b63d4d\",\"3b63d74b\"]", description = "The unique identifier representing a genotype `ReferenceSet`")
-    public List<String> getReferenceSetDbIds() {
-        return referenceSetDbIds;
-    }
-
-    public void setReferenceSetDbIds(List<String> referenceSetDbIds) {
-        this.referenceSetDbIds = referenceSetDbIds;
-    }
-
-    public VariantsSearchRequest start(Integer start) {
-        this.start = start;
-        return this;
-    }
-
-    /**
-     * The beginning of the window (0-based, inclusive) for which overlapping variants should be returned. Genomic positions are non-negative integers less than reference length. Requests spanning the join of circular genomes are represented as two requests one on each side of the join (position 0).
-     *
-     * @return start
-     **/
-    @Schema(example = "100", description = "The beginning of the window (0-based, inclusive) for which overlapping variants should be returned. Genomic positions are non-negative integers less than reference length. Requests spanning the join of circular genomes are represented as two requests one on each side of the join (position 0).")
-    public Integer getStart() {
-        return start;
-    }
-
-    public void setStart(Integer start) {
-        this.start = start;
-    }
-
-    public VariantsSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public VariantsSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public VariantsSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public VariantsSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public VariantsSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public VariantsSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public VariantsSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public VariantsSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-    public VariantsSearchRequest variantDbIds(List<String> variantDbIds) {
-        this.variantDbIds = variantDbIds;
-        return this;
-    }
-
-    public VariantsSearchRequest addVariantDbIdsItem(String variantDbIdsItem) {
-        if (this.variantDbIds == null) {
-            this.variantDbIds = new ArrayList<String>();
-        }
-        this.variantDbIds.add(variantDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;Variants&#x60;
-     *
-     * @return variantDbIds
-     **/
-    @Schema(example = "[\"3b63d889\",\"ab4d174d\"]", description = "A list of IDs which uniquely identify `Variants`")
-    public List<String> getVariantDbIds() {
-        return variantDbIds;
-    }
-
-    public void setVariantDbIds(List<String> variantDbIds) {
-        this.variantDbIds = variantDbIds;
-    }
-
-    public VariantsSearchRequest variantSetDbIds(List<String> variantSetDbIds) {
-        this.variantSetDbIds = variantSetDbIds;
-        return this;
-    }
-
-    public VariantsSearchRequest addVariantSetDbIdsItem(String variantSetDbIdsItem) {
-        if (this.variantSetDbIds == null) {
-            this.variantSetDbIds = new ArrayList<String>();
-        }
-        this.variantSetDbIds.add(variantSetDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of IDs which uniquely identify &#x60;VariantSets&#x60;
-     *
-     * @return variantSetDbIds
-     **/
-    @Schema(example = "[\"ba63d810\",\"434d1760\"]", description = "A list of IDs which uniquely identify `VariantSets`")
-    public List<String> getVariantSetDbIds() {
-        return variantSetDbIds;
-    }
-
-    public void setVariantSetDbIds(List<String> variantSetDbIds) {
-        this.variantSetDbIds = variantSetDbIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariantsSearchRequest variantsSearchRequest = (VariantsSearchRequest) o;
-        return Objects.equals(this.callSetDbIds, variantsSearchRequest.callSetDbIds) &&
-                Objects.equals(this.commonCropNames, variantsSearchRequest.commonCropNames) &&
-                Objects.equals(this.end, variantsSearchRequest.end) &&
-                Objects.equals(this.externalReferenceIDs, variantsSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, variantsSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, variantsSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.page, variantsSearchRequest.page) &&
-                Objects.equals(this.pageSize, variantsSearchRequest.pageSize) &&
-                Objects.equals(this.pageToken, variantsSearchRequest.pageToken) &&
-                Objects.equals(this.programDbIds, variantsSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, variantsSearchRequest.programNames) &&
-                Objects.equals(this.referenceDbId, variantsSearchRequest.referenceDbId) &&
-                Objects.equals(this.referenceDbIds, variantsSearchRequest.referenceDbIds) &&
-                Objects.equals(this.referenceSetDbIds, variantsSearchRequest.referenceSetDbIds) &&
-                Objects.equals(this.start, variantsSearchRequest.start) &&
-                Objects.equals(this.studyDbIds, variantsSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, variantsSearchRequest.studyNames) &&
-                Objects.equals(this.trialDbIds, variantsSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, variantsSearchRequest.trialNames) &&
-                Objects.equals(this.variantDbIds, variantsSearchRequest.variantDbIds) &&
-                Objects.equals(this.variantSetDbIds, variantsSearchRequest.variantSetDbIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(callSetDbIds, commonCropNames, end, externalReferenceIDs, externalReferenceIds, externalReferenceSources, page, pageSize, pageToken, programDbIds, programNames, referenceDbId, referenceDbIds, referenceSetDbIds, start, studyDbIds, studyNames, trialDbIds, trialNames, variantDbIds, variantSetDbIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariantsSearchRequest {\n");
-
-        sb.append("    callSetDbIds: ").append(toIndentedString(callSetDbIds)).append("\n");
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    end: ").append(toIndentedString(end)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    pageToken: ").append(toIndentedString(pageToken)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    referenceDbId: ").append(toIndentedString(referenceDbId)).append("\n");
-        sb.append("    referenceDbIds: ").append(toIndentedString(referenceDbIds)).append("\n");
-        sb.append("    referenceSetDbIds: ").append(toIndentedString(referenceSetDbIds)).append("\n");
-        sb.append("    start: ").append(toIndentedString(start)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("    variantDbIds: ").append(toIndentedString(variantDbIds)).append("\n");
-        sb.append("    variantSetDbIds: ").append(toIndentedString(variantSetDbIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorContact.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorContact.java
deleted file mode 100644
index c8e18558..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorContact.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * VendorContact
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorContact {
-    @SerializedName("vendorAddress")
-    private String vendorAddress = null;
-
-    @SerializedName("vendorCity")
-    private String vendorCity = null;
-
-    @SerializedName("vendorContactName")
-    private String vendorContactName = null;
-
-    @SerializedName("vendorCountry")
-    private String vendorCountry = null;
-
-    @SerializedName("vendorDescription")
-    private String vendorDescription = null;
-
-    @SerializedName("vendorEmail")
-    private String vendorEmail = null;
-
-    @SerializedName("vendorName")
-    private String vendorName = null;
-
-    @SerializedName("vendorPhone")
-    private String vendorPhone = null;
-
-    @SerializedName("vendorURL")
-    private String vendorURL = null;
-
-    public VendorContact vendorAddress(String vendorAddress) {
-        this.vendorAddress = vendorAddress;
-        return this;
-    }
-
-    /**
-     * The street address of the vendor
-     *
-     * @return vendorAddress
-     **/
-    @Schema(example = "123 Main Street", description = "The street address of the vendor")
-    public String getVendorAddress() {
-        return vendorAddress;
-    }
-
-    public void setVendorAddress(String vendorAddress) {
-        this.vendorAddress = vendorAddress;
-    }
-
-    public VendorContact vendorCity(String vendorCity) {
-        this.vendorCity = vendorCity;
-        return this;
-    }
-
-    /**
-     * The name of the city where the vendor is located
-     *
-     * @return vendorCity
-     **/
-    @Schema(example = "Townsville", description = "The name of the city where the vendor is located")
-    public String getVendorCity() {
-        return vendorCity;
-    }
-
-    public void setVendorCity(String vendorCity) {
-        this.vendorCity = vendorCity;
-    }
-
-    public VendorContact vendorContactName(String vendorContactName) {
-        this.vendorContactName = vendorContactName;
-        return this;
-    }
-
-    /**
-     * The name or identifier of the primary vendor contact
-     *
-     * @return vendorContactName
-     **/
-    @Schema(example = "Bob Robertson", description = "The name or identifier of the primary vendor contact")
-    public String getVendorContactName() {
-        return vendorContactName;
-    }
-
-    public void setVendorContactName(String vendorContactName) {
-        this.vendorContactName = vendorContactName;
-    }
-
-    public VendorContact vendorCountry(String vendorCountry) {
-        this.vendorCountry = vendorCountry;
-        return this;
-    }
-
-    /**
-     * The name of the country where the vendor is located
-     *
-     * @return vendorCountry
-     **/
-    @Schema(example = "USA", description = "The name of the country where the vendor is located")
-    public String getVendorCountry() {
-        return vendorCountry;
-    }
-
-    public void setVendorCountry(String vendorCountry) {
-        this.vendorCountry = vendorCountry;
-    }
-
-    public VendorContact vendorDescription(String vendorDescription) {
-        this.vendorDescription = vendorDescription;
-        return this;
-    }
-
-    /**
-     * A description of the vendor
-     *
-     * @return vendorDescription
-     **/
-    @Schema(example = "This is a sequencing vendor. Sequencing happens here.", description = "A description of the vendor")
-    public String getVendorDescription() {
-        return vendorDescription;
-    }
-
-    public void setVendorDescription(String vendorDescription) {
-        this.vendorDescription = vendorDescription;
-    }
-
-    public VendorContact vendorEmail(String vendorEmail) {
-        this.vendorEmail = vendorEmail;
-        return this;
-    }
-
-    /**
-     * The primary email address used to contact the vendor
-     *
-     * @return vendorEmail
-     **/
-    @Schema(example = "bob@bob.org", description = "The primary email address used to contact the vendor")
-    public String getVendorEmail() {
-        return vendorEmail;
-    }
-
-    public void setVendorEmail(String vendorEmail) {
-        this.vendorEmail = vendorEmail;
-    }
-
-    public VendorContact vendorName(String vendorName) {
-        this.vendorName = vendorName;
-        return this;
-    }
-
-    /**
-     * The human readable name of the vendor
-     *
-     * @return vendorName
-     **/
-    @Schema(example = "The Example Vendor Lab", required = true, description = "The human readable name of the vendor")
-    public String getVendorName() {
-        return vendorName;
-    }
-
-    public void setVendorName(String vendorName) {
-        this.vendorName = vendorName;
-    }
-
-    public VendorContact vendorPhone(String vendorPhone) {
-        this.vendorPhone = vendorPhone;
-        return this;
-    }
-
-    /**
-     * The primary phone number used to contact the vendor
-     *
-     * @return vendorPhone
-     **/
-    @Schema(example = "+1-800-555-5555", description = "The primary phone number used to contact the vendor")
-    public String getVendorPhone() {
-        return vendorPhone;
-    }
-
-    public void setVendorPhone(String vendorPhone) {
-        this.vendorPhone = vendorPhone;
-    }
-
-    public VendorContact vendorURL(String vendorURL) {
-        this.vendorURL = vendorURL;
-        return this;
-    }
-
-    /**
-     * The primary URL for the vendor
-     *
-     * @return vendorURL
-     **/
-    @Schema(example = "https://sequencing.org/vendor", description = "The primary URL for the vendor")
-    public String getVendorURL() {
-        return vendorURL;
-    }
-
-    public void setVendorURL(String vendorURL) {
-        this.vendorURL = vendorURL;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorContact vendorContact = (VendorContact) o;
-        return Objects.equals(this.vendorAddress, vendorContact.vendorAddress) &&
-                Objects.equals(this.vendorCity, vendorContact.vendorCity) &&
-                Objects.equals(this.vendorContactName, vendorContact.vendorContactName) &&
-                Objects.equals(this.vendorCountry, vendorContact.vendorCountry) &&
-                Objects.equals(this.vendorDescription, vendorContact.vendorDescription) &&
-                Objects.equals(this.vendorEmail, vendorContact.vendorEmail) &&
-                Objects.equals(this.vendorName, vendorContact.vendorName) &&
-                Objects.equals(this.vendorPhone, vendorContact.vendorPhone) &&
-                Objects.equals(this.vendorURL, vendorContact.vendorURL);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(vendorAddress, vendorCity, vendorContactName, vendorCountry, vendorDescription, vendorEmail, vendorName, vendorPhone, vendorURL);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorContact {\n");
-
-        sb.append("    vendorAddress: ").append(toIndentedString(vendorAddress)).append("\n");
-        sb.append("    vendorCity: ").append(toIndentedString(vendorCity)).append("\n");
-        sb.append("    vendorContactName: ").append(toIndentedString(vendorContactName)).append("\n");
-        sb.append("    vendorCountry: ").append(toIndentedString(vendorCountry)).append("\n");
-        sb.append("    vendorDescription: ").append(toIndentedString(vendorDescription)).append("\n");
-        sb.append("    vendorEmail: ").append(toIndentedString(vendorEmail)).append("\n");
-        sb.append("    vendorName: ").append(toIndentedString(vendorName)).append("\n");
-        sb.append("    vendorPhone: ").append(toIndentedString(vendorPhone)).append("\n");
-        sb.append("    vendorURL: ").append(toIndentedString(vendorURL)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrder.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrder.java
deleted file mode 100644
index 435affe5..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrder.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * The details of a vendor order
- */
-@Schema(description = "The details of a vendor order")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorOrder {
-    @SerializedName("clientId")
-    private String clientId = null;
-
-    @SerializedName("numberOfSamples")
-    private Integer numberOfSamples = null;
-
-    @SerializedName("orderId")
-    private String orderId = null;
-
-    @SerializedName("requiredServiceInfo")
-    private Map<String, String> requiredServiceInfo = null;
-
-    @SerializedName("serviceIds")
-    private List<String> serviceIds = new ArrayList<String>();
-
-    public VendorOrder clientId(String clientId) {
-        this.clientId = clientId;
-        return this;
-    }
-
-    /**
-     * A unique, alpha-numeric ID which identifies the client to the vendor. Used to connect the order to the correct billing and contact info.
-     *
-     * @return clientId
-     **/
-    @Schema(example = "7b51ad15", required = true, description = "A unique, alpha-numeric ID which identifies the client to the vendor. Used to connect the order to the correct billing and contact info.")
-    public String getClientId() {
-        return clientId;
-    }
-
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
-    public VendorOrder numberOfSamples(Integer numberOfSamples) {
-        this.numberOfSamples = numberOfSamples;
-        return this;
-    }
-
-    /**
-     * The total number of samples contained in this request. Used for billing and basic validation of the request.
-     *
-     * @return numberOfSamples
-     **/
-    @Schema(example = "180", required = true, description = "The total number of samples contained in this request. Used for billing and basic validation of the request.")
-    public Integer getNumberOfSamples() {
-        return numberOfSamples;
-    }
-
-    public void setNumberOfSamples(Integer numberOfSamples) {
-        this.numberOfSamples = numberOfSamples;
-    }
-
-    public VendorOrder orderId(String orderId) {
-        this.orderId = orderId;
-        return this;
-    }
-
-    /**
-     * The order id returned by the vendor when the order was successfully submitted.
-     *
-     * @return orderId
-     **/
-    @Schema(example = "96ba0ca3", required = true, description = "The order id returned by the vendor when the order was successfully submitted.")
-    public String getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(String orderId) {
-        this.orderId = orderId;
-    }
-
-    public VendorOrder requiredServiceInfo(Map<String, String> requiredServiceInfo) {
-        this.requiredServiceInfo = requiredServiceInfo;
-        return this;
-    }
-
-    public VendorOrder putRequiredServiceInfoItem(String key, String requiredServiceInfoItem) {
-        if (this.requiredServiceInfo == null) {
-            this.requiredServiceInfo = new HashMap<String, String>();
-        }
-        this.requiredServiceInfo.put(key, requiredServiceInfoItem);
-        return this;
-    }
-
-    /**
-     * A map of additional data required by the requested service. This includes things like Volume and Concentration.
-     *
-     * @return requiredServiceInfo
-     **/
-    @Schema(example = "{\"extractDNA\":\"true\",\"genus\":\"Zea\",\"species\":\"mays\",\"volumePerWell\":\"2.3 ml\"}", description = "A map of additional data required by the requested service. This includes things like Volume and Concentration.")
-    public Map<String, String> getRequiredServiceInfo() {
-        return requiredServiceInfo;
-    }
-
-    public void setRequiredServiceInfo(Map<String, String> requiredServiceInfo) {
-        this.requiredServiceInfo = requiredServiceInfo;
-    }
-
-    public VendorOrder serviceIds(List<String> serviceIds) {
-        this.serviceIds = serviceIds;
-        return this;
-    }
-
-    public VendorOrder addServiceIdsItem(String serviceIdsItem) {
-        this.serviceIds.add(serviceIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of unique, alpha-numeric ID which identify the requested services to be applied to this order.  A Vendor Service defines what platform, technology, and markers will be used.  A list of available service IDs can be retrieved from the Vendor Specs.
-     *
-     * @return serviceIds
-     **/
-    @Schema(example = "[\"e8f60f64\",\"05bd925a\",\"b698fb5e\"]", required = true, description = "A list of unique, alpha-numeric ID which identify the requested services to be applied to this order.  A Vendor Service defines what platform, technology, and markers will be used.  A list of available service IDs can be retrieved from the Vendor Specs.")
-    public List<String> getServiceIds() {
-        return serviceIds;
-    }
-
-    public void setServiceIds(List<String> serviceIds) {
-        this.serviceIds = serviceIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorOrder vendorOrder = (VendorOrder) o;
-        return Objects.equals(this.clientId, vendorOrder.clientId) &&
-                Objects.equals(this.numberOfSamples, vendorOrder.numberOfSamples) &&
-                Objects.equals(this.orderId, vendorOrder.orderId) &&
-                Objects.equals(this.requiredServiceInfo, vendorOrder.requiredServiceInfo) &&
-                Objects.equals(this.serviceIds, vendorOrder.serviceIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(clientId, numberOfSamples, orderId, requiredServiceInfo, serviceIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorOrder {\n");
-
-        sb.append("    clientId: ").append(toIndentedString(clientId)).append("\n");
-        sb.append("    numberOfSamples: ").append(toIndentedString(numberOfSamples)).append("\n");
-        sb.append("    orderId: ").append(toIndentedString(orderId)).append("\n");
-        sb.append("    requiredServiceInfo: ").append(toIndentedString(requiredServiceInfo)).append("\n");
-        sb.append("    serviceIds: ").append(toIndentedString(serviceIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderListResponse.java
deleted file mode 100644
index c5f76237..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * VendorOrderListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorOrderListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private VendorOrderListResponseResult result = null;
-
-    public VendorOrderListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public VendorOrderListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public VendorOrderListResponse result(VendorOrderListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public VendorOrderListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(VendorOrderListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorOrderListResponse vendorOrderListResponse = (VendorOrderListResponse) o;
-        return Objects.equals(this._atContext, vendorOrderListResponse._atContext) &&
-                Objects.equals(this.metadata, vendorOrderListResponse.metadata) &&
-                Objects.equals(this.result, vendorOrderListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorOrderListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderListResponseResult.java
deleted file mode 100644
index 849e1519..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * VendorOrderListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorOrderListResponseResult {
-    @SerializedName("data")
-    private List<VendorOrder> data = new ArrayList<VendorOrder>();
-
-    public VendorOrderListResponseResult data(List<VendorOrder> data) {
-        this.data = data;
-        return this;
-    }
-
-    public VendorOrderListResponseResult addDataItem(VendorOrder dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<VendorOrder> getData() {
-        return data;
-    }
-
-    public void setData(List<VendorOrder> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorOrderListResponseResult vendorOrderListResponseResult = (VendorOrderListResponseResult) o;
-        return Objects.equals(this.data, vendorOrderListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorOrderListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderStatusResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderStatusResponse.java
deleted file mode 100644
index 65adbd75..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderStatusResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * VendorOrderStatusResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorOrderStatusResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private VendorOrderStatusResponseResult result = null;
-
-    public VendorOrderStatusResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public VendorOrderStatusResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public VendorOrderStatusResponse result(VendorOrderStatusResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public VendorOrderStatusResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(VendorOrderStatusResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorOrderStatusResponse vendorOrderStatusResponse = (VendorOrderStatusResponse) o;
-        return Objects.equals(this._atContext, vendorOrderStatusResponse._atContext) &&
-                Objects.equals(this.metadata, vendorOrderStatusResponse.metadata) &&
-                Objects.equals(this.result, vendorOrderStatusResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorOrderStatusResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderStatusResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderStatusResponseResult.java
deleted file mode 100644
index 0739b3a3..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderStatusResponseResult.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * VendorOrderStatusResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorOrderStatusResponseResult {
-    /**
-     * Gets or Sets status
-     */
-    @JsonAdapter(StatusEnum.Adapter.class)
-    public enum StatusEnum {
-        REGISTERED("registered"),
-        RECEIVED("received"),
-        INPROGRESS("inProgress"),
-        COMPLETED("completed"),
-        REJECTED("rejected");
-
-        private String value;
-
-        StatusEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static StatusEnum fromValue(String input) {
-            for (StatusEnum b : StatusEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<StatusEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final StatusEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public StatusEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return StatusEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("status")
-    private StatusEnum status = null;
-
-    public VendorOrderStatusResponseResult status(StatusEnum status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Get status
-     *
-     * @return status
-     **/
-    @Schema(description = "")
-    public StatusEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(StatusEnum status) {
-        this.status = status;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorOrderStatusResponseResult vendorOrderStatusResponseResult = (VendorOrderStatusResponseResult) o;
-        return Objects.equals(this.status, vendorOrderStatusResponseResult.status);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(status);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorOrderStatusResponseResult {\n");
-
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmission.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmission.java
deleted file mode 100644
index 764bd8f0..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmission.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Response to an order request
- */
-@Schema(description = "Response to an order request")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorOrderSubmission {
-    @SerializedName("orderId")
-    private String orderId = null;
-
-    @SerializedName("shipmentForms")
-    private List<ShipmentForm> shipmentForms = null;
-
-    public VendorOrderSubmission orderId(String orderId) {
-        this.orderId = orderId;
-        return this;
-    }
-
-    /**
-     * A unique, alpha-numeric ID which identifies the order
-     *
-     * @return orderId
-     **/
-    @Schema(example = "b5144468", required = true, description = "A unique, alpha-numeric ID which identifies the order")
-    public String getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(String orderId) {
-        this.orderId = orderId;
-    }
-
-    public VendorOrderSubmission shipmentForms(List<ShipmentForm> shipmentForms) {
-        this.shipmentForms = shipmentForms;
-        return this;
-    }
-
-    public VendorOrderSubmission addShipmentFormsItem(ShipmentForm shipmentFormsItem) {
-        if (this.shipmentForms == null) {
-            this.shipmentForms = new ArrayList<ShipmentForm>();
-        }
-        this.shipmentForms.add(shipmentFormsItem);
-        return this;
-    }
-
-    /**
-     * Array of paper forms which need to be printed and included with the physical shipment
-     *
-     * @return shipmentForms
-     **/
-    @Schema(description = "Array of paper forms which need to be printed and included with the physical shipment")
-    public List<ShipmentForm> getShipmentForms() {
-        return shipmentForms;
-    }
-
-    public void setShipmentForms(List<ShipmentForm> shipmentForms) {
-        this.shipmentForms = shipmentForms;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorOrderSubmission vendorOrderSubmission = (VendorOrderSubmission) o;
-        return Objects.equals(this.orderId, vendorOrderSubmission.orderId) &&
-                Objects.equals(this.shipmentForms, vendorOrderSubmission.shipmentForms);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(orderId, shipmentForms);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorOrderSubmission {\n");
-
-        sb.append("    orderId: ").append(toIndentedString(orderId)).append("\n");
-        sb.append("    shipmentForms: ").append(toIndentedString(shipmentForms)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionRequest.java
deleted file mode 100644
index a0363168..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionRequest.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * Request object structure to submit plate data to a vendor
- */
-@Schema(description = "Request object structure to submit plate data to a vendor")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorOrderSubmissionRequest {
-    @SerializedName("clientId")
-    private String clientId = null;
-
-    @SerializedName("numberOfSamples")
-    private Integer numberOfSamples = null;
-
-    @SerializedName("plates")
-    private List<VendorOrderSubmissionRequestPlates> plates = null;
-
-    @SerializedName("requiredServiceInfo")
-    private Map<String, String> requiredServiceInfo = null;
-
-    /**
-     * The type of Samples being submitted
-     */
-    @JsonAdapter(SampleTypeEnum.Adapter.class)
-    public enum SampleTypeEnum {
-        DNA("DNA"),
-        RNA("RNA"),
-        TISSUE("Tissue");
-
-        private String value;
-
-        SampleTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static SampleTypeEnum fromValue(String input) {
-            for (SampleTypeEnum b : SampleTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<SampleTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final SampleTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public SampleTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return SampleTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("sampleType")
-    private SampleTypeEnum sampleType = null;
-
-    @SerializedName("serviceIds")
-    private List<String> serviceIds = null;
-
-    public VendorOrderSubmissionRequest clientId(String clientId) {
-        this.clientId = clientId;
-        return this;
-    }
-
-    /**
-     * A unique, alpha-numeric ID which identifies the client to the vendor. Used to connect the order to the contract, billing, and contact info.
-     *
-     * @return clientId
-     **/
-    @Schema(example = "b8aac350", description = "A unique, alpha-numeric ID which identifies the client to the vendor. Used to connect the order to the contract, billing, and contact info.")
-    public String getClientId() {
-        return clientId;
-    }
-
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
-    public VendorOrderSubmissionRequest numberOfSamples(Integer numberOfSamples) {
-        this.numberOfSamples = numberOfSamples;
-        return this;
-    }
-
-    /**
-     * The total number of samples contained in this request. Used for billing and basic validation of the request.
-     *
-     * @return numberOfSamples
-     **/
-    @Schema(example = "180", description = "The total number of samples contained in this request. Used for billing and basic validation of the request.")
-    public Integer getNumberOfSamples() {
-        return numberOfSamples;
-    }
-
-    public void setNumberOfSamples(Integer numberOfSamples) {
-        this.numberOfSamples = numberOfSamples;
-    }
-
-    public VendorOrderSubmissionRequest plates(List<VendorOrderSubmissionRequestPlates> plates) {
-        this.plates = plates;
-        return this;
-    }
-
-    public VendorOrderSubmissionRequest addPlatesItem(VendorOrderSubmissionRequestPlates platesItem) {
-        if (this.plates == null) {
-            this.plates = new ArrayList<VendorOrderSubmissionRequestPlates>();
-        }
-        this.plates.add(platesItem);
-        return this;
-    }
-
-    /**
-     * Array of new plates to be submitted to a vendor
-     *
-     * @return plates
-     **/
-    @Schema(description = "Array of new plates to be submitted to a vendor")
-    public List<VendorOrderSubmissionRequestPlates> getPlates() {
-        return plates;
-    }
-
-    public void setPlates(List<VendorOrderSubmissionRequestPlates> plates) {
-        this.plates = plates;
-    }
-
-    public VendorOrderSubmissionRequest requiredServiceInfo(Map<String, String> requiredServiceInfo) {
-        this.requiredServiceInfo = requiredServiceInfo;
-        return this;
-    }
-
-    public VendorOrderSubmissionRequest putRequiredServiceInfoItem(String key, String requiredServiceInfoItem) {
-        if (this.requiredServiceInfo == null) {
-            this.requiredServiceInfo = new HashMap<String, String>();
-        }
-        this.requiredServiceInfo.put(key, requiredServiceInfoItem);
-        return this;
-    }
-
-    /**
-     * A map of additional data required by the requested service. This includes things like Volume and Concentration.
-     *
-     * @return requiredServiceInfo
-     **/
-    @Schema(example = "{\"extractDNA\":true,\"genus\":\"Zea\",\"species\":\"mays\",\"volumePerWell\":\"2.3 ml\"}", description = "A map of additional data required by the requested service. This includes things like Volume and Concentration.")
-    public Map<String, String> getRequiredServiceInfo() {
-        return requiredServiceInfo;
-    }
-
-    public void setRequiredServiceInfo(Map<String, String> requiredServiceInfo) {
-        this.requiredServiceInfo = requiredServiceInfo;
-    }
-
-    public VendorOrderSubmissionRequest sampleType(SampleTypeEnum sampleType) {
-        this.sampleType = sampleType;
-        return this;
-    }
-
-    /**
-     * The type of Samples being submitted
-     *
-     * @return sampleType
-     **/
-    @Schema(example = "Tissue", description = "The type of Samples being submitted")
-    public SampleTypeEnum getSampleType() {
-        return sampleType;
-    }
-
-    public void setSampleType(SampleTypeEnum sampleType) {
-        this.sampleType = sampleType;
-    }
-
-    public VendorOrderSubmissionRequest serviceIds(List<String> serviceIds) {
-        this.serviceIds = serviceIds;
-        return this;
-    }
-
-    public VendorOrderSubmissionRequest addServiceIdsItem(String serviceIdsItem) {
-        if (this.serviceIds == null) {
-            this.serviceIds = new ArrayList<String>();
-        }
-        this.serviceIds.add(serviceIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of unique, alpha-numeric ID which identify the requested services to be applied to this order.  A Vendor Service defines what platform, technology, and markers will be used.  A list of available service IDs can be retrieved from the Vendor Specs.
-     *
-     * @return serviceIds
-     **/
-    @Schema(example = "[\"e8f60f64\",\"05bd925a\",\"b698fb5e\"]", description = "A list of unique, alpha-numeric ID which identify the requested services to be applied to this order.  A Vendor Service defines what platform, technology, and markers will be used.  A list of available service IDs can be retrieved from the Vendor Specs.")
-    public List<String> getServiceIds() {
-        return serviceIds;
-    }
-
-    public void setServiceIds(List<String> serviceIds) {
-        this.serviceIds = serviceIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorOrderSubmissionRequest vendorOrderSubmissionRequest = (VendorOrderSubmissionRequest) o;
-        return Objects.equals(this.clientId, vendorOrderSubmissionRequest.clientId) &&
-                Objects.equals(this.numberOfSamples, vendorOrderSubmissionRequest.numberOfSamples) &&
-                Objects.equals(this.plates, vendorOrderSubmissionRequest.plates) &&
-                Objects.equals(this.requiredServiceInfo, vendorOrderSubmissionRequest.requiredServiceInfo) &&
-                Objects.equals(this.sampleType, vendorOrderSubmissionRequest.sampleType) &&
-                Objects.equals(this.serviceIds, vendorOrderSubmissionRequest.serviceIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(clientId, numberOfSamples, plates, requiredServiceInfo, sampleType, serviceIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorOrderSubmissionRequest {\n");
-
-        sb.append("    clientId: ").append(toIndentedString(clientId)).append("\n");
-        sb.append("    numberOfSamples: ").append(toIndentedString(numberOfSamples)).append("\n");
-        sb.append("    plates: ").append(toIndentedString(plates)).append("\n");
-        sb.append("    requiredServiceInfo: ").append(toIndentedString(requiredServiceInfo)).append("\n");
-        sb.append("    sampleType: ").append(toIndentedString(sampleType)).append("\n");
-        sb.append("    serviceIds: ").append(toIndentedString(serviceIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionRequestConcentration.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionRequestConcentration.java
deleted file mode 100644
index 2ce8ec1f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionRequestConcentration.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.util.Objects;
-
-/**
- * A value with units
- */
-@Schema(description = "A value with units")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorOrderSubmissionRequestConcentration {
-    @SerializedName("units")
-    private String units = null;
-
-    @SerializedName("value")
-    private BigDecimal value = null;
-
-    public VendorOrderSubmissionRequestConcentration units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * Units (example: \&quot;ng/ul\&quot;)
-     *
-     * @return units
-     **/
-    @Schema(example = "ng/ul", description = "Units (example: \"ng/ul\")")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    public VendorOrderSubmissionRequestConcentration value(BigDecimal value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * Value (example: \&quot;2.3\&quot;)
-     *
-     * @return value
-     **/
-    @Schema(example = "2.3", description = "Value (example: \"2.3\")")
-    public BigDecimal getValue() {
-        return value;
-    }
-
-    public void setValue(BigDecimal value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorOrderSubmissionRequestConcentration vendorOrderSubmissionRequestConcentration = (VendorOrderSubmissionRequestConcentration) o;
-        return Objects.equals(this.units, vendorOrderSubmissionRequestConcentration.units) &&
-                Objects.equals(this.value, vendorOrderSubmissionRequestConcentration.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(units, value);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorOrderSubmissionRequestConcentration {\n");
-
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionRequestPlates.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionRequestPlates.java
deleted file mode 100644
index 79f36610..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionRequestPlates.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * VendorOrderSubmissionRequestPlates
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorOrderSubmissionRequestPlates {
-    @SerializedName("clientPlateBarcode")
-    private String clientPlateBarcode = null;
-
-    @SerializedName("clientPlateId")
-    private String clientPlateId = null;
-
-    /**
-     * Enum for plate formats, usually \&quot;PLATE_96\&quot; for a 96 well plate or \&quot;TUBES\&quot; for plateless format
-     */
-    @JsonAdapter(SampleSubmissionFormatEnum.Adapter.class)
-    public enum SampleSubmissionFormatEnum {
-        PLATE_96("PLATE_96"),
-        TUBES("TUBES");
-
-        private String value;
-
-        SampleSubmissionFormatEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static SampleSubmissionFormatEnum fromValue(String input) {
-            for (SampleSubmissionFormatEnum b : SampleSubmissionFormatEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<SampleSubmissionFormatEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final SampleSubmissionFormatEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public SampleSubmissionFormatEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return SampleSubmissionFormatEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("sampleSubmissionFormat")
-    private SampleSubmissionFormatEnum sampleSubmissionFormat = null;
-
-    @SerializedName("samples")
-    private List<VendorOrderSubmissionRequestSamples> samples = null;
-
-    public VendorOrderSubmissionRequestPlates clientPlateBarcode(String clientPlateBarcode) {
-        this.clientPlateBarcode = clientPlateBarcode;
-        return this;
-    }
-
-    /**
-     * (Optional) The value of the bar code attached to this plate
-     *
-     * @return clientPlateBarcode
-     **/
-    @Schema(example = "6ebf3f25", description = "(Optional) The value of the bar code attached to this plate")
-    public String getClientPlateBarcode() {
-        return clientPlateBarcode;
-    }
-
-    public void setClientPlateBarcode(String clientPlateBarcode) {
-        this.clientPlateBarcode = clientPlateBarcode;
-    }
-
-    public VendorOrderSubmissionRequestPlates clientPlateId(String clientPlateId) {
-        this.clientPlateId = clientPlateId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies this plate to the client making the request
-     *
-     * @return clientPlateId
-     **/
-    @Schema(example = "02a8d6f0", description = "The ID which uniquely identifies this plate to the client making the request")
-    public String getClientPlateId() {
-        return clientPlateId;
-    }
-
-    public void setClientPlateId(String clientPlateId) {
-        this.clientPlateId = clientPlateId;
-    }
-
-    public VendorOrderSubmissionRequestPlates sampleSubmissionFormat(SampleSubmissionFormatEnum sampleSubmissionFormat) {
-        this.sampleSubmissionFormat = sampleSubmissionFormat;
-        return this;
-    }
-
-    /**
-     * Enum for plate formats, usually \&quot;PLATE_96\&quot; for a 96 well plate or \&quot;TUBES\&quot; for plateless format
-     *
-     * @return sampleSubmissionFormat
-     **/
-    @Schema(example = "PLATE_96", description = "Enum for plate formats, usually \"PLATE_96\" for a 96 well plate or \"TUBES\" for plateless format")
-    public SampleSubmissionFormatEnum getSampleSubmissionFormat() {
-        return sampleSubmissionFormat;
-    }
-
-    public void setSampleSubmissionFormat(SampleSubmissionFormatEnum sampleSubmissionFormat) {
-        this.sampleSubmissionFormat = sampleSubmissionFormat;
-    }
-
-    public VendorOrderSubmissionRequestPlates samples(List<VendorOrderSubmissionRequestSamples> samples) {
-        this.samples = samples;
-        return this;
-    }
-
-    public VendorOrderSubmissionRequestPlates addSamplesItem(VendorOrderSubmissionRequestSamples samplesItem) {
-        if (this.samples == null) {
-            this.samples = new ArrayList<VendorOrderSubmissionRequestSamples>();
-        }
-        this.samples.add(samplesItem);
-        return this;
-    }
-
-    /**
-     * Get samples
-     *
-     * @return samples
-     **/
-    @Schema(description = "")
-    public List<VendorOrderSubmissionRequestSamples> getSamples() {
-        return samples;
-    }
-
-    public void setSamples(List<VendorOrderSubmissionRequestSamples> samples) {
-        this.samples = samples;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorOrderSubmissionRequestPlates vendorOrderSubmissionRequestPlates = (VendorOrderSubmissionRequestPlates) o;
-        return Objects.equals(this.clientPlateBarcode, vendorOrderSubmissionRequestPlates.clientPlateBarcode) &&
-                Objects.equals(this.clientPlateId, vendorOrderSubmissionRequestPlates.clientPlateId) &&
-                Objects.equals(this.sampleSubmissionFormat, vendorOrderSubmissionRequestPlates.sampleSubmissionFormat) &&
-                Objects.equals(this.samples, vendorOrderSubmissionRequestPlates.samples);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(clientPlateBarcode, clientPlateId, sampleSubmissionFormat, samples);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorOrderSubmissionRequestPlates {\n");
-
-        sb.append("    clientPlateBarcode: ").append(toIndentedString(clientPlateBarcode)).append("\n");
-        sb.append("    clientPlateId: ").append(toIndentedString(clientPlateId)).append("\n");
-        sb.append("    sampleSubmissionFormat: ").append(toIndentedString(sampleSubmissionFormat)).append("\n");
-        sb.append("    samples: ").append(toIndentedString(samples)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionRequestSamples.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionRequestSamples.java
deleted file mode 100644
index d36db185..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionRequestSamples.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * VendorOrderSubmissionRequestSamples
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorOrderSubmissionRequestSamples {
-    @SerializedName("clientSampleBarCode")
-    private String clientSampleBarCode = null;
-
-    @SerializedName("clientSampleId")
-    private String clientSampleId = null;
-
-    @SerializedName("column")
-    private Integer column = null;
-
-    @SerializedName("comments")
-    private String comments = null;
-
-    @SerializedName("concentration")
-    private VendorOrderSubmissionRequestConcentration concentration = null;
-
-    @SerializedName("organismName")
-    private String organismName = null;
-
-    @SerializedName("row")
-    private String row = null;
-
-    @SerializedName("speciesName")
-    private String speciesName = null;
-
-    @SerializedName("taxonomyOntologyReference")
-    private MethodBaseClassOntologyReference taxonomyOntologyReference = null;
-
-    @SerializedName("tissueType")
-    private String tissueType = null;
-
-    @SerializedName("tissueTypeOntologyReference")
-    private MethodBaseClassOntologyReference tissueTypeOntologyReference = null;
-
-    @SerializedName("volume")
-    private VendorOrderSubmissionRequestConcentration volume = null;
-
-    @SerializedName("well")
-    private String well = null;
-
-    public VendorOrderSubmissionRequestSamples clientSampleBarCode(String clientSampleBarCode) {
-        this.clientSampleBarCode = clientSampleBarCode;
-        return this;
-    }
-
-    /**
-     * (Optional) The value of the bar code attached to this sample
-     *
-     * @return clientSampleBarCode
-     **/
-    @Schema(example = "7c07e527", description = "(Optional) The value of the bar code attached to this sample")
-    public String getClientSampleBarCode() {
-        return clientSampleBarCode;
-    }
-
-    public void setClientSampleBarCode(String clientSampleBarCode) {
-        this.clientSampleBarCode = clientSampleBarCode;
-    }
-
-    public VendorOrderSubmissionRequestSamples clientSampleId(String clientSampleId) {
-        this.clientSampleId = clientSampleId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies this sample to the client making the request
-     *
-     * @return clientSampleId
-     **/
-    @Schema(example = "bd96bd69", required = true, description = "The ID which uniquely identifies this sample to the client making the request")
-    public String getClientSampleId() {
-        return clientSampleId;
-    }
-
-    public void setClientSampleId(String clientSampleId) {
-        this.clientSampleId = clientSampleId;
-    }
-
-    public VendorOrderSubmissionRequestSamples column(Integer column) {
-        this.column = column;
-        return this;
-    }
-
-    /**
-     * The Column identifier for this samples location in the plate
-     * minimum: 1
-     * maximum: 12
-     *
-     * @return column
-     **/
-    @Schema(example = "6", description = "The Column identifier for this samples location in the plate")
-    public Integer getColumn() {
-        return column;
-    }
-
-    public void setColumn(Integer column) {
-        this.column = column;
-    }
-
-    public VendorOrderSubmissionRequestSamples comments(String comments) {
-        this.comments = comments;
-        return this;
-    }
-
-    /**
-     * Generic comments about this sample for the vendor
-     *
-     * @return comments
-     **/
-    @Schema(example = "This is my favorite sample, please be extra careful with it.", description = "Generic comments about this sample for the vendor")
-    public String getComments() {
-        return comments;
-    }
-
-    public void setComments(String comments) {
-        this.comments = comments;
-    }
-
-    public VendorOrderSubmissionRequestSamples concentration(VendorOrderSubmissionRequestConcentration concentration) {
-        this.concentration = concentration;
-        return this;
-    }
-
-    /**
-     * Get concentration
-     *
-     * @return concentration
-     **/
-    @Schema(description = "")
-    public VendorOrderSubmissionRequestConcentration getConcentration() {
-        return concentration;
-    }
-
-    public void setConcentration(VendorOrderSubmissionRequestConcentration concentration) {
-        this.concentration = concentration;
-    }
-
-    public VendorOrderSubmissionRequestSamples organismName(String organismName) {
-        this.organismName = organismName;
-        return this;
-    }
-
-    /**
-     * Scientific organism name
-     *
-     * @return organismName
-     **/
-    @Schema(example = "Aspergillus fructus", description = "Scientific organism name")
-    public String getOrganismName() {
-        return organismName;
-    }
-
-    public void setOrganismName(String organismName) {
-        this.organismName = organismName;
-    }
-
-    public VendorOrderSubmissionRequestSamples row(String row) {
-        this.row = row;
-        return this;
-    }
-
-    /**
-     * The Row identifier for this samples location in the plate
-     *
-     * @return row
-     **/
-    @Schema(example = "B", description = "The Row identifier for this samples location in the plate")
-    public String getRow() {
-        return row;
-    }
-
-    public void setRow(String row) {
-        this.row = row;
-    }
-
-    public VendorOrderSubmissionRequestSamples speciesName(String speciesName) {
-        this.speciesName = speciesName;
-        return this;
-    }
-
-    /**
-     * Scientific species name
-     *
-     * @return speciesName
-     **/
-    @Schema(example = "Aspergillus fructus", description = "Scientific species name")
-    public String getSpeciesName() {
-        return speciesName;
-    }
-
-    public void setSpeciesName(String speciesName) {
-        this.speciesName = speciesName;
-    }
-
-    public VendorOrderSubmissionRequestSamples taxonomyOntologyReference(MethodBaseClassOntologyReference taxonomyOntologyReference) {
-        this.taxonomyOntologyReference = taxonomyOntologyReference;
-        return this;
-    }
-
-    /**
-     * Get taxonomyOntologyReference
-     *
-     * @return taxonomyOntologyReference
-     **/
-    @Schema(description = "")
-    public MethodBaseClassOntologyReference getTaxonomyOntologyReference() {
-        return taxonomyOntologyReference;
-    }
-
-    public void setTaxonomyOntologyReference(MethodBaseClassOntologyReference taxonomyOntologyReference) {
-        this.taxonomyOntologyReference = taxonomyOntologyReference;
-    }
-
-    public VendorOrderSubmissionRequestSamples tissueType(String tissueType) {
-        this.tissueType = tissueType;
-        return this;
-    }
-
-    /**
-     * The type of tissue in this sample. List of accepted tissue types can be found in the Vendor Specs.
-     *
-     * @return tissueType
-     **/
-    @Schema(example = "Root", description = "The type of tissue in this sample. List of accepted tissue types can be found in the Vendor Specs.")
-    public String getTissueType() {
-        return tissueType;
-    }
-
-    public void setTissueType(String tissueType) {
-        this.tissueType = tissueType;
-    }
-
-    public VendorOrderSubmissionRequestSamples tissueTypeOntologyReference(MethodBaseClassOntologyReference tissueTypeOntologyReference) {
-        this.tissueTypeOntologyReference = tissueTypeOntologyReference;
-        return this;
-    }
-
-    /**
-     * Get tissueTypeOntologyReference
-     *
-     * @return tissueTypeOntologyReference
-     **/
-    @Schema(description = "")
-    public MethodBaseClassOntologyReference getTissueTypeOntologyReference() {
-        return tissueTypeOntologyReference;
-    }
-
-    public void setTissueTypeOntologyReference(MethodBaseClassOntologyReference tissueTypeOntologyReference) {
-        this.tissueTypeOntologyReference = tissueTypeOntologyReference;
-    }
-
-    public VendorOrderSubmissionRequestSamples volume(VendorOrderSubmissionRequestConcentration volume) {
-        this.volume = volume;
-        return this;
-    }
-
-    /**
-     * Get volume
-     *
-     * @return volume
-     **/
-    @Schema(description = "")
-    public VendorOrderSubmissionRequestConcentration getVolume() {
-        return volume;
-    }
-
-    public void setVolume(VendorOrderSubmissionRequestConcentration volume) {
-        this.volume = volume;
-    }
-
-    public VendorOrderSubmissionRequestSamples well(String well) {
-        this.well = well;
-        return this;
-    }
-
-    /**
-     * The Well identifier for this samples location in the plate. Usually a concatenation of Row and Column, or just a number if the samples are not part of an ordered plate.
-     *
-     * @return well
-     **/
-    @Schema(example = "B6", description = "The Well identifier for this samples location in the plate. Usually a concatenation of Row and Column, or just a number if the samples are not part of an ordered plate.")
-    public String getWell() {
-        return well;
-    }
-
-    public void setWell(String well) {
-        this.well = well;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorOrderSubmissionRequestSamples vendorOrderSubmissionRequestSamples = (VendorOrderSubmissionRequestSamples) o;
-        return Objects.equals(this.clientSampleBarCode, vendorOrderSubmissionRequestSamples.clientSampleBarCode) &&
-                Objects.equals(this.clientSampleId, vendorOrderSubmissionRequestSamples.clientSampleId) &&
-                Objects.equals(this.column, vendorOrderSubmissionRequestSamples.column) &&
-                Objects.equals(this.comments, vendorOrderSubmissionRequestSamples.comments) &&
-                Objects.equals(this.concentration, vendorOrderSubmissionRequestSamples.concentration) &&
-                Objects.equals(this.organismName, vendorOrderSubmissionRequestSamples.organismName) &&
-                Objects.equals(this.row, vendorOrderSubmissionRequestSamples.row) &&
-                Objects.equals(this.speciesName, vendorOrderSubmissionRequestSamples.speciesName) &&
-                Objects.equals(this.taxonomyOntologyReference, vendorOrderSubmissionRequestSamples.taxonomyOntologyReference) &&
-                Objects.equals(this.tissueType, vendorOrderSubmissionRequestSamples.tissueType) &&
-                Objects.equals(this.tissueTypeOntologyReference, vendorOrderSubmissionRequestSamples.tissueTypeOntologyReference) &&
-                Objects.equals(this.volume, vendorOrderSubmissionRequestSamples.volume) &&
-                Objects.equals(this.well, vendorOrderSubmissionRequestSamples.well);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(clientSampleBarCode, clientSampleId, column, comments, concentration, organismName, row, speciesName, taxonomyOntologyReference, tissueType, tissueTypeOntologyReference, volume, well);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorOrderSubmissionRequestSamples {\n");
-
-        sb.append("    clientSampleBarCode: ").append(toIndentedString(clientSampleBarCode)).append("\n");
-        sb.append("    clientSampleId: ").append(toIndentedString(clientSampleId)).append("\n");
-        sb.append("    column: ").append(toIndentedString(column)).append("\n");
-        sb.append("    comments: ").append(toIndentedString(comments)).append("\n");
-        sb.append("    concentration: ").append(toIndentedString(concentration)).append("\n");
-        sb.append("    organismName: ").append(toIndentedString(organismName)).append("\n");
-        sb.append("    row: ").append(toIndentedString(row)).append("\n");
-        sb.append("    speciesName: ").append(toIndentedString(speciesName)).append("\n");
-        sb.append("    taxonomyOntologyReference: ").append(toIndentedString(taxonomyOntologyReference)).append("\n");
-        sb.append("    tissueType: ").append(toIndentedString(tissueType)).append("\n");
-        sb.append("    tissueTypeOntologyReference: ").append(toIndentedString(tissueTypeOntologyReference)).append("\n");
-        sb.append("    volume: ").append(toIndentedString(volume)).append("\n");
-        sb.append("    well: ").append(toIndentedString(well)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionSingleResponse.java
deleted file mode 100644
index bdd02c6d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorOrderSubmissionSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * VendorOrderSubmissionSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorOrderSubmissionSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private VendorOrderSubmission result = null;
-
-    public VendorOrderSubmissionSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public VendorOrderSubmissionSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public VendorOrderSubmissionSingleResponse result(VendorOrderSubmission result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(description = "")
-    public VendorOrderSubmission getResult() {
-        return result;
-    }
-
-    public void setResult(VendorOrderSubmission result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorOrderSubmissionSingleResponse vendorOrderSubmissionSingleResponse = (VendorOrderSubmissionSingleResponse) o;
-        return Objects.equals(this._atContext, vendorOrderSubmissionSingleResponse._atContext) &&
-                Objects.equals(this.metadata, vendorOrderSubmissionSingleResponse.metadata) &&
-                Objects.equals(this.result, vendorOrderSubmissionSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorOrderSubmissionSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlate.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlate.java
deleted file mode 100644
index 617a443c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlate.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * VendorPlate
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorPlate {
-    @SerializedName("clientPlateBarcode")
-    private String clientPlateBarcode = null;
-
-    @SerializedName("clientPlateId")
-    private String clientPlateId = null;
-
-    @SerializedName("sampleSubmissionFormat")
-    private PlateFormat sampleSubmissionFormat = null;
-
-    @SerializedName("samples")
-    private List<VendorSample> samples = null;
-
-    public VendorPlate clientPlateBarcode(String clientPlateBarcode) {
-        this.clientPlateBarcode = clientPlateBarcode;
-        return this;
-    }
-
-    /**
-     * (Optional) The value of the bar code attached to this plate
-     *
-     * @return clientPlateBarcode
-     **/
-    @Schema(example = "31dd5787", description = "(Optional) The value of the bar code attached to this plate")
-    public String getClientPlateBarcode() {
-        return clientPlateBarcode;
-    }
-
-    public void setClientPlateBarcode(String clientPlateBarcode) {
-        this.clientPlateBarcode = clientPlateBarcode;
-    }
-
-    public VendorPlate clientPlateId(String clientPlateId) {
-        this.clientPlateId = clientPlateId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies this plate to the client making the request
-     *
-     * @return clientPlateId
-     **/
-    @Schema(example = "0ad6c0ef", description = "The ID which uniquely identifies this plate to the client making the request")
-    public String getClientPlateId() {
-        return clientPlateId;
-    }
-
-    public void setClientPlateId(String clientPlateId) {
-        this.clientPlateId = clientPlateId;
-    }
-
-    public VendorPlate sampleSubmissionFormat(PlateFormat sampleSubmissionFormat) {
-        this.sampleSubmissionFormat = sampleSubmissionFormat;
-        return this;
-    }
-
-    /**
-     * Get sampleSubmissionFormat
-     *
-     * @return sampleSubmissionFormat
-     **/
-    @Schema(description = "")
-    public PlateFormat getSampleSubmissionFormat() {
-        return sampleSubmissionFormat;
-    }
-
-    public void setSampleSubmissionFormat(PlateFormat sampleSubmissionFormat) {
-        this.sampleSubmissionFormat = sampleSubmissionFormat;
-    }
-
-    public VendorPlate samples(List<VendorSample> samples) {
-        this.samples = samples;
-        return this;
-    }
-
-    public VendorPlate addSamplesItem(VendorSample samplesItem) {
-        if (this.samples == null) {
-            this.samples = new ArrayList<VendorSample>();
-        }
-        this.samples.add(samplesItem);
-        return this;
-    }
-
-    /**
-     * Get samples
-     *
-     * @return samples
-     **/
-    @Schema(description = "")
-    public List<VendorSample> getSamples() {
-        return samples;
-    }
-
-    public void setSamples(List<VendorSample> samples) {
-        this.samples = samples;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorPlate vendorPlate = (VendorPlate) o;
-        return Objects.equals(this.clientPlateBarcode, vendorPlate.clientPlateBarcode) &&
-                Objects.equals(this.clientPlateId, vendorPlate.clientPlateId) &&
-                Objects.equals(this.sampleSubmissionFormat, vendorPlate.sampleSubmissionFormat) &&
-                Objects.equals(this.samples, vendorPlate.samples);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(clientPlateBarcode, clientPlateId, sampleSubmissionFormat, samples);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorPlate {\n");
-
-        sb.append("    clientPlateBarcode: ").append(toIndentedString(clientPlateBarcode)).append("\n");
-        sb.append("    clientPlateId: ").append(toIndentedString(clientPlateId)).append("\n");
-        sb.append("    sampleSubmissionFormat: ").append(toIndentedString(sampleSubmissionFormat)).append("\n");
-        sb.append("    samples: ").append(toIndentedString(samples)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateListResponse.java
deleted file mode 100644
index 124e936b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * VendorPlateListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorPlateListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private VendorPlateListResponseResult result = null;
-
-    public VendorPlateListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public VendorPlateListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public VendorPlateListResponse result(VendorPlateListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public VendorPlateListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(VendorPlateListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorPlateListResponse vendorPlateListResponse = (VendorPlateListResponse) o;
-        return Objects.equals(this._atContext, vendorPlateListResponse._atContext) &&
-                Objects.equals(this.metadata, vendorPlateListResponse.metadata) &&
-                Objects.equals(this.result, vendorPlateListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorPlateListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateListResponseResult.java
deleted file mode 100644
index aa8f8989..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * VendorPlateListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorPlateListResponseResult {
-    @SerializedName("data")
-    private List<VendorPlate> data = new ArrayList<VendorPlate>();
-
-    public VendorPlateListResponseResult data(List<VendorPlate> data) {
-        this.data = data;
-        return this;
-    }
-
-    public VendorPlateListResponseResult addDataItem(VendorPlate dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<VendorPlate> getData() {
-        return data;
-    }
-
-    public void setData(List<VendorPlate> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorPlateListResponseResult vendorPlateListResponseResult = (VendorPlateListResponseResult) o;
-        return Objects.equals(this.data, vendorPlateListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorPlateListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmission.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmission.java
deleted file mode 100644
index 8a85810b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmission.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Response of a plate submission
- */
-@Schema(description = "Response of a plate submission")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorPlateSubmission {
-    @SerializedName("clientId")
-    private String clientId = null;
-
-    @SerializedName("numberOfSamples")
-    private Integer numberOfSamples = null;
-
-    @SerializedName("plates")
-    private List<VendorPlateSubmissionPlates> plates = new ArrayList<VendorPlateSubmissionPlates>();
-
-    public VendorPlateSubmission clientId(String clientId) {
-        this.clientId = clientId;
-        return this;
-    }
-
-    /**
-     * A unique, alpha-numeric ID which identifies the client to the vendor. Used to connect the order to the contract, billing, and contact info.
-     *
-     * @return clientId
-     **/
-    @Schema(example = "e470ae0d", required = true, description = "A unique, alpha-numeric ID which identifies the client to the vendor. Used to connect the order to the contract, billing, and contact info.")
-    public String getClientId() {
-        return clientId;
-    }
-
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
-    public VendorPlateSubmission numberOfSamples(Integer numberOfSamples) {
-        this.numberOfSamples = numberOfSamples;
-        return this;
-    }
-
-    /**
-     * The total number of samples contained in this request. Used for billing and basic validation of the request.
-     *
-     * @return numberOfSamples
-     **/
-    @Schema(example = "180", required = true, description = "The total number of samples contained in this request. Used for billing and basic validation of the request.")
-    public Integer getNumberOfSamples() {
-        return numberOfSamples;
-    }
-
-    public void setNumberOfSamples(Integer numberOfSamples) {
-        this.numberOfSamples = numberOfSamples;
-    }
-
-    public VendorPlateSubmission plates(List<VendorPlateSubmissionPlates> plates) {
-        this.plates = plates;
-        return this;
-    }
-
-    public VendorPlateSubmission addPlatesItem(VendorPlateSubmissionPlates platesItem) {
-        this.plates.add(platesItem);
-        return this;
-    }
-
-    /**
-     * Array of new plates to be submitted to a vendor
-     *
-     * @return plates
-     **/
-    @Schema(required = true, description = "Array of new plates to be submitted to a vendor")
-    public List<VendorPlateSubmissionPlates> getPlates() {
-        return plates;
-    }
-
-    public void setPlates(List<VendorPlateSubmissionPlates> plates) {
-        this.plates = plates;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorPlateSubmission vendorPlateSubmission = (VendorPlateSubmission) o;
-        return Objects.equals(this.clientId, vendorPlateSubmission.clientId) &&
-                Objects.equals(this.numberOfSamples, vendorPlateSubmission.numberOfSamples) &&
-                Objects.equals(this.plates, vendorPlateSubmission.plates);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(clientId, numberOfSamples, plates);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorPlateSubmission {\n");
-
-        sb.append("    clientId: ").append(toIndentedString(clientId)).append("\n");
-        sb.append("    numberOfSamples: ").append(toIndentedString(numberOfSamples)).append("\n");
-        sb.append("    plates: ").append(toIndentedString(plates)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionId.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionId.java
deleted file mode 100644
index 8c3a5618..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionId.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Response to an order request
- */
-@Schema(description = "Response to an order request")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorPlateSubmissionId {
-    @SerializedName("submissionId")
-    private String submissionId = null;
-
-    public VendorPlateSubmissionId submissionId(String submissionId) {
-        this.submissionId = submissionId;
-        return this;
-    }
-
-    /**
-     * A unique, alpha-numeric ID which identifies a set of plates which have been successfully submitted.
-     *
-     * @return submissionId
-     **/
-    @Schema(example = "f8f409e0", required = true, description = "A unique, alpha-numeric ID which identifies a set of plates which have been successfully submitted.")
-    public String getSubmissionId() {
-        return submissionId;
-    }
-
-    public void setSubmissionId(String submissionId) {
-        this.submissionId = submissionId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorPlateSubmissionId vendorPlateSubmissionId = (VendorPlateSubmissionId) o;
-        return Objects.equals(this.submissionId, vendorPlateSubmissionId.submissionId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(submissionId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorPlateSubmissionId {\n");
-
-        sb.append("    submissionId: ").append(toIndentedString(submissionId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionIdSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionIdSingleResponse.java
deleted file mode 100644
index 35571f67..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionIdSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * VendorPlateSubmissionIdSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorPlateSubmissionIdSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private VendorPlateSubmissionId result = null;
-
-    public VendorPlateSubmissionIdSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public VendorPlateSubmissionIdSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public VendorPlateSubmissionIdSingleResponse result(VendorPlateSubmissionId result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public VendorPlateSubmissionId getResult() {
-        return result;
-    }
-
-    public void setResult(VendorPlateSubmissionId result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorPlateSubmissionIdSingleResponse vendorPlateSubmissionIdSingleResponse = (VendorPlateSubmissionIdSingleResponse) o;
-        return Objects.equals(this._atContext, vendorPlateSubmissionIdSingleResponse._atContext) &&
-                Objects.equals(this.metadata, vendorPlateSubmissionIdSingleResponse.metadata) &&
-                Objects.equals(this.result, vendorPlateSubmissionIdSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorPlateSubmissionIdSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionPlates.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionPlates.java
deleted file mode 100644
index 2d8278d4..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionPlates.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * VendorPlateSubmissionPlates
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorPlateSubmissionPlates {
-    @SerializedName("clientPlateBarcode")
-    private String clientPlateBarcode = null;
-
-    @SerializedName("clientPlateId")
-    private String clientPlateId = null;
-
-    @SerializedName("sampleSubmissionFormat")
-    private PlateFormat sampleSubmissionFormat = null;
-
-    @SerializedName("samples")
-    private List<VendorSample> samples = null;
-
-    public VendorPlateSubmissionPlates clientPlateBarcode(String clientPlateBarcode) {
-        this.clientPlateBarcode = clientPlateBarcode;
-        return this;
-    }
-
-    /**
-     * (Optional) The value of the bar code attached to this plate
-     *
-     * @return clientPlateBarcode
-     **/
-    @Schema(example = "bfb33593", description = "(Optional) The value of the bar code attached to this plate")
-    public String getClientPlateBarcode() {
-        return clientPlateBarcode;
-    }
-
-    public void setClientPlateBarcode(String clientPlateBarcode) {
-        this.clientPlateBarcode = clientPlateBarcode;
-    }
-
-    public VendorPlateSubmissionPlates clientPlateId(String clientPlateId) {
-        this.clientPlateId = clientPlateId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies this plate to the client making the request
-     *
-     * @return clientPlateId
-     **/
-    @Schema(example = "dae8f49d", description = "The ID which uniquely identifies this plate to the client making the request")
-    public String getClientPlateId() {
-        return clientPlateId;
-    }
-
-    public void setClientPlateId(String clientPlateId) {
-        this.clientPlateId = clientPlateId;
-    }
-
-    public VendorPlateSubmissionPlates sampleSubmissionFormat(PlateFormat sampleSubmissionFormat) {
-        this.sampleSubmissionFormat = sampleSubmissionFormat;
-        return this;
-    }
-
-    /**
-     * Get sampleSubmissionFormat
-     *
-     * @return sampleSubmissionFormat
-     **/
-    @Schema(description = "")
-    public PlateFormat getSampleSubmissionFormat() {
-        return sampleSubmissionFormat;
-    }
-
-    public void setSampleSubmissionFormat(PlateFormat sampleSubmissionFormat) {
-        this.sampleSubmissionFormat = sampleSubmissionFormat;
-    }
-
-    public VendorPlateSubmissionPlates samples(List<VendorSample> samples) {
-        this.samples = samples;
-        return this;
-    }
-
-    public VendorPlateSubmissionPlates addSamplesItem(VendorSample samplesItem) {
-        if (this.samples == null) {
-            this.samples = new ArrayList<VendorSample>();
-        }
-        this.samples.add(samplesItem);
-        return this;
-    }
-
-    /**
-     * Get samples
-     *
-     * @return samples
-     **/
-    @Schema(description = "")
-    public List<VendorSample> getSamples() {
-        return samples;
-    }
-
-    public void setSamples(List<VendorSample> samples) {
-        this.samples = samples;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorPlateSubmissionPlates vendorPlateSubmissionPlates = (VendorPlateSubmissionPlates) o;
-        return Objects.equals(this.clientPlateBarcode, vendorPlateSubmissionPlates.clientPlateBarcode) &&
-                Objects.equals(this.clientPlateId, vendorPlateSubmissionPlates.clientPlateId) &&
-                Objects.equals(this.sampleSubmissionFormat, vendorPlateSubmissionPlates.sampleSubmissionFormat) &&
-                Objects.equals(this.samples, vendorPlateSubmissionPlates.samples);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(clientPlateBarcode, clientPlateId, sampleSubmissionFormat, samples);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorPlateSubmissionPlates {\n");
-
-        sb.append("    clientPlateBarcode: ").append(toIndentedString(clientPlateBarcode)).append("\n");
-        sb.append("    clientPlateId: ").append(toIndentedString(clientPlateId)).append("\n");
-        sb.append("    sampleSubmissionFormat: ").append(toIndentedString(sampleSubmissionFormat)).append("\n");
-        sb.append("    samples: ").append(toIndentedString(samples)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionRequest.java
deleted file mode 100644
index 05afa03d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionRequest.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Request object structure to submit plate data to a vendor
- */
-@Schema(description = "Request object structure to submit plate data to a vendor")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorPlateSubmissionRequest {
-    @SerializedName("clientId")
-    private String clientId = null;
-
-    @SerializedName("numberOfSamples")
-    private Integer numberOfSamples = null;
-
-    @SerializedName("plates")
-    private List<VendorOrderSubmissionRequestPlates> plates = new ArrayList<VendorOrderSubmissionRequestPlates>();
-
-    /**
-     * The type of Samples being submitted
-     */
-    @JsonAdapter(SampleTypeEnum.Adapter.class)
-    public enum SampleTypeEnum {
-        DNA("DNA"),
-        RNA("RNA"),
-        TISSUE("Tissue");
-
-        private String value;
-
-        SampleTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static SampleTypeEnum fromValue(String input) {
-            for (SampleTypeEnum b : SampleTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<SampleTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final SampleTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public SampleTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return SampleTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("sampleType")
-    private SampleTypeEnum sampleType = null;
-
-    public VendorPlateSubmissionRequest clientId(String clientId) {
-        this.clientId = clientId;
-        return this;
-    }
-
-    /**
-     * A unique, alpha-numeric ID which identifies the client to the vendor. Used to connect the order to the contract, billing, and contact info.
-     *
-     * @return clientId
-     **/
-    @Schema(example = "b8aac350", required = true, description = "A unique, alpha-numeric ID which identifies the client to the vendor. Used to connect the order to the contract, billing, and contact info.")
-    public String getClientId() {
-        return clientId;
-    }
-
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
-    public VendorPlateSubmissionRequest numberOfSamples(Integer numberOfSamples) {
-        this.numberOfSamples = numberOfSamples;
-        return this;
-    }
-
-    /**
-     * The total number of samples contained in this request. Used for billing and basic validation of the request.
-     *
-     * @return numberOfSamples
-     **/
-    @Schema(example = "180", required = true, description = "The total number of samples contained in this request. Used for billing and basic validation of the request.")
-    public Integer getNumberOfSamples() {
-        return numberOfSamples;
-    }
-
-    public void setNumberOfSamples(Integer numberOfSamples) {
-        this.numberOfSamples = numberOfSamples;
-    }
-
-    public VendorPlateSubmissionRequest plates(List<VendorOrderSubmissionRequestPlates> plates) {
-        this.plates = plates;
-        return this;
-    }
-
-    public VendorPlateSubmissionRequest addPlatesItem(VendorOrderSubmissionRequestPlates platesItem) {
-        this.plates.add(platesItem);
-        return this;
-    }
-
-    /**
-     * Array of new plates to be submitted to a vendor
-     *
-     * @return plates
-     **/
-    @Schema(required = true, description = "Array of new plates to be submitted to a vendor")
-    public List<VendorOrderSubmissionRequestPlates> getPlates() {
-        return plates;
-    }
-
-    public void setPlates(List<VendorOrderSubmissionRequestPlates> plates) {
-        this.plates = plates;
-    }
-
-    public VendorPlateSubmissionRequest sampleType(SampleTypeEnum sampleType) {
-        this.sampleType = sampleType;
-        return this;
-    }
-
-    /**
-     * The type of Samples being submitted
-     *
-     * @return sampleType
-     **/
-    @Schema(example = "Tissue", required = true, description = "The type of Samples being submitted")
-    public SampleTypeEnum getSampleType() {
-        return sampleType;
-    }
-
-    public void setSampleType(SampleTypeEnum sampleType) {
-        this.sampleType = sampleType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorPlateSubmissionRequest vendorPlateSubmissionRequest = (VendorPlateSubmissionRequest) o;
-        return Objects.equals(this.clientId, vendorPlateSubmissionRequest.clientId) &&
-                Objects.equals(this.numberOfSamples, vendorPlateSubmissionRequest.numberOfSamples) &&
-                Objects.equals(this.plates, vendorPlateSubmissionRequest.plates) &&
-                Objects.equals(this.sampleType, vendorPlateSubmissionRequest.sampleType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(clientId, numberOfSamples, plates, sampleType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorPlateSubmissionRequest {\n");
-
-        sb.append("    clientId: ").append(toIndentedString(clientId)).append("\n");
-        sb.append("    numberOfSamples: ").append(toIndentedString(numberOfSamples)).append("\n");
-        sb.append("    plates: ").append(toIndentedString(plates)).append("\n");
-        sb.append("    sampleType: ").append(toIndentedString(sampleType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionSingleResponse.java
deleted file mode 100644
index 9f1bebed..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorPlateSubmissionSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * VendorPlateSubmissionSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorPlateSubmissionSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private VendorPlateSubmission result = null;
-
-    public VendorPlateSubmissionSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public VendorPlateSubmissionSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public VendorPlateSubmissionSingleResponse result(VendorPlateSubmission result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public VendorPlateSubmission getResult() {
-        return result;
-    }
-
-    public void setResult(VendorPlateSubmission result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorPlateSubmissionSingleResponse vendorPlateSubmissionSingleResponse = (VendorPlateSubmissionSingleResponse) o;
-        return Objects.equals(this._atContext, vendorPlateSubmissionSingleResponse._atContext) &&
-                Objects.equals(this.metadata, vendorPlateSubmissionSingleResponse.metadata) &&
-                Objects.equals(this.result, vendorPlateSubmissionSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorPlateSubmissionSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorResultFile.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorResultFile.java
deleted file mode 100644
index 0faef0ff..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorResultFile.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * VendorResultFile
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorResultFile {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("clientSampleIds")
-    private List<String> clientSampleIds = new ArrayList<String>();
-
-    @SerializedName("fileName")
-    private String fileName = null;
-
-    @SerializedName("fileType")
-    private String fileType = null;
-
-    @SerializedName("fileURL")
-    private String fileURL = null;
-
-    @SerializedName("md5sum")
-    private String md5sum = null;
-
-    public VendorResultFile additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public VendorResultFile putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public VendorResultFile clientSampleIds(List<String> clientSampleIds) {
-        this.clientSampleIds = clientSampleIds;
-        return this;
-    }
-
-    public VendorResultFile addClientSampleIdsItem(String clientSampleIdsItem) {
-        this.clientSampleIds.add(clientSampleIdsItem);
-        return this;
-    }
-
-    /**
-     * The list of sampleDbIds included in the file
-     *
-     * @return clientSampleIds
-     **/
-    @Schema(example = "[\"3968733e\",\"e0de6391\",\"66854172\"]", required = true, description = "The list of sampleDbIds included in the file")
-    public List<String> getClientSampleIds() {
-        return clientSampleIds;
-    }
-
-    public void setClientSampleIds(List<String> clientSampleIds) {
-        this.clientSampleIds = clientSampleIds;
-    }
-
-    public VendorResultFile fileName(String fileName) {
-        this.fileName = fileName;
-        return this;
-    }
-
-    /**
-     * Name of the file
-     *
-     * @return fileName
-     **/
-    @Schema(example = "sequence_data_ce640bd3.csv", required = true, description = "Name of the file")
-    public String getFileName() {
-        return fileName;
-    }
-
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
-    public VendorResultFile fileType(String fileType) {
-        this.fileType = fileType;
-        return this;
-    }
-
-    /**
-     * Format of the file
-     *
-     * @return fileType
-     **/
-    @Schema(example = "text/csv", required = true, description = "Format of the file")
-    public String getFileType() {
-        return fileType;
-    }
-
-    public void setFileType(String fileType) {
-        this.fileType = fileType;
-    }
-
-    public VendorResultFile fileURL(String fileURL) {
-        this.fileURL = fileURL;
-        return this;
-    }
-
-    /**
-     * The URL to a file with the results of a vendor analysis
-     *
-     * @return fileURL
-     **/
-    @Schema(example = "https://vendor.org/data/sequence_data_ce640bd3.csv", required = true, description = "The URL to a file with the results of a vendor analysis")
-    public String getFileURL() {
-        return fileURL;
-    }
-
-    public void setFileURL(String fileURL) {
-        this.fileURL = fileURL;
-    }
-
-    public VendorResultFile md5sum(String md5sum) {
-        this.md5sum = md5sum;
-        return this;
-    }
-
-    /**
-     * MD5 Hash Check Sum for the file to confirm download without error
-     *
-     * @return md5sum
-     **/
-    @Schema(example = "c2365e900c81a89cf74d83dab60df146", description = "MD5 Hash Check Sum for the file to confirm download without error")
-    public String getMd5sum() {
-        return md5sum;
-    }
-
-    public void setMd5sum(String md5sum) {
-        this.md5sum = md5sum;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorResultFile vendorResultFile = (VendorResultFile) o;
-        return Objects.equals(this.additionalInfo, vendorResultFile.additionalInfo) &&
-                Objects.equals(this.clientSampleIds, vendorResultFile.clientSampleIds) &&
-                Objects.equals(this.fileName, vendorResultFile.fileName) &&
-                Objects.equals(this.fileType, vendorResultFile.fileType) &&
-                Objects.equals(this.fileURL, vendorResultFile.fileURL) &&
-                Objects.equals(this.md5sum, vendorResultFile.md5sum);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, clientSampleIds, fileName, fileType, fileURL, md5sum);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorResultFile {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    clientSampleIds: ").append(toIndentedString(clientSampleIds)).append("\n");
-        sb.append("    fileName: ").append(toIndentedString(fileName)).append("\n");
-        sb.append("    fileType: ").append(toIndentedString(fileType)).append("\n");
-        sb.append("    fileURL: ").append(toIndentedString(fileURL)).append("\n");
-        sb.append("    md5sum: ").append(toIndentedString(md5sum)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorResultFileListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorResultFileListResponse.java
deleted file mode 100644
index a87638ec..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorResultFileListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * VendorResultFileListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorResultFileListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private VendorResultFileListResponseResult result = null;
-
-    public VendorResultFileListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public VendorResultFileListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public VendorResultFileListResponse result(VendorResultFileListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public VendorResultFileListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(VendorResultFileListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorResultFileListResponse vendorResultFileListResponse = (VendorResultFileListResponse) o;
-        return Objects.equals(this._atContext, vendorResultFileListResponse._atContext) &&
-                Objects.equals(this.metadata, vendorResultFileListResponse.metadata) &&
-                Objects.equals(this.result, vendorResultFileListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorResultFileListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorResultFileListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorResultFileListResponseResult.java
deleted file mode 100644
index f6d76e5e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorResultFileListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * VendorResultFileListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorResultFileListResponseResult {
-    @SerializedName("data")
-    private List<VendorResultFile> data = new ArrayList<VendorResultFile>();
-
-    public VendorResultFileListResponseResult data(List<VendorResultFile> data) {
-        this.data = data;
-        return this;
-    }
-
-    public VendorResultFileListResponseResult addDataItem(VendorResultFile dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<VendorResultFile> getData() {
-        return data;
-    }
-
-    public void setData(List<VendorResultFile> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorResultFileListResponseResult vendorResultFileListResponseResult = (VendorResultFileListResponseResult) o;
-        return Objects.equals(this.data, vendorResultFileListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorResultFileListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSample.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSample.java
deleted file mode 100644
index 29818be8..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSample.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * VendorSample
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorSample {
-    @SerializedName("clientSampleBarCode")
-    private String clientSampleBarCode = null;
-
-    @SerializedName("clientSampleId")
-    private String clientSampleId = null;
-
-    @SerializedName("column")
-    private Integer column = null;
-
-    @SerializedName("comments")
-    private String comments = null;
-
-    @SerializedName("concentration")
-    private VendorOrderSubmissionRequestConcentration concentration = null;
-
-    @SerializedName("organismName")
-    private String organismName = null;
-
-    @SerializedName("row")
-    private String row = null;
-
-    @SerializedName("speciesName")
-    private String speciesName = null;
-
-    @SerializedName("taxonomyOntologyReference")
-    private MethodBaseClassOntologyReference taxonomyOntologyReference = null;
-
-    @SerializedName("tissueType")
-    private String tissueType = null;
-
-    @SerializedName("tissueTypeOntologyReference")
-    private MethodBaseClassOntologyReference tissueTypeOntologyReference = null;
-
-    @SerializedName("volume")
-    private VendorOrderSubmissionRequestConcentration volume = null;
-
-    @SerializedName("well")
-    private String well = null;
-
-    public VendorSample clientSampleBarCode(String clientSampleBarCode) {
-        this.clientSampleBarCode = clientSampleBarCode;
-        return this;
-    }
-
-    /**
-     * (Optional) The value of the bar code attached to this sample
-     *
-     * @return clientSampleBarCode
-     **/
-    @Schema(example = "7c07e527", description = "(Optional) The value of the bar code attached to this sample")
-    public String getClientSampleBarCode() {
-        return clientSampleBarCode;
-    }
-
-    public void setClientSampleBarCode(String clientSampleBarCode) {
-        this.clientSampleBarCode = clientSampleBarCode;
-    }
-
-    public VendorSample clientSampleId(String clientSampleId) {
-        this.clientSampleId = clientSampleId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies this sample to the client making the request
-     *
-     * @return clientSampleId
-     **/
-    @Schema(example = "bd96bd69", required = true, description = "The ID which uniquely identifies this sample to the client making the request")
-    public String getClientSampleId() {
-        return clientSampleId;
-    }
-
-    public void setClientSampleId(String clientSampleId) {
-        this.clientSampleId = clientSampleId;
-    }
-
-    public VendorSample column(Integer column) {
-        this.column = column;
-        return this;
-    }
-
-    /**
-     * The Column identifier for this samples location in the plate
-     * minimum: 1
-     * maximum: 12
-     *
-     * @return column
-     **/
-    @Schema(example = "6", description = "The Column identifier for this samples location in the plate")
-    public Integer getColumn() {
-        return column;
-    }
-
-    public void setColumn(Integer column) {
-        this.column = column;
-    }
-
-    public VendorSample comments(String comments) {
-        this.comments = comments;
-        return this;
-    }
-
-    /**
-     * Generic comments about this sample for the vendor
-     *
-     * @return comments
-     **/
-    @Schema(example = "This is my favorite sample, please be extra careful with it.", description = "Generic comments about this sample for the vendor")
-    public String getComments() {
-        return comments;
-    }
-
-    public void setComments(String comments) {
-        this.comments = comments;
-    }
-
-    public VendorSample concentration(VendorOrderSubmissionRequestConcentration concentration) {
-        this.concentration = concentration;
-        return this;
-    }
-
-    /**
-     * Get concentration
-     *
-     * @return concentration
-     **/
-    @Schema(description = "")
-    public VendorOrderSubmissionRequestConcentration getConcentration() {
-        return concentration;
-    }
-
-    public void setConcentration(VendorOrderSubmissionRequestConcentration concentration) {
-        this.concentration = concentration;
-    }
-
-    public VendorSample organismName(String organismName) {
-        this.organismName = organismName;
-        return this;
-    }
-
-    /**
-     * Scientific organism name
-     *
-     * @return organismName
-     **/
-    @Schema(example = "Aspergillus fructus", description = "Scientific organism name")
-    public String getOrganismName() {
-        return organismName;
-    }
-
-    public void setOrganismName(String organismName) {
-        this.organismName = organismName;
-    }
-
-    public VendorSample row(String row) {
-        this.row = row;
-        return this;
-    }
-
-    /**
-     * The Row identifier for this samples location in the plate
-     *
-     * @return row
-     **/
-    @Schema(example = "B", description = "The Row identifier for this samples location in the plate")
-    public String getRow() {
-        return row;
-    }
-
-    public void setRow(String row) {
-        this.row = row;
-    }
-
-    public VendorSample speciesName(String speciesName) {
-        this.speciesName = speciesName;
-        return this;
-    }
-
-    /**
-     * Scientific species name
-     *
-     * @return speciesName
-     **/
-    @Schema(example = "Aspergillus fructus", description = "Scientific species name")
-    public String getSpeciesName() {
-        return speciesName;
-    }
-
-    public void setSpeciesName(String speciesName) {
-        this.speciesName = speciesName;
-    }
-
-    public VendorSample taxonomyOntologyReference(MethodBaseClassOntologyReference taxonomyOntologyReference) {
-        this.taxonomyOntologyReference = taxonomyOntologyReference;
-        return this;
-    }
-
-    /**
-     * Get taxonomyOntologyReference
-     *
-     * @return taxonomyOntologyReference
-     **/
-    @Schema(description = "")
-    public MethodBaseClassOntologyReference getTaxonomyOntologyReference() {
-        return taxonomyOntologyReference;
-    }
-
-    public void setTaxonomyOntologyReference(MethodBaseClassOntologyReference taxonomyOntologyReference) {
-        this.taxonomyOntologyReference = taxonomyOntologyReference;
-    }
-
-    public VendorSample tissueType(String tissueType) {
-        this.tissueType = tissueType;
-        return this;
-    }
-
-    /**
-     * The type of tissue in this sample. List of accepted tissue types can be found in the Vendor Specs.
-     *
-     * @return tissueType
-     **/
-    @Schema(example = "Root", description = "The type of tissue in this sample. List of accepted tissue types can be found in the Vendor Specs.")
-    public String getTissueType() {
-        return tissueType;
-    }
-
-    public void setTissueType(String tissueType) {
-        this.tissueType = tissueType;
-    }
-
-    public VendorSample tissueTypeOntologyReference(MethodBaseClassOntologyReference tissueTypeOntologyReference) {
-        this.tissueTypeOntologyReference = tissueTypeOntologyReference;
-        return this;
-    }
-
-    /**
-     * Get tissueTypeOntologyReference
-     *
-     * @return tissueTypeOntologyReference
-     **/
-    @Schema(description = "")
-    public MethodBaseClassOntologyReference getTissueTypeOntologyReference() {
-        return tissueTypeOntologyReference;
-    }
-
-    public void setTissueTypeOntologyReference(MethodBaseClassOntologyReference tissueTypeOntologyReference) {
-        this.tissueTypeOntologyReference = tissueTypeOntologyReference;
-    }
-
-    public VendorSample volume(VendorOrderSubmissionRequestConcentration volume) {
-        this.volume = volume;
-        return this;
-    }
-
-    /**
-     * Get volume
-     *
-     * @return volume
-     **/
-    @Schema(description = "")
-    public VendorOrderSubmissionRequestConcentration getVolume() {
-        return volume;
-    }
-
-    public void setVolume(VendorOrderSubmissionRequestConcentration volume) {
-        this.volume = volume;
-    }
-
-    public VendorSample well(String well) {
-        this.well = well;
-        return this;
-    }
-
-    /**
-     * The Well identifier for this samples location in the plate. Usually a concatenation of Row and Column, or just a number if the samples are not part of an ordered plate.
-     *
-     * @return well
-     **/
-    @Schema(example = "B6", description = "The Well identifier for this samples location in the plate. Usually a concatenation of Row and Column, or just a number if the samples are not part of an ordered plate.")
-    public String getWell() {
-        return well;
-    }
-
-    public void setWell(String well) {
-        this.well = well;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorSample vendorSample = (VendorSample) o;
-        return Objects.equals(this.clientSampleBarCode, vendorSample.clientSampleBarCode) &&
-                Objects.equals(this.clientSampleId, vendorSample.clientSampleId) &&
-                Objects.equals(this.column, vendorSample.column) &&
-                Objects.equals(this.comments, vendorSample.comments) &&
-                Objects.equals(this.concentration, vendorSample.concentration) &&
-                Objects.equals(this.organismName, vendorSample.organismName) &&
-                Objects.equals(this.row, vendorSample.row) &&
-                Objects.equals(this.speciesName, vendorSample.speciesName) &&
-                Objects.equals(this.taxonomyOntologyReference, vendorSample.taxonomyOntologyReference) &&
-                Objects.equals(this.tissueType, vendorSample.tissueType) &&
-                Objects.equals(this.tissueTypeOntologyReference, vendorSample.tissueTypeOntologyReference) &&
-                Objects.equals(this.volume, vendorSample.volume) &&
-                Objects.equals(this.well, vendorSample.well);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(clientSampleBarCode, clientSampleId, column, comments, concentration, organismName, row, speciesName, taxonomyOntologyReference, tissueType, tissueTypeOntologyReference, volume, well);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorSample {\n");
-
-        sb.append("    clientSampleBarCode: ").append(toIndentedString(clientSampleBarCode)).append("\n");
-        sb.append("    clientSampleId: ").append(toIndentedString(clientSampleId)).append("\n");
-        sb.append("    column: ").append(toIndentedString(column)).append("\n");
-        sb.append("    comments: ").append(toIndentedString(comments)).append("\n");
-        sb.append("    concentration: ").append(toIndentedString(concentration)).append("\n");
-        sb.append("    organismName: ").append(toIndentedString(organismName)).append("\n");
-        sb.append("    row: ").append(toIndentedString(row)).append("\n");
-        sb.append("    speciesName: ").append(toIndentedString(speciesName)).append("\n");
-        sb.append("    taxonomyOntologyReference: ").append(toIndentedString(taxonomyOntologyReference)).append("\n");
-        sb.append("    tissueType: ").append(toIndentedString(tissueType)).append("\n");
-        sb.append("    tissueTypeOntologyReference: ").append(toIndentedString(tissueTypeOntologyReference)).append("\n");
-        sb.append("    volume: ").append(toIndentedString(volume)).append("\n");
-        sb.append("    well: ").append(toIndentedString(well)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSpecification.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSpecification.java
deleted file mode 100644
index fe6816dc..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSpecification.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * VendorSpecification
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorSpecification {
-    @SerializedName("additionalInfo")
-    private Map<String, Object> additionalInfo = null;
-
-    @SerializedName("services")
-    private List<VendorSpecificationService> services = null;
-
-    @SerializedName("vendorContact")
-    private VendorContact vendorContact = null;
-
-    public VendorSpecification additionalInfo(Map<String, Object> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public VendorSpecification putAdditionalInfoItem(String key, Object additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, Object>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, Object> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, Object> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public VendorSpecification services(List<VendorSpecificationService> services) {
-        this.services = services;
-        return this;
-    }
-
-    public VendorSpecification addServicesItem(VendorSpecificationService servicesItem) {
-        if (this.services == null) {
-            this.services = new ArrayList<VendorSpecificationService>();
-        }
-        this.services.add(servicesItem);
-        return this;
-    }
-
-    /**
-     * List of platform specifications available at the vendor
-     *
-     * @return services
-     **/
-    @Schema(description = "List of platform specifications available at the vendor")
-    public List<VendorSpecificationService> getServices() {
-        return services;
-    }
-
-    public void setServices(List<VendorSpecificationService> services) {
-        this.services = services;
-    }
-
-    public VendorSpecification vendorContact(VendorContact vendorContact) {
-        this.vendorContact = vendorContact;
-        return this;
-    }
-
-    /**
-     * Get vendorContact
-     *
-     * @return vendorContact
-     **/
-    @Schema(description = "")
-    public VendorContact getVendorContact() {
-        return vendorContact;
-    }
-
-    public void setVendorContact(VendorContact vendorContact) {
-        this.vendorContact = vendorContact;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorSpecification vendorSpecification = (VendorSpecification) o;
-        return Objects.equals(this.additionalInfo, vendorSpecification.additionalInfo) &&
-                Objects.equals(this.services, vendorSpecification.services) &&
-                Objects.equals(this.vendorContact, vendorSpecification.vendorContact);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, services, vendorContact);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorSpecification {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    services: ").append(toIndentedString(services)).append("\n");
-        sb.append("    vendorContact: ").append(toIndentedString(vendorContact)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSpecificationService.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSpecificationService.java
deleted file mode 100644
index 30ac2aae..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSpecificationService.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * VendorSpecificationService
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorSpecificationService {
-    @SerializedName("serviceDescription")
-    private String serviceDescription = null;
-
-    @SerializedName("serviceId")
-    private String serviceId = null;
-
-    @SerializedName("serviceName")
-    private String serviceName = null;
-
-    /**
-     * The type of markers used in this services platform
-     */
-    @JsonAdapter(ServicePlatformMarkerTypeEnum.Adapter.class)
-    public enum ServicePlatformMarkerTypeEnum {
-        FIXED("FIXED"),
-        DISCOVERABLE("DISCOVERABLE");
-
-        private String value;
-
-        ServicePlatformMarkerTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static ServicePlatformMarkerTypeEnum fromValue(String input) {
-            for (ServicePlatformMarkerTypeEnum b : ServicePlatformMarkerTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<ServicePlatformMarkerTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final ServicePlatformMarkerTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public ServicePlatformMarkerTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return ServicePlatformMarkerTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("servicePlatformMarkerType")
-    private ServicePlatformMarkerTypeEnum servicePlatformMarkerType = null;
-
-    @SerializedName("servicePlatformName")
-    private String servicePlatformName = null;
-
-    @SerializedName("specificRequirements")
-    private List<VendorSpecificationServiceSpecificRequirements> specificRequirements = null;
-
-    public VendorSpecificationService serviceDescription(String serviceDescription) {
-        this.serviceDescription = serviceDescription;
-        return this;
-    }
-
-    /**
-     * Description of the vendor platform
-     *
-     * @return serviceDescription
-     **/
-    @Schema(example = "A combined DNA extract and Sequencing process using technology and science. Lots of automated pipet machines.", description = "Description of the vendor platform")
-    public String getServiceDescription() {
-        return serviceDescription;
-    }
-
-    public void setServiceDescription(String serviceDescription) {
-        this.serviceDescription = serviceDescription;
-    }
-
-    public VendorSpecificationService serviceId(String serviceId) {
-        this.serviceId = serviceId;
-        return this;
-    }
-
-    /**
-     * Unique identifier for this service
-     *
-     * @return serviceId
-     **/
-    @Schema(example = "085d298f", required = true, description = "Unique identifier for this service")
-    public String getServiceId() {
-        return serviceId;
-    }
-
-    public void setServiceId(String serviceId) {
-        this.serviceId = serviceId;
-    }
-
-    public VendorSpecificationService serviceName(String serviceName) {
-        this.serviceName = serviceName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a platform
-     *
-     * @return serviceName
-     **/
-    @Schema(example = "The Deluxe Service", required = true, description = "The human readable name of a platform")
-    public String getServiceName() {
-        return serviceName;
-    }
-
-    public void setServiceName(String serviceName) {
-        this.serviceName = serviceName;
-    }
-
-    public VendorSpecificationService servicePlatformMarkerType(ServicePlatformMarkerTypeEnum servicePlatformMarkerType) {
-        this.servicePlatformMarkerType = servicePlatformMarkerType;
-        return this;
-    }
-
-    /**
-     * The type of markers used in this services platform
-     *
-     * @return servicePlatformMarkerType
-     **/
-    @Schema(example = "FIXED", description = "The type of markers used in this services platform")
-    public ServicePlatformMarkerTypeEnum getServicePlatformMarkerType() {
-        return servicePlatformMarkerType;
-    }
-
-    public void setServicePlatformMarkerType(ServicePlatformMarkerTypeEnum servicePlatformMarkerType) {
-        this.servicePlatformMarkerType = servicePlatformMarkerType;
-    }
-
-    public VendorSpecificationService servicePlatformName(String servicePlatformName) {
-        this.servicePlatformName = servicePlatformName;
-        return this;
-    }
-
-    /**
-     * The technology platform used by this service
-     *
-     * @return servicePlatformName
-     **/
-    @Schema(example = "RNA-seq", description = "The technology platform used by this service")
-    public String getServicePlatformName() {
-        return servicePlatformName;
-    }
-
-    public void setServicePlatformName(String servicePlatformName) {
-        this.servicePlatformName = servicePlatformName;
-    }
-
-    public VendorSpecificationService specificRequirements(List<VendorSpecificationServiceSpecificRequirements> specificRequirements) {
-        this.specificRequirements = specificRequirements;
-        return this;
-    }
-
-    public VendorSpecificationService addSpecificRequirementsItem(VendorSpecificationServiceSpecificRequirements specificRequirementsItem) {
-        if (this.specificRequirements == null) {
-            this.specificRequirements = new ArrayList<VendorSpecificationServiceSpecificRequirements>();
-        }
-        this.specificRequirements.add(specificRequirementsItem);
-        return this;
-    }
-
-    /**
-     * Additional arbitrary requirements for a particular platform
-     *
-     * @return specificRequirements
-     **/
-    @Schema(example = "[{\"description\":\"The genus of the samples\",\"key\":\"genus\"},{\"description\":\"The species of the samples\",\"key\":\"species\"},{\"description\":\"Approximate volume of each sample (ex 2.3 ml)\",\"key\":\"volumePerWell\"},{\"description\":\"Does DNA extraction need to happen before sequencing (ex true)\",\"key\":\"extractDNA\"}]", description = "Additional arbitrary requirements for a particular platform")
-    public List<VendorSpecificationServiceSpecificRequirements> getSpecificRequirements() {
-        return specificRequirements;
-    }
-
-    public void setSpecificRequirements(List<VendorSpecificationServiceSpecificRequirements> specificRequirements) {
-        this.specificRequirements = specificRequirements;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorSpecificationService vendorSpecificationService = (VendorSpecificationService) o;
-        return Objects.equals(this.serviceDescription, vendorSpecificationService.serviceDescription) &&
-                Objects.equals(this.serviceId, vendorSpecificationService.serviceId) &&
-                Objects.equals(this.serviceName, vendorSpecificationService.serviceName) &&
-                Objects.equals(this.servicePlatformMarkerType, vendorSpecificationService.servicePlatformMarkerType) &&
-                Objects.equals(this.servicePlatformName, vendorSpecificationService.servicePlatformName) &&
-                Objects.equals(this.specificRequirements, vendorSpecificationService.specificRequirements);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(serviceDescription, serviceId, serviceName, servicePlatformMarkerType, servicePlatformName, specificRequirements);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorSpecificationService {\n");
-
-        sb.append("    serviceDescription: ").append(toIndentedString(serviceDescription)).append("\n");
-        sb.append("    serviceId: ").append(toIndentedString(serviceId)).append("\n");
-        sb.append("    serviceName: ").append(toIndentedString(serviceName)).append("\n");
-        sb.append("    servicePlatformMarkerType: ").append(toIndentedString(servicePlatformMarkerType)).append("\n");
-        sb.append("    servicePlatformName: ").append(toIndentedString(servicePlatformName)).append("\n");
-        sb.append("    specificRequirements: ").append(toIndentedString(specificRequirements)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSpecificationServiceSpecificRequirements.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSpecificationServiceSpecificRequirements.java
deleted file mode 100644
index 2de698ac..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSpecificationServiceSpecificRequirements.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * VendorSpecificationServiceSpecificRequirements
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorSpecificationServiceSpecificRequirements {
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("key")
-    private String key = null;
-
-    public VendorSpecificationServiceSpecificRequirements description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * The value of a key-value entry in a map of Vendor specific requirements
-     *
-     * @return description
-     **/
-    @Schema(description = "The value of a key-value entry in a map of Vendor specific requirements")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public VendorSpecificationServiceSpecificRequirements key(String key) {
-        this.key = key;
-        return this;
-    }
-
-    /**
-     * The key of a key-value entry in a map of Vendor specific requirements
-     *
-     * @return key
-     **/
-    @Schema(description = "The key of a key-value entry in a map of Vendor specific requirements")
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorSpecificationServiceSpecificRequirements vendorSpecificationServiceSpecificRequirements = (VendorSpecificationServiceSpecificRequirements) o;
-        return Objects.equals(this.description, vendorSpecificationServiceSpecificRequirements.description) &&
-                Objects.equals(this.key, vendorSpecificationServiceSpecificRequirements.key);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(description, key);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorSpecificationServiceSpecificRequirements {\n");
-
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    key: ").append(toIndentedString(key)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSpecificationSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSpecificationSingleResponse.java
deleted file mode 100644
index e903169e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/genotype/VendorSpecificationSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Genotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.genotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * VendorSpecificationSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T14:54:00.515Z[GMT]")
-public class VendorSpecificationSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private VendorSpecification result = null;
-
-    public VendorSpecificationSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public VendorSpecificationSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public VendorSpecificationSingleResponse result(VendorSpecification result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public VendorSpecification getResult() {
-        return result;
-    }
-
-    public void setResult(VendorSpecification result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VendorSpecificationSingleResponse vendorSpecificationSingleResponse = (VendorSpecificationSingleResponse) o;
-        return Objects.equals(this._atContext, vendorSpecificationSingleResponse._atContext) &&
-                Objects.equals(this.metadata, vendorSpecificationSingleResponse.metadata) &&
-                Objects.equals(this.result, vendorSpecificationSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VendorSpecificationSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BasePagination.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BasePagination.java
deleted file mode 100644
index 192945f1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BasePagination.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * The pagination object is applicable only when the payload contains a \&quot;data\&quot; key. It describes the pagination of the data contained in the \&quot;data\&quot; array, as a way to identify which subset of data is being returned.  &lt;br&gt; Pages are zero indexed, so the first page will be page 0 (zero).
- */
-@Schema(description = "The pagination object is applicable only when the payload contains a \"data\" key. It describes the pagination of the data contained in the \"data\" array, as a way to identify which subset of data is being returned.  <br> Pages are zero indexed, so the first page will be page 0 (zero).")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class BasePagination {
-    @SerializedName("currentPage")
-    private Integer currentPage = 0;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = 1000;
-
-    @SerializedName("totalCount")
-    private Integer totalCount = null;
-
-    @SerializedName("totalPages")
-    private Integer totalPages = null;
-
-    public BasePagination currentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-        return this;
-    }
-
-    /**
-     * The index number for the returned page of data. This should always match the requested page number or the default page (0).
-     *
-     * @return currentPage
-     **/
-    @Schema(example = "0", required = true, description = "The index number for the returned page of data. This should always match the requested page number or the default page (0).")
-    public Integer getCurrentPage() {
-        return currentPage;
-    }
-
-    public void setCurrentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-    }
-
-    public BasePagination pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", required = true, description = "The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public BasePagination totalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-        return this;
-    }
-
-    /**
-     * The total number of elements that are available on the server and match the requested query parameters.
-     *
-     * @return totalCount
-     **/
-    @Schema(example = "10", description = "The total number of elements that are available on the server and match the requested query parameters.")
-    public Integer getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public BasePagination totalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-        return this;
-    }
-
-    /**
-     * The total number of pages of elements available on the server. This should be calculated with the following formula.  &lt;br&gt; totalPages &#x3D; CEILING( totalCount / requested_page_size)
-     *
-     * @return totalPages
-     **/
-    @Schema(example = "1", description = "The total number of pages of elements available on the server. This should be calculated with the following formula.  <br> totalPages = CEILING( totalCount / requested_page_size)")
-    public Integer getTotalPages() {
-        return totalPages;
-    }
-
-    public void setTotalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        BasePagination basePagination = (BasePagination) o;
-        return Objects.equals(this.currentPage, basePagination.currentPage) &&
-                Objects.equals(this.pageSize, basePagination.pageSize) &&
-                Objects.equals(this.totalCount, basePagination.totalCount) &&
-                Objects.equals(this.totalPages, basePagination.totalPages);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(currentPage, pageSize, totalCount, totalPages);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class BasePagination {\n");
-
-        sb.append("    currentPage: ").append(toIndentedString(currentPage)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    totalCount: ").append(toIndentedString(totalCount)).append("\n");
-        sb.append("    totalPages: ").append(toIndentedString(totalPages)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BreedingMethod.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BreedingMethod.java
deleted file mode 100644
index 938f7373..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BreedingMethod.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * BreedingMethod
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class BreedingMethod {
-    @SerializedName("abbreviation")
-    private String abbreviation = null;
-
-    @SerializedName("breedingMethodDbId")
-    private String breedingMethodDbId = null;
-
-    @SerializedName("breedingMethodName")
-    private String breedingMethodName = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    public BreedingMethod abbreviation(String abbreviation) {
-        this.abbreviation = abbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Breeding Method
-     *
-     * @return abbreviation
-     **/
-    @Schema(example = "MB", description = "A shortened version of the human readable name for a Breeding Method")
-    public String getAbbreviation() {
-        return abbreviation;
-    }
-
-    public void setAbbreviation(String abbreviation) {
-        this.abbreviation = abbreviation;
-    }
-
-    public BreedingMethod breedingMethodDbId(String breedingMethodDbId) {
-        this.breedingMethodDbId = breedingMethodDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for this breeding method
-     *
-     * @return breedingMethodDbId
-     **/
-    @Schema(example = "ffcce7ef", required = true, description = "the unique identifier for this breeding method")
-    public String getBreedingMethodDbId() {
-        return breedingMethodDbId;
-    }
-
-    public void setBreedingMethodDbId(String breedingMethodDbId) {
-        this.breedingMethodDbId = breedingMethodDbId;
-    }
-
-    public BreedingMethod breedingMethodName(String breedingMethodName) {
-        this.breedingMethodName = breedingMethodName;
-        return this;
-    }
-
-    /**
-     * human readable name of the breeding method
-     *
-     * @return breedingMethodName
-     **/
-    @Schema(example = "Male Backcross", description = "human readable name of the breeding method")
-    public String getBreedingMethodName() {
-        return breedingMethodName;
-    }
-
-    public void setBreedingMethodName(String breedingMethodName) {
-        this.breedingMethodName = breedingMethodName;
-    }
-
-    public BreedingMethod description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * human readable description of the breeding method
-     *
-     * @return description
-     **/
-    @Schema(example = "Backcross to recover a specific gene.", description = "human readable description of the breeding method")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        BreedingMethod breedingMethod = (BreedingMethod) o;
-        return Objects.equals(this.abbreviation, breedingMethod.abbreviation) &&
-                Objects.equals(this.breedingMethodDbId, breedingMethod.breedingMethodDbId) &&
-                Objects.equals(this.breedingMethodName, breedingMethod.breedingMethodName) &&
-                Objects.equals(this.description, breedingMethod.description);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(abbreviation, breedingMethodDbId, breedingMethodName, description);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class BreedingMethod {\n");
-
-        sb.append("    abbreviation: ").append(toIndentedString(abbreviation)).append("\n");
-        sb.append("    breedingMethodDbId: ").append(toIndentedString(breedingMethodDbId)).append("\n");
-        sb.append("    breedingMethodName: ").append(toIndentedString(breedingMethodName)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BreedingMethodListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BreedingMethodListResponse.java
deleted file mode 100644
index 2235b78a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BreedingMethodListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * BreedingMethodListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class BreedingMethodListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private BreedingMethodListResponseResult result = null;
-
-    public BreedingMethodListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public BreedingMethodListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public BreedingMethodListResponse result(BreedingMethodListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public BreedingMethodListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(BreedingMethodListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        BreedingMethodListResponse breedingMethodListResponse = (BreedingMethodListResponse) o;
-        return Objects.equals(this._atContext, breedingMethodListResponse._atContext) &&
-                Objects.equals(this.metadata, breedingMethodListResponse.metadata) &&
-                Objects.equals(this.result, breedingMethodListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class BreedingMethodListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BreedingMethodListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BreedingMethodListResponseResult.java
deleted file mode 100644
index 51644e93..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BreedingMethodListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * BreedingMethodListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class BreedingMethodListResponseResult {
-    @SerializedName("data")
-    private List<BreedingMethod> data = new ArrayList<BreedingMethod>();
-
-    public BreedingMethodListResponseResult data(List<BreedingMethod> data) {
-        this.data = data;
-        return this;
-    }
-
-    public BreedingMethodListResponseResult addDataItem(BreedingMethod dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<BreedingMethod> getData() {
-        return data;
-    }
-
-    public void setData(List<BreedingMethod> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        BreedingMethodListResponseResult breedingMethodListResponseResult = (BreedingMethodListResponseResult) o;
-        return Objects.equals(this.data, breedingMethodListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class BreedingMethodListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BreedingMethodSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BreedingMethodSingleResponse.java
deleted file mode 100644
index 26b02285..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/BreedingMethodSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * BreedingMethodSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class BreedingMethodSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private BreedingMethod result = null;
-
-    public BreedingMethodSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public BreedingMethodSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public BreedingMethodSingleResponse result(BreedingMethod result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public BreedingMethod getResult() {
-        return result;
-    }
-
-    public void setResult(BreedingMethod result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        BreedingMethodSingleResponse breedingMethodSingleResponse = (BreedingMethodSingleResponse) o;
-        return Objects.equals(this._atContext, breedingMethodSingleResponse._atContext) &&
-                Objects.equals(this.metadata, breedingMethodSingleResponse.metadata) &&
-                Objects.equals(this.result, breedingMethodSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class BreedingMethodSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ContentTypes.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ContentTypes.java
deleted file mode 100644
index dd2a6402..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ContentTypes.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-/**
- * Gets or Sets ContentTypes
- */
-@JsonAdapter(ContentTypes.Adapter.class)
-public enum ContentTypes {
-    APPLICATION_JSON("application/json"),
-    TEXT_CSV("text/csv"),
-    TEXT_TSV("text/tsv"),
-    APPLICATION_FLAPJACK("application/flapjack");
-
-    private final String value;
-
-    ContentTypes(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    public static ContentTypes fromValue(String input) {
-        for (ContentTypes b : ContentTypes.values()) {
-            if (b.value.equals(input)) {
-                return b;
-            }
-        }
-        return null;
-    }
-
-    public static class Adapter extends TypeAdapter<ContentTypes> {
-        @Override
-        public void write(final JsonWriter jsonWriter, final ContentTypes enumeration) throws IOException {
-            jsonWriter.value(String.valueOf(enumeration.getValue()));
-        }
-
-        @Override
-        public ContentTypes read(final JsonReader jsonReader) throws IOException {
-            Object value = jsonReader.nextString();
-            return ContentTypes.fromValue((String) (value));
-        }
-    }
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Context.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Context.java
deleted file mode 100644
index daf5623e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Context.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.Objects;
-
-/**
- * The JSON-LD Context is used to provide JSON-LD definitions to each field in a JSON object. By providing an array of context file urls, a BrAPI response object becomes JSON-LD compatible.    For more information, see https://w3c.github.io/json-ld-syntax/#the-context
- */
-@Schema(description = "The JSON-LD Context is used to provide JSON-LD definitions to each field in a JSON object. By providing an array of context file urls, a BrAPI response object becomes JSON-LD compatible.    For more information, see https://w3c.github.io/json-ld-syntax/#the-context")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class Context extends ArrayList<String> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Context {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Cross.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Cross.java
deleted file mode 100644
index 27bf2f9b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Cross.java
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * Cross
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class Cross {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("crossAttributes")
-    private List<CrossCrossAttributes> crossAttributes = null;
-
-    @SerializedName("crossDbId")
-    private String crossDbId = null;
-
-    @SerializedName("crossName")
-    private String crossName = null;
-
-    /**
-     * the type of cross
-     */
-    @JsonAdapter(CrossTypeEnum.Adapter.class)
-    public enum CrossTypeEnum {
-        BIPARENTAL("BIPARENTAL"),
-        SELF("SELF"),
-        OPEN_POLLINATED("OPEN_POLLINATED"),
-        BULK("BULK"),
-        BULK_SELFED("BULK_SELFED"),
-        BULK_OPEN_POLLINATED("BULK_OPEN_POLLINATED"),
-        DOUBLE_HAPLOID("DOUBLE_HAPLOID");
-
-        private String value;
-
-        CrossTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static CrossTypeEnum fromValue(String input) {
-            for (CrossTypeEnum b : CrossTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<CrossTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final CrossTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public CrossTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return CrossTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("crossType")
-    private CrossTypeEnum crossType = null;
-
-    @SerializedName("crossingProjectDbId")
-    private String crossingProjectDbId = null;
-
-    @SerializedName("crossingProjectName")
-    private String crossingProjectName = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("parent1")
-    private CrossParent1 parent1 = null;
-
-    @SerializedName("parent2")
-    private CrossParent1 parent2 = null;
-
-    @SerializedName("plannedCrossDbId")
-    private String plannedCrossDbId = null;
-
-    @SerializedName("plannedCrossName")
-    private String plannedCrossName = null;
-
-    @SerializedName("pollinationEvents")
-    private List<CrossPollinationEvents> pollinationEvents = null;
-
-    @SerializedName("pollinationTimeStamp")
-    private OffsetDateTime pollinationTimeStamp = null;
-
-    public Cross additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Cross putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Cross crossAttributes(List<CrossCrossAttributes> crossAttributes) {
-        this.crossAttributes = crossAttributes;
-        return this;
-    }
-
-    public Cross addCrossAttributesItem(CrossCrossAttributes crossAttributesItem) {
-        if (this.crossAttributes == null) {
-            this.crossAttributes = new ArrayList<CrossCrossAttributes>();
-        }
-        this.crossAttributes.add(crossAttributesItem);
-        return this;
-    }
-
-    /**
-     * Set of custom attributes associated with a cross
-     *
-     * @return crossAttributes
-     **/
-    @Schema(description = "Set of custom attributes associated with a cross")
-    public List<CrossCrossAttributes> getCrossAttributes() {
-        return crossAttributes;
-    }
-
-    public void setCrossAttributes(List<CrossCrossAttributes> crossAttributes) {
-        this.crossAttributes = crossAttributes;
-    }
-
-    public Cross crossDbId(String crossDbId) {
-        this.crossDbId = crossDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for a cross
-     *
-     * @return crossDbId
-     **/
-    @Schema(example = "d105fd6f", description = "the unique identifier for a cross")
-    public String getCrossDbId() {
-        return crossDbId;
-    }
-
-    public void setCrossDbId(String crossDbId) {
-        this.crossDbId = crossDbId;
-    }
-
-    public Cross crossName(String crossName) {
-        this.crossName = crossName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a cross
-     *
-     * @return crossName
-     **/
-    @Schema(example = "my_Crosses_2018_01", description = "the human readable name for a cross")
-    public String getCrossName() {
-        return crossName;
-    }
-
-    public void setCrossName(String crossName) {
-        this.crossName = crossName;
-    }
-
-    public Cross crossType(CrossTypeEnum crossType) {
-        this.crossType = crossType;
-        return this;
-    }
-
-    /**
-     * the type of cross
-     *
-     * @return crossType
-     **/
-    @Schema(example = "BIPARENTAL", description = "the type of cross")
-    public CrossTypeEnum getCrossType() {
-        return crossType;
-    }
-
-    public void setCrossType(CrossTypeEnum crossType) {
-        this.crossType = crossType;
-    }
-
-    public Cross crossingProjectDbId(String crossingProjectDbId) {
-        this.crossingProjectDbId = crossingProjectDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for a crossing project
-     *
-     * @return crossingProjectDbId
-     **/
-    @Schema(example = "696d7c92", description = "the unique identifier for a crossing project")
-    public String getCrossingProjectDbId() {
-        return crossingProjectDbId;
-    }
-
-    public void setCrossingProjectDbId(String crossingProjectDbId) {
-        this.crossingProjectDbId = crossingProjectDbId;
-    }
-
-    public Cross crossingProjectName(String crossingProjectName) {
-        this.crossingProjectName = crossingProjectName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a crossing project
-     *
-     * @return crossingProjectName
-     **/
-    @Schema(example = "my_Crosses_2018", description = "the human readable name for a crossing project")
-    public String getCrossingProjectName() {
-        return crossingProjectName;
-    }
-
-    public void setCrossingProjectName(String crossingProjectName) {
-        this.crossingProjectName = crossingProjectName;
-    }
-
-    public Cross externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Cross addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Cross parent1(CrossParent1 parent1) {
-        this.parent1 = parent1;
-        return this;
-    }
-
-    /**
-     * Get parent1
-     *
-     * @return parent1
-     **/
-    @Schema(description = "")
-    public CrossParent1 getParent1() {
-        return parent1;
-    }
-
-    public void setParent1(CrossParent1 parent1) {
-        this.parent1 = parent1;
-    }
-
-    public Cross parent2(CrossParent1 parent2) {
-        this.parent2 = parent2;
-        return this;
-    }
-
-    /**
-     * Get parent2
-     *
-     * @return parent2
-     **/
-    @Schema(description = "")
-    public CrossParent1 getParent2() {
-        return parent2;
-    }
-
-    public void setParent2(CrossParent1 parent2) {
-        this.parent2 = parent2;
-    }
-
-    public Cross plannedCrossDbId(String plannedCrossDbId) {
-        this.plannedCrossDbId = plannedCrossDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for a planned cross
-     *
-     * @return plannedCrossDbId
-     **/
-    @Schema(example = "c8905568", description = "the unique identifier for a planned cross")
-    public String getPlannedCrossDbId() {
-        return plannedCrossDbId;
-    }
-
-    public void setPlannedCrossDbId(String plannedCrossDbId) {
-        this.plannedCrossDbId = plannedCrossDbId;
-    }
-
-    public Cross plannedCrossName(String plannedCrossName) {
-        this.plannedCrossName = plannedCrossName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a planned cross
-     *
-     * @return plannedCrossName
-     **/
-    @Schema(example = "my_Crosses_2018_01", description = "the human readable name for a planned cross")
-    public String getPlannedCrossName() {
-        return plannedCrossName;
-    }
-
-    public void setPlannedCrossName(String plannedCrossName) {
-        this.plannedCrossName = plannedCrossName;
-    }
-
-    public Cross pollinationEvents(List<CrossPollinationEvents> pollinationEvents) {
-        this.pollinationEvents = pollinationEvents;
-        return this;
-    }
-
-    public Cross addPollinationEventsItem(CrossPollinationEvents pollinationEventsItem) {
-        if (this.pollinationEvents == null) {
-            this.pollinationEvents = new ArrayList<CrossPollinationEvents>();
-        }
-        this.pollinationEvents.add(pollinationEventsItem);
-        return this;
-    }
-
-    /**
-     * The list of pollination events that occurred for this cross
-     *
-     * @return pollinationEvents
-     **/
-    @Schema(description = "The list of pollination events that occurred for this cross")
-    public List<CrossPollinationEvents> getPollinationEvents() {
-        return pollinationEvents;
-    }
-
-    public void setPollinationEvents(List<CrossPollinationEvents> pollinationEvents) {
-        this.pollinationEvents = pollinationEvents;
-    }
-
-    public Cross pollinationTimeStamp(OffsetDateTime pollinationTimeStamp) {
-        this.pollinationTimeStamp = pollinationTimeStamp;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;pollinationEvents&#x60;. Github issue number #265  &lt;br&gt;The timestamp when the pollination took place
-     *
-     * @return pollinationTimeStamp
-     **/
-    @Schema(description = "**Deprecated in v2.1** Please use `pollinationEvents`. Github issue number #265  <br>The timestamp when the pollination took place")
-    public OffsetDateTime getPollinationTimeStamp() {
-        return pollinationTimeStamp;
-    }
-
-    public void setPollinationTimeStamp(OffsetDateTime pollinationTimeStamp) {
-        this.pollinationTimeStamp = pollinationTimeStamp;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Cross cross = (Cross) o;
-        return Objects.equals(this.additionalInfo, cross.additionalInfo) &&
-                Objects.equals(this.crossAttributes, cross.crossAttributes) &&
-                Objects.equals(this.crossDbId, cross.crossDbId) &&
-                Objects.equals(this.crossName, cross.crossName) &&
-                Objects.equals(this.crossType, cross.crossType) &&
-                Objects.equals(this.crossingProjectDbId, cross.crossingProjectDbId) &&
-                Objects.equals(this.crossingProjectName, cross.crossingProjectName) &&
-                Objects.equals(this.externalReferences, cross.externalReferences) &&
-                Objects.equals(this.parent1, cross.parent1) &&
-                Objects.equals(this.parent2, cross.parent2) &&
-                Objects.equals(this.plannedCrossDbId, cross.plannedCrossDbId) &&
-                Objects.equals(this.plannedCrossName, cross.plannedCrossName) &&
-                Objects.equals(this.pollinationEvents, cross.pollinationEvents) &&
-                Objects.equals(this.pollinationTimeStamp, cross.pollinationTimeStamp);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, crossAttributes, crossDbId, crossName, crossType, crossingProjectDbId, crossingProjectName, externalReferences, parent1, parent2, plannedCrossDbId, plannedCrossName, pollinationEvents, pollinationTimeStamp);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Cross {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    crossAttributes: ").append(toIndentedString(crossAttributes)).append("\n");
-        sb.append("    crossDbId: ").append(toIndentedString(crossDbId)).append("\n");
-        sb.append("    crossName: ").append(toIndentedString(crossName)).append("\n");
-        sb.append("    crossType: ").append(toIndentedString(crossType)).append("\n");
-        sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
-        sb.append("    crossingProjectName: ").append(toIndentedString(crossingProjectName)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    parent1: ").append(toIndentedString(parent1)).append("\n");
-        sb.append("    parent2: ").append(toIndentedString(parent2)).append("\n");
-        sb.append("    plannedCrossDbId: ").append(toIndentedString(plannedCrossDbId)).append("\n");
-        sb.append("    plannedCrossName: ").append(toIndentedString(plannedCrossName)).append("\n");
-        sb.append("    pollinationEvents: ").append(toIndentedString(pollinationEvents)).append("\n");
-        sb.append("    pollinationTimeStamp: ").append(toIndentedString(pollinationTimeStamp)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossCrossAttributes.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossCrossAttributes.java
deleted file mode 100644
index 9bbee880..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossCrossAttributes.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * a custom attributes associated with a cross
- */
-@Schema(description = "a custom attributes associated with a cross")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class CrossCrossAttributes {
-    @SerializedName("crossAttributeName")
-    private String crossAttributeName = null;
-
-    @SerializedName("crossAttributeValue")
-    private String crossAttributeValue = null;
-
-    public CrossCrossAttributes crossAttributeName(String crossAttributeName) {
-        this.crossAttributeName = crossAttributeName;
-        return this;
-    }
-
-    /**
-     * the human readable name of a cross attribute
-     *
-     * @return crossAttributeName
-     **/
-    @Schema(example = "Humidity Percentage", description = "the human readable name of a cross attribute")
-    public String getCrossAttributeName() {
-        return crossAttributeName;
-    }
-
-    public void setCrossAttributeName(String crossAttributeName) {
-        this.crossAttributeName = crossAttributeName;
-    }
-
-    public CrossCrossAttributes crossAttributeValue(String crossAttributeValue) {
-        this.crossAttributeValue = crossAttributeValue;
-        return this;
-    }
-
-    /**
-     * the value of a cross attribute
-     *
-     * @return crossAttributeValue
-     **/
-    @Schema(example = "45", description = "the value of a cross attribute")
-    public String getCrossAttributeValue() {
-        return crossAttributeValue;
-    }
-
-    public void setCrossAttributeValue(String crossAttributeValue) {
-        this.crossAttributeValue = crossAttributeValue;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CrossCrossAttributes crossCrossAttributes = (CrossCrossAttributes) o;
-        return Objects.equals(this.crossAttributeName, crossCrossAttributes.crossAttributeName) &&
-                Objects.equals(this.crossAttributeValue, crossCrossAttributes.crossAttributeValue);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(crossAttributeName, crossAttributeValue);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CrossCrossAttributes {\n");
-
-        sb.append("    crossAttributeName: ").append(toIndentedString(crossAttributeName)).append("\n");
-        sb.append("    crossAttributeValue: ").append(toIndentedString(crossAttributeValue)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossExternalReferences.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossExternalReferences.java
deleted file mode 100644
index 8399efc9..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossExternalReferences.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * CrossExternalReferences
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class CrossExternalReferences {
-    @SerializedName("referenceID")
-    private String referenceID = null;
-
-    @SerializedName("referenceId")
-    private String referenceId = null;
-
-    @SerializedName("referenceSource")
-    private String referenceSource = null;
-
-    public CrossExternalReferences referenceID(String referenceID) {
-        this.referenceID = referenceID;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;referenceId&#x60;. Github issue number #460  &lt;br&gt;The external reference ID. Could be a simple string or a URI.
-     *
-     * @return referenceID
-     **/
-    @Schema(description = "**Deprecated in v2.1** Please use `referenceId`. Github issue number #460  <br>The external reference ID. Could be a simple string or a URI.")
-    public String getReferenceID() {
-        return referenceID;
-    }
-
-    public void setReferenceID(String referenceID) {
-        this.referenceID = referenceID;
-    }
-
-    public CrossExternalReferences referenceId(String referenceId) {
-        this.referenceId = referenceId;
-        return this;
-    }
-
-    /**
-     * The external reference ID. Could be a simple string or a URI.
-     *
-     * @return referenceId
-     **/
-    @Schema(description = "The external reference ID. Could be a simple string or a URI.")
-    public String getReferenceId() {
-        return referenceId;
-    }
-
-    public void setReferenceId(String referenceId) {
-        this.referenceId = referenceId;
-    }
-
-    public CrossExternalReferences referenceSource(String referenceSource) {
-        this.referenceSource = referenceSource;
-        return this;
-    }
-
-    /**
-     * An identifier for the source system or database of this reference
-     *
-     * @return referenceSource
-     **/
-    @Schema(description = "An identifier for the source system or database of this reference")
-    public String getReferenceSource() {
-        return referenceSource;
-    }
-
-    public void setReferenceSource(String referenceSource) {
-        this.referenceSource = referenceSource;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CrossExternalReferences crossExternalReferences = (CrossExternalReferences) o;
-        return Objects.equals(this.referenceID, crossExternalReferences.referenceID) &&
-                Objects.equals(this.referenceId, crossExternalReferences.referenceId) &&
-                Objects.equals(this.referenceSource, crossExternalReferences.referenceSource);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(referenceID, referenceId, referenceSource);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CrossExternalReferences {\n");
-
-        sb.append("    referenceID: ").append(toIndentedString(referenceID)).append("\n");
-        sb.append("    referenceId: ").append(toIndentedString(referenceId)).append("\n");
-        sb.append("    referenceSource: ").append(toIndentedString(referenceSource)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossNewRequest.java
deleted file mode 100644
index 113891d4..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossNewRequest.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * CrossNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class CrossNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("crossAttributes")
-    private List<CrossCrossAttributes> crossAttributes = null;
-
-    @SerializedName("crossName")
-    private String crossName = null;
-
-    /**
-     * the type of cross
-     */
-    @JsonAdapter(CrossTypeEnum.Adapter.class)
-    public enum CrossTypeEnum {
-        BIPARENTAL("BIPARENTAL"),
-        SELF("SELF"),
-        OPEN_POLLINATED("OPEN_POLLINATED"),
-        BULK("BULK"),
-        BULK_SELFED("BULK_SELFED"),
-        BULK_OPEN_POLLINATED("BULK_OPEN_POLLINATED"),
-        DOUBLE_HAPLOID("DOUBLE_HAPLOID");
-
-        private String value;
-
-        CrossTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static CrossTypeEnum fromValue(String input) {
-            for (CrossTypeEnum b : CrossTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<CrossTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final CrossTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public CrossTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return CrossTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("crossType")
-    private CrossTypeEnum crossType = null;
-
-    @SerializedName("crossingProjectDbId")
-    private String crossingProjectDbId = null;
-
-    @SerializedName("crossingProjectName")
-    private String crossingProjectName = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("parent1")
-    private CrossParent1 parent1 = null;
-
-    @SerializedName("parent2")
-    private CrossParent1 parent2 = null;
-
-    @SerializedName("plannedCrossDbId")
-    private String plannedCrossDbId = null;
-
-    @SerializedName("plannedCrossName")
-    private String plannedCrossName = null;
-
-    @SerializedName("pollinationEvents")
-    private List<CrossPollinationEvents> pollinationEvents = null;
-
-    @SerializedName("pollinationTimeStamp")
-    private OffsetDateTime pollinationTimeStamp = null;
-
-    public CrossNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public CrossNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public CrossNewRequest crossAttributes(List<CrossCrossAttributes> crossAttributes) {
-        this.crossAttributes = crossAttributes;
-        return this;
-    }
-
-    public CrossNewRequest addCrossAttributesItem(CrossCrossAttributes crossAttributesItem) {
-        if (this.crossAttributes == null) {
-            this.crossAttributes = new ArrayList<CrossCrossAttributes>();
-        }
-        this.crossAttributes.add(crossAttributesItem);
-        return this;
-    }
-
-    /**
-     * Set of custom attributes associated with a cross
-     *
-     * @return crossAttributes
-     **/
-    @Schema(description = "Set of custom attributes associated with a cross")
-    public List<CrossCrossAttributes> getCrossAttributes() {
-        return crossAttributes;
-    }
-
-    public void setCrossAttributes(List<CrossCrossAttributes> crossAttributes) {
-        this.crossAttributes = crossAttributes;
-    }
-
-    public CrossNewRequest crossName(String crossName) {
-        this.crossName = crossName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a cross
-     *
-     * @return crossName
-     **/
-    @Schema(example = "my_Crosses_2018_01", description = "the human readable name for a cross")
-    public String getCrossName() {
-        return crossName;
-    }
-
-    public void setCrossName(String crossName) {
-        this.crossName = crossName;
-    }
-
-    public CrossNewRequest crossType(CrossTypeEnum crossType) {
-        this.crossType = crossType;
-        return this;
-    }
-
-    /**
-     * the type of cross
-     *
-     * @return crossType
-     **/
-    @Schema(example = "BIPARENTAL", description = "the type of cross")
-    public CrossTypeEnum getCrossType() {
-        return crossType;
-    }
-
-    public void setCrossType(CrossTypeEnum crossType) {
-        this.crossType = crossType;
-    }
-
-    public CrossNewRequest crossingProjectDbId(String crossingProjectDbId) {
-        this.crossingProjectDbId = crossingProjectDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for a crossing project
-     *
-     * @return crossingProjectDbId
-     **/
-    @Schema(example = "696d7c92", description = "the unique identifier for a crossing project")
-    public String getCrossingProjectDbId() {
-        return crossingProjectDbId;
-    }
-
-    public void setCrossingProjectDbId(String crossingProjectDbId) {
-        this.crossingProjectDbId = crossingProjectDbId;
-    }
-
-    public CrossNewRequest crossingProjectName(String crossingProjectName) {
-        this.crossingProjectName = crossingProjectName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a crossing project
-     *
-     * @return crossingProjectName
-     **/
-    @Schema(example = "my_Crosses_2018", description = "the human readable name for a crossing project")
-    public String getCrossingProjectName() {
-        return crossingProjectName;
-    }
-
-    public void setCrossingProjectName(String crossingProjectName) {
-        this.crossingProjectName = crossingProjectName;
-    }
-
-    public CrossNewRequest externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public CrossNewRequest addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public CrossNewRequest parent1(CrossParent1 parent1) {
-        this.parent1 = parent1;
-        return this;
-    }
-
-    /**
-     * Get parent1
-     *
-     * @return parent1
-     **/
-    @Schema(description = "")
-    public CrossParent1 getParent1() {
-        return parent1;
-    }
-
-    public void setParent1(CrossParent1 parent1) {
-        this.parent1 = parent1;
-    }
-
-    public CrossNewRequest parent2(CrossParent1 parent2) {
-        this.parent2 = parent2;
-        return this;
-    }
-
-    /**
-     * Get parent2
-     *
-     * @return parent2
-     **/
-    @Schema(description = "")
-    public CrossParent1 getParent2() {
-        return parent2;
-    }
-
-    public void setParent2(CrossParent1 parent2) {
-        this.parent2 = parent2;
-    }
-
-    public CrossNewRequest plannedCrossDbId(String plannedCrossDbId) {
-        this.plannedCrossDbId = plannedCrossDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for a planned cross
-     *
-     * @return plannedCrossDbId
-     **/
-    @Schema(example = "c8905568", description = "the unique identifier for a planned cross")
-    public String getPlannedCrossDbId() {
-        return plannedCrossDbId;
-    }
-
-    public void setPlannedCrossDbId(String plannedCrossDbId) {
-        this.plannedCrossDbId = plannedCrossDbId;
-    }
-
-    public CrossNewRequest plannedCrossName(String plannedCrossName) {
-        this.plannedCrossName = plannedCrossName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a planned cross
-     *
-     * @return plannedCrossName
-     **/
-    @Schema(example = "my_Crosses_2018_01", description = "the human readable name for a planned cross")
-    public String getPlannedCrossName() {
-        return plannedCrossName;
-    }
-
-    public void setPlannedCrossName(String plannedCrossName) {
-        this.plannedCrossName = plannedCrossName;
-    }
-
-    public CrossNewRequest pollinationEvents(List<CrossPollinationEvents> pollinationEvents) {
-        this.pollinationEvents = pollinationEvents;
-        return this;
-    }
-
-    public CrossNewRequest addPollinationEventsItem(CrossPollinationEvents pollinationEventsItem) {
-        if (this.pollinationEvents == null) {
-            this.pollinationEvents = new ArrayList<CrossPollinationEvents>();
-        }
-        this.pollinationEvents.add(pollinationEventsItem);
-        return this;
-    }
-
-    /**
-     * The list of pollination events that occurred for this cross
-     *
-     * @return pollinationEvents
-     **/
-    @Schema(description = "The list of pollination events that occurred for this cross")
-    public List<CrossPollinationEvents> getPollinationEvents() {
-        return pollinationEvents;
-    }
-
-    public void setPollinationEvents(List<CrossPollinationEvents> pollinationEvents) {
-        this.pollinationEvents = pollinationEvents;
-    }
-
-    public CrossNewRequest pollinationTimeStamp(OffsetDateTime pollinationTimeStamp) {
-        this.pollinationTimeStamp = pollinationTimeStamp;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;pollinationEvents&#x60;. Github issue number #265  &lt;br&gt;The timestamp when the pollination took place
-     *
-     * @return pollinationTimeStamp
-     **/
-    @Schema(description = "**Deprecated in v2.1** Please use `pollinationEvents`. Github issue number #265  <br>The timestamp when the pollination took place")
-    public OffsetDateTime getPollinationTimeStamp() {
-        return pollinationTimeStamp;
-    }
-
-    public void setPollinationTimeStamp(OffsetDateTime pollinationTimeStamp) {
-        this.pollinationTimeStamp = pollinationTimeStamp;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CrossNewRequest crossNewRequest = (CrossNewRequest) o;
-        return Objects.equals(this.additionalInfo, crossNewRequest.additionalInfo) &&
-                Objects.equals(this.crossAttributes, crossNewRequest.crossAttributes) &&
-                Objects.equals(this.crossName, crossNewRequest.crossName) &&
-                Objects.equals(this.crossType, crossNewRequest.crossType) &&
-                Objects.equals(this.crossingProjectDbId, crossNewRequest.crossingProjectDbId) &&
-                Objects.equals(this.crossingProjectName, crossNewRequest.crossingProjectName) &&
-                Objects.equals(this.externalReferences, crossNewRequest.externalReferences) &&
-                Objects.equals(this.parent1, crossNewRequest.parent1) &&
-                Objects.equals(this.parent2, crossNewRequest.parent2) &&
-                Objects.equals(this.plannedCrossDbId, crossNewRequest.plannedCrossDbId) &&
-                Objects.equals(this.plannedCrossName, crossNewRequest.plannedCrossName) &&
-                Objects.equals(this.pollinationEvents, crossNewRequest.pollinationEvents) &&
-                Objects.equals(this.pollinationTimeStamp, crossNewRequest.pollinationTimeStamp);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, crossAttributes, crossName, crossType, crossingProjectDbId, crossingProjectName, externalReferences, parent1, parent2, plannedCrossDbId, plannedCrossName, pollinationEvents, pollinationTimeStamp);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CrossNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    crossAttributes: ").append(toIndentedString(crossAttributes)).append("\n");
-        sb.append("    crossName: ").append(toIndentedString(crossName)).append("\n");
-        sb.append("    crossType: ").append(toIndentedString(crossType)).append("\n");
-        sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
-        sb.append("    crossingProjectName: ").append(toIndentedString(crossingProjectName)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    parent1: ").append(toIndentedString(parent1)).append("\n");
-        sb.append("    parent2: ").append(toIndentedString(parent2)).append("\n");
-        sb.append("    plannedCrossDbId: ").append(toIndentedString(plannedCrossDbId)).append("\n");
-        sb.append("    plannedCrossName: ").append(toIndentedString(plannedCrossName)).append("\n");
-        sb.append("    pollinationEvents: ").append(toIndentedString(pollinationEvents)).append("\n");
-        sb.append("    pollinationTimeStamp: ").append(toIndentedString(pollinationTimeStamp)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossParent.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossParent.java
deleted file mode 100644
index 358fa0b1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossParent.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * CrossParent
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class CrossParent {
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    @SerializedName("observationUnitName")
-    private String observationUnitName = null;
-
-    /**
-     * The type of parent ex. &#x27;MALE&#x27;, &#x27;FEMALE&#x27;, &#x27;SELF&#x27;, &#x27;POPULATION&#x27;, etc.
-     */
-    @JsonAdapter(ParentTypeEnum.Adapter.class)
-    public enum ParentTypeEnum {
-        MALE("MALE"),
-        FEMALE("FEMALE"),
-        SELF("SELF"),
-        POPULATION("POPULATION");
-
-        private String value;
-
-        ParentTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static ParentTypeEnum fromValue(String input) {
-            for (ParentTypeEnum b : ParentTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<ParentTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final ParentTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public ParentTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return ParentTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("parentType")
-    private ParentTypeEnum parentType = null;
-
-    public CrossParent germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "d34b10c3", description = "the unique identifier for a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public CrossParent germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a germplasm
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "TME_419", description = "the human readable name for a germplasm")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public CrossParent observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for an observation unit
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "2e1926a7", description = "the unique identifier for an observation unit")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-    public CrossParent observationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-        return this;
-    }
-
-    /**
-     * the human readable name for an observation unit
-     *
-     * @return observationUnitName
-     **/
-    @Schema(example = "my_Plot_9001", description = "the human readable name for an observation unit")
-    public String getObservationUnitName() {
-        return observationUnitName;
-    }
-
-    public void setObservationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-    }
-
-    public CrossParent parentType(ParentTypeEnum parentType) {
-        this.parentType = parentType;
-        return this;
-    }
-
-    /**
-     * The type of parent ex. &#x27;MALE&#x27;, &#x27;FEMALE&#x27;, &#x27;SELF&#x27;, &#x27;POPULATION&#x27;, etc.
-     *
-     * @return parentType
-     **/
-    @Schema(example = "MALE", description = "The type of parent ex. 'MALE', 'FEMALE', 'SELF', 'POPULATION', etc.")
-    public ParentTypeEnum getParentType() {
-        return parentType;
-    }
-
-    public void setParentType(ParentTypeEnum parentType) {
-        this.parentType = parentType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CrossParent crossParent = (CrossParent) o;
-        return Objects.equals(this.germplasmDbId, crossParent.germplasmDbId) &&
-                Objects.equals(this.germplasmName, crossParent.germplasmName) &&
-                Objects.equals(this.observationUnitDbId, crossParent.observationUnitDbId) &&
-                Objects.equals(this.observationUnitName, crossParent.observationUnitName) &&
-                Objects.equals(this.parentType, crossParent.parentType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(germplasmDbId, germplasmName, observationUnitDbId, observationUnitName, parentType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CrossParent {\n");
-
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("    observationUnitName: ").append(toIndentedString(observationUnitName)).append("\n");
-        sb.append("    parentType: ").append(toIndentedString(parentType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossParent1.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossParent1.java
deleted file mode 100644
index 9a39f751..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossParent1.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * CrossParent1
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class CrossParent1 {
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    @SerializedName("observationUnitName")
-    private String observationUnitName = null;
-
-    /**
-     * The type of parent ex. &#x27;MALE&#x27;, &#x27;FEMALE&#x27;, &#x27;SELF&#x27;, &#x27;POPULATION&#x27;, etc.
-     */
-    @JsonAdapter(ParentTypeEnum.Adapter.class)
-    public enum ParentTypeEnum {
-        MALE("MALE"),
-        FEMALE("FEMALE"),
-        SELF("SELF"),
-        POPULATION("POPULATION");
-
-        private String value;
-
-        ParentTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static ParentTypeEnum fromValue(String input) {
-            for (ParentTypeEnum b : ParentTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<ParentTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final ParentTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public ParentTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return ParentTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("parentType")
-    private ParentTypeEnum parentType = null;
-
-    public CrossParent1 germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "d34b10c3", description = "the unique identifier for a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public CrossParent1 germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a germplasm
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "TME_419", description = "the human readable name for a germplasm")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public CrossParent1 observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for an observation unit
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "2e1926a7", description = "the unique identifier for an observation unit")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-    public CrossParent1 observationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-        return this;
-    }
-
-    /**
-     * the human readable name for an observation unit
-     *
-     * @return observationUnitName
-     **/
-    @Schema(example = "my_Plot_9001", description = "the human readable name for an observation unit")
-    public String getObservationUnitName() {
-        return observationUnitName;
-    }
-
-    public void setObservationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-    }
-
-    public CrossParent1 parentType(ParentTypeEnum parentType) {
-        this.parentType = parentType;
-        return this;
-    }
-
-    /**
-     * The type of parent ex. &#x27;MALE&#x27;, &#x27;FEMALE&#x27;, &#x27;SELF&#x27;, &#x27;POPULATION&#x27;, etc.
-     *
-     * @return parentType
-     **/
-    @Schema(example = "MALE", description = "The type of parent ex. 'MALE', 'FEMALE', 'SELF', 'POPULATION', etc.")
-    public ParentTypeEnum getParentType() {
-        return parentType;
-    }
-
-    public void setParentType(ParentTypeEnum parentType) {
-        this.parentType = parentType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CrossParent1 crossParent1 = (CrossParent1) o;
-        return Objects.equals(this.germplasmDbId, crossParent1.germplasmDbId) &&
-                Objects.equals(this.germplasmName, crossParent1.germplasmName) &&
-                Objects.equals(this.observationUnitDbId, crossParent1.observationUnitDbId) &&
-                Objects.equals(this.observationUnitName, crossParent1.observationUnitName) &&
-                Objects.equals(this.parentType, crossParent1.parentType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(germplasmDbId, germplasmName, observationUnitDbId, observationUnitName, parentType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CrossParent1 {\n");
-
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("    observationUnitName: ").append(toIndentedString(observationUnitName)).append("\n");
-        sb.append("    parentType: ").append(toIndentedString(parentType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossPollinationEvents.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossPollinationEvents.java
deleted file mode 100644
index 48a16710..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossPollinationEvents.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.Objects;
-
-/**
- * CrossPollinationEvents
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class CrossPollinationEvents {
-    @SerializedName("pollinationNumber")
-    private String pollinationNumber = null;
-
-    @SerializedName("pollinationSuccessful")
-    private Boolean pollinationSuccessful = null;
-
-    @SerializedName("pollinationTimeStamp")
-    private OffsetDateTime pollinationTimeStamp = null;
-
-    public CrossPollinationEvents pollinationNumber(String pollinationNumber) {
-        this.pollinationNumber = pollinationNumber;
-        return this;
-    }
-
-    /**
-     * The unique identifier for this pollination event
-     *
-     * @return pollinationNumber
-     **/
-    @Schema(description = "The unique identifier for this pollination event")
-    public String getPollinationNumber() {
-        return pollinationNumber;
-    }
-
-    public void setPollinationNumber(String pollinationNumber) {
-        this.pollinationNumber = pollinationNumber;
-    }
-
-    public CrossPollinationEvents pollinationSuccessful(Boolean pollinationSuccessful) {
-        this.pollinationSuccessful = pollinationSuccessful;
-        return this;
-    }
-
-    /**
-     * True if the pollination was successful
-     *
-     * @return pollinationSuccessful
-     **/
-    @Schema(description = "True if the pollination was successful")
-    public Boolean isPollinationSuccessful() {
-        return pollinationSuccessful;
-    }
-
-    public void setPollinationSuccessful(Boolean pollinationSuccessful) {
-        this.pollinationSuccessful = pollinationSuccessful;
-    }
-
-    public CrossPollinationEvents pollinationTimeStamp(OffsetDateTime pollinationTimeStamp) {
-        this.pollinationTimeStamp = pollinationTimeStamp;
-        return this;
-    }
-
-    /**
-     * The timestamp when the pollination took place
-     *
-     * @return pollinationTimeStamp
-     **/
-    @Schema(description = "The timestamp when the pollination took place")
-    public OffsetDateTime getPollinationTimeStamp() {
-        return pollinationTimeStamp;
-    }
-
-    public void setPollinationTimeStamp(OffsetDateTime pollinationTimeStamp) {
-        this.pollinationTimeStamp = pollinationTimeStamp;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CrossPollinationEvents crossPollinationEvents = (CrossPollinationEvents) o;
-        return Objects.equals(this.pollinationNumber, crossPollinationEvents.pollinationNumber) &&
-                Objects.equals(this.pollinationSuccessful, crossPollinationEvents.pollinationSuccessful) &&
-                Objects.equals(this.pollinationTimeStamp, crossPollinationEvents.pollinationTimeStamp);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(pollinationNumber, pollinationSuccessful, pollinationTimeStamp);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CrossPollinationEvents {\n");
-
-        sb.append("    pollinationNumber: ").append(toIndentedString(pollinationNumber)).append("\n");
-        sb.append("    pollinationSuccessful: ").append(toIndentedString(pollinationSuccessful)).append("\n");
-        sb.append("    pollinationTimeStamp: ").append(toIndentedString(pollinationTimeStamp)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossesListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossesListResponse.java
deleted file mode 100644
index 6fc967c8..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossesListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * CrossesListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class CrossesListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private CrossesListResponseResult result = null;
-
-    public CrossesListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public CrossesListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public CrossesListResponse result(CrossesListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public CrossesListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(CrossesListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CrossesListResponse crossesListResponse = (CrossesListResponse) o;
-        return Objects.equals(this._atContext, crossesListResponse._atContext) &&
-                Objects.equals(this.metadata, crossesListResponse.metadata) &&
-                Objects.equals(this.result, crossesListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CrossesListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossesListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossesListResponseResult.java
deleted file mode 100644
index 2dfd4967..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossesListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * CrossesListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class CrossesListResponseResult {
-    @SerializedName("data")
-    private List<Cross> data = new ArrayList<Cross>();
-
-    public CrossesListResponseResult data(List<Cross> data) {
-        this.data = data;
-        return this;
-    }
-
-    public CrossesListResponseResult addDataItem(Cross dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Cross> getData() {
-        return data;
-    }
-
-    public void setData(List<Cross> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CrossesListResponseResult crossesListResponseResult = (CrossesListResponseResult) o;
-        return Objects.equals(this.data, crossesListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CrossesListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProject.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProject.java
deleted file mode 100644
index 43a00001..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProject.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * CrossingProject
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class CrossingProject {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("crossingProjectDbId")
-    private String crossingProjectDbId = null;
-
-    @SerializedName("crossingProjectDescription")
-    private String crossingProjectDescription = null;
-
-    @SerializedName("crossingProjectName")
-    private String crossingProjectName = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("potentialParents")
-    private List<CrossParent1> potentialParents = null;
-
-    @SerializedName("programDbId")
-    private String programDbId = null;
-
-    @SerializedName("programName")
-    private String programName = null;
-
-    public CrossingProject additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public CrossingProject putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public CrossingProject commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * the common name of a crop (for multi-crop systems)
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Cassava", description = "the common name of a crop (for multi-crop systems)")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public CrossingProject crossingProjectDbId(String crossingProjectDbId) {
-        this.crossingProjectDbId = crossingProjectDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a crossing project
-     *
-     * @return crossingProjectDbId
-     **/
-    @Schema(example = "ce0e1c29", description = "The unique identifier for a crossing project")
-    public String getCrossingProjectDbId() {
-        return crossingProjectDbId;
-    }
-
-    public void setCrossingProjectDbId(String crossingProjectDbId) {
-        this.crossingProjectDbId = crossingProjectDbId;
-    }
-
-    public CrossingProject crossingProjectDescription(String crossingProjectDescription) {
-        this.crossingProjectDescription = crossingProjectDescription;
-        return this;
-    }
-
-    /**
-     * the description for a crossing project
-     *
-     * @return crossingProjectDescription
-     **/
-    @Schema(example = "Crosses between germplasm X and germplasm Y in male nursery study X_2018 and female nursery study Y_2018", description = "the description for a crossing project")
-    public String getCrossingProjectDescription() {
-        return crossingProjectDescription;
-    }
-
-    public void setCrossingProjectDescription(String crossingProjectDescription) {
-        this.crossingProjectDescription = crossingProjectDescription;
-    }
-
-    public CrossingProject crossingProjectName(String crossingProjectName) {
-        this.crossingProjectName = crossingProjectName;
-        return this;
-    }
-
-    /**
-     * The human readable name for a crossing project
-     *
-     * @return crossingProjectName
-     **/
-    @Schema(example = "Crosses_2018", description = "The human readable name for a crossing project")
-    public String getCrossingProjectName() {
-        return crossingProjectName;
-    }
-
-    public void setCrossingProjectName(String crossingProjectName) {
-        this.crossingProjectName = crossingProjectName;
-    }
-
-    public CrossingProject externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public CrossingProject addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public CrossingProject potentialParents(List<CrossParent1> potentialParents) {
-        this.potentialParents = potentialParents;
-        return this;
-    }
-
-    public CrossingProject addPotentialParentsItem(CrossParent1 potentialParentsItem) {
-        if (this.potentialParents == null) {
-            this.potentialParents = new ArrayList<CrossParent1>();
-        }
-        this.potentialParents.add(potentialParentsItem);
-        return this;
-    }
-
-    /**
-     * A list of all the potential parents in the crossing block, available in the crossing project &lt;br/&gt; If the parameter &#x27;includePotentialParents&#x27; is false, the array &#x27;potentialParents&#x27; should be empty, null, or excluded from the response object.
-     *
-     * @return potentialParents
-     **/
-    @Schema(description = "A list of all the potential parents in the crossing block, available in the crossing project <br/> If the parameter 'includePotentialParents' is false, the array 'potentialParents' should be empty, null, or excluded from the response object.")
-    public List<CrossParent1> getPotentialParents() {
-        return potentialParents;
-    }
-
-    public void setPotentialParents(List<CrossParent1> potentialParents) {
-        this.potentialParents = potentialParents;
-    }
-
-    public CrossingProject programDbId(String programDbId) {
-        this.programDbId = programDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for a program
-     *
-     * @return programDbId
-     **/
-    @Schema(example = "a088176c", description = "the unique identifier for a program")
-    public String getProgramDbId() {
-        return programDbId;
-    }
-
-    public void setProgramDbId(String programDbId) {
-        this.programDbId = programDbId;
-    }
-
-    public CrossingProject programName(String programName) {
-        this.programName = programName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a program
-     *
-     * @return programName
-     **/
-    @Schema(example = "IITA Cassava", description = "the human readable name for a program")
-    public String getProgramName() {
-        return programName;
-    }
-
-    public void setProgramName(String programName) {
-        this.programName = programName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CrossingProject crossingProject = (CrossingProject) o;
-        return Objects.equals(this.additionalInfo, crossingProject.additionalInfo) &&
-                Objects.equals(this.commonCropName, crossingProject.commonCropName) &&
-                Objects.equals(this.crossingProjectDbId, crossingProject.crossingProjectDbId) &&
-                Objects.equals(this.crossingProjectDescription, crossingProject.crossingProjectDescription) &&
-                Objects.equals(this.crossingProjectName, crossingProject.crossingProjectName) &&
-                Objects.equals(this.externalReferences, crossingProject.externalReferences) &&
-                Objects.equals(this.potentialParents, crossingProject.potentialParents) &&
-                Objects.equals(this.programDbId, crossingProject.programDbId) &&
-                Objects.equals(this.programName, crossingProject.programName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, commonCropName, crossingProjectDbId, crossingProjectDescription, crossingProjectName, externalReferences, potentialParents, programDbId, programName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CrossingProject {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
-        sb.append("    crossingProjectDescription: ").append(toIndentedString(crossingProjectDescription)).append("\n");
-        sb.append("    crossingProjectName: ").append(toIndentedString(crossingProjectName)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    potentialParents: ").append(toIndentedString(potentialParents)).append("\n");
-        sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-        sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProjectNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProjectNewRequest.java
deleted file mode 100644
index f93f7d20..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProjectNewRequest.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * CrossingProjectNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class CrossingProjectNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("crossingProjectDescription")
-    private String crossingProjectDescription = null;
-
-    @SerializedName("crossingProjectName")
-    private String crossingProjectName = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("potentialParents")
-    private List<CrossParent1> potentialParents = null;
-
-    @SerializedName("programDbId")
-    private String programDbId = null;
-
-    @SerializedName("programName")
-    private String programName = null;
-
-    public CrossingProjectNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public CrossingProjectNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public CrossingProjectNewRequest commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * the common name of a crop (for multi-crop systems)
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Cassava", description = "the common name of a crop (for multi-crop systems)")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public CrossingProjectNewRequest crossingProjectDescription(String crossingProjectDescription) {
-        this.crossingProjectDescription = crossingProjectDescription;
-        return this;
-    }
-
-    /**
-     * the description for a crossing project
-     *
-     * @return crossingProjectDescription
-     **/
-    @Schema(example = "Crosses between germplasm X and germplasm Y in male nursery study X_2018 and female nursery study Y_2018", description = "the description for a crossing project")
-    public String getCrossingProjectDescription() {
-        return crossingProjectDescription;
-    }
-
-    public void setCrossingProjectDescription(String crossingProjectDescription) {
-        this.crossingProjectDescription = crossingProjectDescription;
-    }
-
-    public CrossingProjectNewRequest crossingProjectName(String crossingProjectName) {
-        this.crossingProjectName = crossingProjectName;
-        return this;
-    }
-
-    /**
-     * The human readable name for a crossing project
-     *
-     * @return crossingProjectName
-     **/
-    @Schema(example = "Crosses_2018", description = "The human readable name for a crossing project")
-    public String getCrossingProjectName() {
-        return crossingProjectName;
-    }
-
-    public void setCrossingProjectName(String crossingProjectName) {
-        this.crossingProjectName = crossingProjectName;
-    }
-
-    public CrossingProjectNewRequest externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public CrossingProjectNewRequest addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public CrossingProjectNewRequest potentialParents(List<CrossParent1> potentialParents) {
-        this.potentialParents = potentialParents;
-        return this;
-    }
-
-    public CrossingProjectNewRequest addPotentialParentsItem(CrossParent1 potentialParentsItem) {
-        if (this.potentialParents == null) {
-            this.potentialParents = new ArrayList<CrossParent1>();
-        }
-        this.potentialParents.add(potentialParentsItem);
-        return this;
-    }
-
-    /**
-     * A list of all the potential parents in the crossing block, available in the crossing project &lt;br/&gt; If the parameter &#x27;includePotentialParents&#x27; is false, the array &#x27;potentialParents&#x27; should be empty, null, or excluded from the response object.
-     *
-     * @return potentialParents
-     **/
-    @Schema(description = "A list of all the potential parents in the crossing block, available in the crossing project <br/> If the parameter 'includePotentialParents' is false, the array 'potentialParents' should be empty, null, or excluded from the response object.")
-    public List<CrossParent1> getPotentialParents() {
-        return potentialParents;
-    }
-
-    public void setPotentialParents(List<CrossParent1> potentialParents) {
-        this.potentialParents = potentialParents;
-    }
-
-    public CrossingProjectNewRequest programDbId(String programDbId) {
-        this.programDbId = programDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for a program
-     *
-     * @return programDbId
-     **/
-    @Schema(example = "a088176c", description = "the unique identifier for a program")
-    public String getProgramDbId() {
-        return programDbId;
-    }
-
-    public void setProgramDbId(String programDbId) {
-        this.programDbId = programDbId;
-    }
-
-    public CrossingProjectNewRequest programName(String programName) {
-        this.programName = programName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a program
-     *
-     * @return programName
-     **/
-    @Schema(example = "IITA Cassava", description = "the human readable name for a program")
-    public String getProgramName() {
-        return programName;
-    }
-
-    public void setProgramName(String programName) {
-        this.programName = programName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CrossingProjectNewRequest crossingProjectNewRequest = (CrossingProjectNewRequest) o;
-        return Objects.equals(this.additionalInfo, crossingProjectNewRequest.additionalInfo) &&
-                Objects.equals(this.commonCropName, crossingProjectNewRequest.commonCropName) &&
-                Objects.equals(this.crossingProjectDescription, crossingProjectNewRequest.crossingProjectDescription) &&
-                Objects.equals(this.crossingProjectName, crossingProjectNewRequest.crossingProjectName) &&
-                Objects.equals(this.externalReferences, crossingProjectNewRequest.externalReferences) &&
-                Objects.equals(this.potentialParents, crossingProjectNewRequest.potentialParents) &&
-                Objects.equals(this.programDbId, crossingProjectNewRequest.programDbId) &&
-                Objects.equals(this.programName, crossingProjectNewRequest.programName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, commonCropName, crossingProjectDescription, crossingProjectName, externalReferences, potentialParents, programDbId, programName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CrossingProjectNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    crossingProjectDescription: ").append(toIndentedString(crossingProjectDescription)).append("\n");
-        sb.append("    crossingProjectName: ").append(toIndentedString(crossingProjectName)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    potentialParents: ").append(toIndentedString(potentialParents)).append("\n");
-        sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-        sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProjectsListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProjectsListResponse.java
deleted file mode 100644
index 5f1e5d6d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProjectsListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * CrossingProjectsListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class CrossingProjectsListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private CrossingProjectsListResponseResult result = null;
-
-    public CrossingProjectsListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public CrossingProjectsListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public CrossingProjectsListResponse result(CrossingProjectsListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public CrossingProjectsListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(CrossingProjectsListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CrossingProjectsListResponse crossingProjectsListResponse = (CrossingProjectsListResponse) o;
-        return Objects.equals(this._atContext, crossingProjectsListResponse._atContext) &&
-                Objects.equals(this.metadata, crossingProjectsListResponse.metadata) &&
-                Objects.equals(this.result, crossingProjectsListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CrossingProjectsListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProjectsListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProjectsListResponseResult.java
deleted file mode 100644
index 01069c38..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProjectsListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * CrossingProjectsListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class CrossingProjectsListResponseResult {
-    @SerializedName("data")
-    private List<CrossingProject> data = new ArrayList<CrossingProject>();
-
-    public CrossingProjectsListResponseResult data(List<CrossingProject> data) {
-        this.data = data;
-        return this;
-    }
-
-    public CrossingProjectsListResponseResult addDataItem(CrossingProject dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<CrossingProject> getData() {
-        return data;
-    }
-
-    public void setData(List<CrossingProject> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CrossingProjectsListResponseResult crossingProjectsListResponseResult = (CrossingProjectsListResponseResult) o;
-        return Objects.equals(this.data, crossingProjectsListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CrossingProjectsListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProjectsSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProjectsSingleResponse.java
deleted file mode 100644
index 13483b2e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/CrossingProjectsSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * CrossingProjectsSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class CrossingProjectsSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private CrossingProject result = null;
-
-    public CrossingProjectsSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public CrossingProjectsSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public CrossingProjectsSingleResponse result(CrossingProject result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public CrossingProject getResult() {
-        return result;
-    }
-
-    public void setResult(CrossingProject result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CrossingProjectsSingleResponse crossingProjectsSingleResponse = (CrossingProjectsSingleResponse) o;
-        return Objects.equals(this._atContext, crossingProjectsSingleResponse._atContext) &&
-                Objects.equals(this.metadata, crossingProjectsSingleResponse.metadata) &&
-                Objects.equals(this.result, crossingProjectsSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class CrossingProjectsSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/DataFile.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/DataFile.java
deleted file mode 100644
index ca00392e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/DataFile.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * A dataFile contains a URL and the relevant file metadata to represent a file
- */
-@Schema(description = "A dataFile contains a URL and the relevant file metadata to represent a file")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class DataFile {
-    @SerializedName("fileDescription")
-    private String fileDescription = null;
-
-    @SerializedName("fileMD5Hash")
-    private String fileMD5Hash = null;
-
-    @SerializedName("fileName")
-    private String fileName = null;
-
-    @SerializedName("fileSize")
-    private Integer fileSize = null;
-
-    @SerializedName("fileType")
-    private String fileType = null;
-
-    @SerializedName("fileURL")
-    private String fileURL = null;
-
-    public DataFile fileDescription(String fileDescription) {
-        this.fileDescription = fileDescription;
-        return this;
-    }
-
-    /**
-     * A human readable description of the file contents
-     *
-     * @return fileDescription
-     **/
-    @Schema(example = "This is an Excel data file", description = "A human readable description of the file contents")
-    public String getFileDescription() {
-        return fileDescription;
-    }
-
-    public void setFileDescription(String fileDescription) {
-        this.fileDescription = fileDescription;
-    }
-
-    public DataFile fileMD5Hash(String fileMD5Hash) {
-        this.fileMD5Hash = fileMD5Hash;
-        return this;
-    }
-
-    /**
-     * The MD5 Hash of the file contents to be used as a check sum
-     *
-     * @return fileMD5Hash
-     **/
-    @Schema(example = "c2365e900c81a89cf74d83dab60df146", description = "The MD5 Hash of the file contents to be used as a check sum")
-    public String getFileMD5Hash() {
-        return fileMD5Hash;
-    }
-
-    public void setFileMD5Hash(String fileMD5Hash) {
-        this.fileMD5Hash = fileMD5Hash;
-    }
-
-    public DataFile fileName(String fileName) {
-        this.fileName = fileName;
-        return this;
-    }
-
-    /**
-     * The name of the file
-     *
-     * @return fileName
-     **/
-    @Schema(example = "datafile.xlsx", description = "The name of the file")
-    public String getFileName() {
-        return fileName;
-    }
-
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
-    public DataFile fileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-        return this;
-    }
-
-    /**
-     * The size of the file in bytes
-     *
-     * @return fileSize
-     **/
-    @Schema(example = "4398", description = "The size of the file in bytes")
-    public Integer getFileSize() {
-        return fileSize;
-    }
-
-    public void setFileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-    }
-
-    public DataFile fileType(String fileType) {
-        this.fileType = fileType;
-        return this;
-    }
-
-    /**
-     * The type or format of the file. Preferably MIME Type.
-     *
-     * @return fileType
-     **/
-    @Schema(example = "application/vnd.ms-excel", description = "The type or format of the file. Preferably MIME Type.")
-    public String getFileType() {
-        return fileType;
-    }
-
-    public void setFileType(String fileType) {
-        this.fileType = fileType;
-    }
-
-    public DataFile fileURL(String fileURL) {
-        this.fileURL = fileURL;
-        return this;
-    }
-
-    /**
-     * The absolute URL where the file is located
-     *
-     * @return fileURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/examples/datafile.xlsx", required = true, description = "The absolute URL where the file is located")
-    public String getFileURL() {
-        return fileURL;
-    }
-
-    public void setFileURL(String fileURL) {
-        this.fileURL = fileURL;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        DataFile dataFile = (DataFile) o;
-        return Objects.equals(this.fileDescription, dataFile.fileDescription) &&
-                Objects.equals(this.fileMD5Hash, dataFile.fileMD5Hash) &&
-                Objects.equals(this.fileName, dataFile.fileName) &&
-                Objects.equals(this.fileSize, dataFile.fileSize) &&
-                Objects.equals(this.fileType, dataFile.fileType) &&
-                Objects.equals(this.fileURL, dataFile.fileURL);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(fileDescription, fileMD5Hash, fileName, fileSize, fileType, fileURL);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class DataFile {\n");
-
-        sb.append("    fileDescription: ").append(toIndentedString(fileDescription)).append("\n");
-        sb.append("    fileMD5Hash: ").append(toIndentedString(fileMD5Hash)).append("\n");
-        sb.append("    fileName: ").append(toIndentedString(fileName)).append("\n");
-        sb.append("    fileSize: ").append(toIndentedString(fileSize)).append("\n");
-        sb.append("    fileType: ").append(toIndentedString(fileType)).append("\n");
-        sb.append("    fileURL: ").append(toIndentedString(fileURL)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ExternalReferences.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ExternalReferences.java
deleted file mode 100644
index 6abe7acf..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ExternalReferences.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.Objects;
-
-/**
- * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
- */
-@Schema(description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class ExternalReferences extends ArrayList<CrossExternalReferences> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ExternalReferences {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GeoJSON.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GeoJSON.java
deleted file mode 100644
index bdb7fc36..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GeoJSON.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * One geometry as defined by GeoJSON (RFC 7946). All coordinates are decimal values on the WGS84 geographic coordinate reference system.  Copied from RFC 7946 Section 3.1.1  A position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.
- */
-@Schema(description = "One geometry as defined by GeoJSON (RFC 7946). All coordinates are decimal values on the WGS84 geographic coordinate reference system.  Copied from RFC 7946 Section 3.1.1  A position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GeoJSON {
-    @SerializedName("geometry")
-    private OneOfGeoJSONGeometry geometry = null;
-
-    @SerializedName("type")
-    private String type = "Feature";
-
-    public GeoJSON geometry(OneOfGeoJSONGeometry geometry) {
-        this.geometry = geometry;
-        return this;
-    }
-
-    /**
-     * A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.
-     *
-     * @return geometry
-     **/
-    @Schema(example = "{\"coordinates\":[-76.506042,42.417373,123],\"type\":\"Point\"}", description = "A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.")
-    public OneOfGeoJSONGeometry getGeometry() {
-        return geometry;
-    }
-
-    public void setGeometry(OneOfGeoJSONGeometry geometry) {
-        this.geometry = geometry;
-    }
-
-    public GeoJSON type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The literal string \&quot;Feature\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Feature", description = "The literal string \"Feature\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GeoJSON geoJSON = (GeoJSON) o;
-        return Objects.equals(this.geometry, geoJSON.geometry) &&
-                Objects.equals(this.type, geoJSON.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(geometry, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GeoJSON {\n");
-
-        sb.append("    geometry: ").append(toIndentedString(geometry)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GeoJSONSearchArea.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GeoJSONSearchArea.java
deleted file mode 100644
index 9a1238d1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GeoJSONSearchArea.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * A GeoJSON Polygon which describes an area to search for other GeoJSON objects. All contained Points and intersecting Polygons should be returned as search results.   All coordinates are decimal values on the WGS84 geographic coordinate reference system.
- */
-@Schema(description = "A GeoJSON Polygon which describes an area to search for other GeoJSON objects. All contained Points and intersecting Polygons should be returned as search results.   All coordinates are decimal values on the WGS84 geographic coordinate reference system.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GeoJSONSearchArea {
-    @SerializedName("geometry")
-    private OneOfgeoJSONSearchAreaGeometry geometry = null;
-
-    @SerializedName("type")
-    private String type = "Feature";
-
-    public GeoJSONSearchArea geometry(OneOfgeoJSONSearchAreaGeometry geometry) {
-        this.geometry = geometry;
-        return this;
-    }
-
-    /**
-     * A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.
-     *
-     * @return geometry
-     **/
-    @Schema(example = "{\"coordinates\":[-76.506042,42.417373,123],\"type\":\"Point\"}", description = "A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.")
-    public OneOfgeoJSONSearchAreaGeometry getGeometry() {
-        return geometry;
-    }
-
-    public void setGeometry(OneOfgeoJSONSearchAreaGeometry geometry) {
-        this.geometry = geometry;
-    }
-
-    public GeoJSONSearchArea type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The literal string \&quot;Feature\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Feature", description = "The literal string \"Feature\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GeoJSONSearchArea geoJSONSearchArea = (GeoJSONSearchArea) o;
-        return Objects.equals(this.geometry, geoJSONSearchArea.geometry) &&
-                Objects.equals(this.type, geoJSONSearchArea.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(geometry, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GeoJSONSearchArea {\n");
-
-        sb.append("    geometry: ").append(toIndentedString(geometry)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Germplasm.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Germplasm.java
deleted file mode 100644
index bc6e4f99..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Germplasm.java
+++ /dev/null
@@ -1,959 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.LocalDate;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * Germplasm
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class Germplasm {
-    @SerializedName("accessionNumber")
-    private String accessionNumber = null;
-
-    @SerializedName("acquisitionDate")
-    private LocalDate acquisitionDate = null;
-
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    /**
-     * MCPD (v2.1) (SAMPSTAT) 19. The coding scheme proposed can be used at 3 different levels of detail: either by using the general codes such as 100, 200, 300, 400, or by using the more specific codes such as 110, 120, etc.   100) Wild  110) Natural  120) Semi-natural/wild  130) Semi-natural/sown  200) Weedy  300) Traditional cultivar/landrace  400) Breeding/research material  410) Breeders line  411) Synthetic population  412) Hybrid  413) Founder stock/base population  414) Inbred line (parent of hybrid cultivar)  415) Segregating population  416) Clonal selection  420) Genetic stock  421) Mutant (e.g. induced/insertion mutants, tilling populations)  422) Cytogenetic stocks (e.g. chromosome addition/substitution, aneuploids,  amphiploids)  423) Other genetic stocks (e.g. mapping populations)  500) Advanced or improved cultivar (conventional breeding methods)  600) GMO (by genetic engineering)  999) Other (Elaborate in REMARKS field)
-     */
-    @JsonAdapter(BiologicalStatusOfAccessionCodeEnum.Adapter.class)
-    public enum BiologicalStatusOfAccessionCodeEnum {
-        _100("100"),
-        _110("110"),
-        _120("120"),
-        _130("130"),
-        _200("200"),
-        _300("300"),
-        _400("400"),
-        _410("410"),
-        _411("411"),
-        _412("412"),
-        _413("413"),
-        _414("414"),
-        _415("415"),
-        _416("416"),
-        _420("420"),
-        _421("421"),
-        _422("422"),
-        _423("423"),
-        _500("500"),
-        _600("600"),
-        _999("999");
-
-        private String value;
-
-        BiologicalStatusOfAccessionCodeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static BiologicalStatusOfAccessionCodeEnum fromValue(String input) {
-            for (BiologicalStatusOfAccessionCodeEnum b : BiologicalStatusOfAccessionCodeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<BiologicalStatusOfAccessionCodeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final BiologicalStatusOfAccessionCodeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public BiologicalStatusOfAccessionCodeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return BiologicalStatusOfAccessionCodeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("biologicalStatusOfAccessionCode")
-    private BiologicalStatusOfAccessionCodeEnum biologicalStatusOfAccessionCode = null;
-
-    @SerializedName("biologicalStatusOfAccessionDescription")
-    private String biologicalStatusOfAccessionDescription = null;
-
-    @SerializedName("breedingMethodDbId")
-    private String breedingMethodDbId = null;
-
-    @SerializedName("breedingMethodName")
-    private String breedingMethodName = null;
-
-    @SerializedName("collection")
-    private String collection = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("countryOfOriginCode")
-    private String countryOfOriginCode = null;
-
-    @SerializedName("defaultDisplayName")
-    private String defaultDisplayName = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("donors")
-    private List<GermplasmDonors> donors = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("genus")
-    private String genus = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("germplasmOrigin")
-    private List<GermplasmGermplasmOrigin> germplasmOrigin = null;
-
-    @SerializedName("germplasmPUI")
-    private String germplasmPUI = null;
-
-    @SerializedName("germplasmPreprocessing")
-    private String germplasmPreprocessing = null;
-
-    @SerializedName("instituteCode")
-    private String instituteCode = null;
-
-    @SerializedName("instituteName")
-    private String instituteName = null;
-
-    @SerializedName("pedigree")
-    private String pedigree = null;
-
-    @SerializedName("seedSource")
-    private String seedSource = null;
-
-    @SerializedName("seedSourceDescription")
-    private String seedSourceDescription = null;
-
-    @SerializedName("species")
-    private String species = null;
-
-    @SerializedName("speciesAuthority")
-    private String speciesAuthority = null;
-
-    @SerializedName("storageTypes")
-    private List<GermplasmStorageTypes> storageTypes = null;
-
-    @SerializedName("subtaxa")
-    private String subtaxa = null;
-
-    @SerializedName("subtaxaAuthority")
-    private String subtaxaAuthority = null;
-
-    @SerializedName("synonyms")
-    private List<GermplasmSynonyms> synonyms = null;
-
-    @SerializedName("taxonIds")
-    private List<GermplasmTaxonIds> taxonIds = null;
-
-    public Germplasm accessionNumber(String accessionNumber) {
-        this.accessionNumber = accessionNumber;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a material or germplasm within a genebank  MCPD (v2.1) (ACCENUMB) 2. This is the unique identifier for accessions within a genebank, and is assigned when a sample is entered into the genebank collection (e.g. \&quot;PI 113869\&quot;).
-     *
-     * @return accessionNumber
-     **/
-    @Schema(example = "A0000003", description = "The unique identifier for a material or germplasm within a genebank  MCPD (v2.1) (ACCENUMB) 2. This is the unique identifier for accessions within a genebank, and is assigned when a sample is entered into the genebank collection (e.g. \"PI 113869\").")
-    public String getAccessionNumber() {
-        return accessionNumber;
-    }
-
-    public void setAccessionNumber(String accessionNumber) {
-        this.accessionNumber = accessionNumber;
-    }
-
-    public Germplasm acquisitionDate(LocalDate acquisitionDate) {
-        this.acquisitionDate = acquisitionDate;
-        return this;
-    }
-
-    /**
-     * The date a material or germplasm was acquired by the genebank   MCPD (v2.1) (ACQDATE) 12. Date on which the accession entered the collection [YYYYMMDD] where YYYY is the year, MM is the month and DD is the day. Missing data (MM or DD) should be indicated with hyphens or \&quot;00\&quot; [double zero].
-     *
-     * @return acquisitionDate
-     **/
-    @Schema(description = "The date a material or germplasm was acquired by the genebank   MCPD (v2.1) (ACQDATE) 12. Date on which the accession entered the collection [YYYYMMDD] where YYYY is the year, MM is the month and DD is the day. Missing data (MM or DD) should be indicated with hyphens or \"00\" [double zero].")
-    public LocalDate getAcquisitionDate() {
-        return acquisitionDate;
-    }
-
-    public void setAcquisitionDate(LocalDate acquisitionDate) {
-        this.acquisitionDate = acquisitionDate;
-    }
-
-    public Germplasm additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Germplasm putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Germplasm biologicalStatusOfAccessionCode(BiologicalStatusOfAccessionCodeEnum biologicalStatusOfAccessionCode) {
-        this.biologicalStatusOfAccessionCode = biologicalStatusOfAccessionCode;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (SAMPSTAT) 19. The coding scheme proposed can be used at 3 different levels of detail: either by using the general codes such as 100, 200, 300, 400, or by using the more specific codes such as 110, 120, etc.   100) Wild  110) Natural  120) Semi-natural/wild  130) Semi-natural/sown  200) Weedy  300) Traditional cultivar/landrace  400) Breeding/research material  410) Breeders line  411) Synthetic population  412) Hybrid  413) Founder stock/base population  414) Inbred line (parent of hybrid cultivar)  415) Segregating population  416) Clonal selection  420) Genetic stock  421) Mutant (e.g. induced/insertion mutants, tilling populations)  422) Cytogenetic stocks (e.g. chromosome addition/substitution, aneuploids,  amphiploids)  423) Other genetic stocks (e.g. mapping populations)  500) Advanced or improved cultivar (conventional breeding methods)  600) GMO (by genetic engineering)  999) Other (Elaborate in REMARKS field)
-     *
-     * @return biologicalStatusOfAccessionCode
-     **/
-    @Schema(example = "420", description = "MCPD (v2.1) (SAMPSTAT) 19. The coding scheme proposed can be used at 3 different levels of detail: either by using the general codes such as 100, 200, 300, 400, or by using the more specific codes such as 110, 120, etc.   100) Wild  110) Natural  120) Semi-natural/wild  130) Semi-natural/sown  200) Weedy  300) Traditional cultivar/landrace  400) Breeding/research material  410) Breeders line  411) Synthetic population  412) Hybrid  413) Founder stock/base population  414) Inbred line (parent of hybrid cultivar)  415) Segregating population  416) Clonal selection  420) Genetic stock  421) Mutant (e.g. induced/insertion mutants, tilling populations)  422) Cytogenetic stocks (e.g. chromosome addition/substitution, aneuploids,  amphiploids)  423) Other genetic stocks (e.g. mapping populations)  500) Advanced or improved cultivar (conventional breeding methods)  600) GMO (by genetic engineering)  999) Other (Elaborate in REMARKS field)")
-    public BiologicalStatusOfAccessionCodeEnum getBiologicalStatusOfAccessionCode() {
-        return biologicalStatusOfAccessionCode;
-    }
-
-    public void setBiologicalStatusOfAccessionCode(BiologicalStatusOfAccessionCodeEnum biologicalStatusOfAccessionCode) {
-        this.biologicalStatusOfAccessionCode = biologicalStatusOfAccessionCode;
-    }
-
-    public Germplasm biologicalStatusOfAccessionDescription(String biologicalStatusOfAccessionDescription) {
-        this.biologicalStatusOfAccessionDescription = biologicalStatusOfAccessionDescription;
-        return this;
-    }
-
-    /**
-     * Supplemental text description for &#x27;biologicalStatusOfAccessionCode&#x27;
-     *
-     * @return biologicalStatusOfAccessionDescription
-     **/
-    @Schema(example = "Genetic stock", description = "Supplemental text description for 'biologicalStatusOfAccessionCode'")
-    public String getBiologicalStatusOfAccessionDescription() {
-        return biologicalStatusOfAccessionDescription;
-    }
-
-    public void setBiologicalStatusOfAccessionDescription(String biologicalStatusOfAccessionDescription) {
-        this.biologicalStatusOfAccessionDescription = biologicalStatusOfAccessionDescription;
-    }
-
-    public Germplasm breedingMethodDbId(String breedingMethodDbId) {
-        this.breedingMethodDbId = breedingMethodDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for the breeding method used to create this germplasm
-     *
-     * @return breedingMethodDbId
-     **/
-    @Schema(example = "ffcce7ef", description = "The unique identifier for the breeding method used to create this germplasm")
-    public String getBreedingMethodDbId() {
-        return breedingMethodDbId;
-    }
-
-    public void setBreedingMethodDbId(String breedingMethodDbId) {
-        this.breedingMethodDbId = breedingMethodDbId;
-    }
-
-    public Germplasm breedingMethodName(String breedingMethodName) {
-        this.breedingMethodName = breedingMethodName;
-        return this;
-    }
-
-    /**
-     * human readable name of the breeding method
-     *
-     * @return breedingMethodName
-     **/
-    @Schema(example = "Male Backcross", description = "human readable name of the breeding method")
-    public String getBreedingMethodName() {
-        return breedingMethodName;
-    }
-
-    public void setBreedingMethodName(String breedingMethodName) {
-        this.breedingMethodName = breedingMethodName;
-    }
-
-    public Germplasm collection(String collection) {
-        this.collection = collection;
-        return this;
-    }
-
-    /**
-     * A specific panel/collection/population name this germplasm belongs to.
-     *
-     * @return collection
-     **/
-    @Schema(example = "Rice Diversity Panel 1 (RDP1)", description = "A specific panel/collection/population name this germplasm belongs to.")
-    public String getCollection() {
-        return collection;
-    }
-
-    public void setCollection(String collection) {
-        this.collection = collection;
-    }
-
-    public Germplasm commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Common name for the crop   MCPD (v2.1) (CROPNAME) 10. Common name of the crop. Example: \&quot;malting barley\&quot;, \&quot;mas\&quot;.
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Maize", description = "Common name for the crop   MCPD (v2.1) (CROPNAME) 10. Common name of the crop. Example: \"malting barley\", \"mas\".")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public Germplasm countryOfOriginCode(String countryOfOriginCode) {
-        this.countryOfOriginCode = countryOfOriginCode;
-        return this;
-    }
-
-    /**
-     * 3-letter ISO 3166-1 code of the country in which the sample was originally collected   MCPD (v2.1) (ORIGCTY) 13. 3-letter ISO 3166-1 code of the country in which the sample was originally collected (e.g. landrace, crop wild relative, farmers variety), bred or selected (breeding lines, GMOs, segregating populations, hybrids, modern cultivars, etc.). Note- Descriptors 14 to 16 below should be completed accordingly only if it was \&quot;collected\&quot;.
-     *
-     * @return countryOfOriginCode
-     **/
-    @Schema(example = "BES", description = "3-letter ISO 3166-1 code of the country in which the sample was originally collected   MCPD (v2.1) (ORIGCTY) 13. 3-letter ISO 3166-1 code of the country in which the sample was originally collected (e.g. landrace, crop wild relative, farmers variety), bred or selected (breeding lines, GMOs, segregating populations, hybrids, modern cultivars, etc.). Note- Descriptors 14 to 16 below should be completed accordingly only if it was \"collected\".")
-    public String getCountryOfOriginCode() {
-        return countryOfOriginCode;
-    }
-
-    public void setCountryOfOriginCode(String countryOfOriginCode) {
-        this.countryOfOriginCode = countryOfOriginCode;
-    }
-
-    public Germplasm defaultDisplayName(String defaultDisplayName) {
-        this.defaultDisplayName = defaultDisplayName;
-        return this;
-    }
-
-    /**
-     * Human readable name used for display purposes
-     *
-     * @return defaultDisplayName
-     **/
-    @Schema(example = "A0000003", description = "Human readable name used for display purposes")
-    public String getDefaultDisplayName() {
-        return defaultDisplayName;
-    }
-
-    public void setDefaultDisplayName(String defaultDisplayName) {
-        this.defaultDisplayName = defaultDisplayName;
-    }
-
-    public Germplasm documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public Germplasm donors(List<GermplasmDonors> donors) {
-        this.donors = donors;
-        return this;
-    }
-
-    public Germplasm addDonorsItem(GermplasmDonors donorsItem) {
-        if (this.donors == null) {
-            this.donors = new ArrayList<GermplasmDonors>();
-        }
-        this.donors.add(donorsItem);
-        return this;
-    }
-
-    /**
-     * List of donor institutes
-     *
-     * @return donors
-     **/
-    @Schema(description = "List of donor institutes")
-    public List<GermplasmDonors> getDonors() {
-        return donors;
-    }
-
-    public void setDonors(List<GermplasmDonors> donors) {
-        this.donors = donors;
-    }
-
-    public Germplasm externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Germplasm addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Germplasm genus(String genus) {
-        this.genus = genus;
-        return this;
-    }
-
-    /**
-     * Genus name for taxon. Initial uppercase letter required.  MCPD (v2.1) (GENUS) 5. Genus name for taxon. Initial uppercase letter required.  MIAPPE V1.1 (DM-43) Genus - Genus name for the organism under study, according to standard scientific nomenclature.
-     *
-     * @return genus
-     **/
-    @Schema(example = "Aspergillus", description = "Genus name for taxon. Initial uppercase letter required.  MCPD (v2.1) (GENUS) 5. Genus name for taxon. Initial uppercase letter required.  MIAPPE V1.1 (DM-43) Genus - Genus name for the organism under study, according to standard scientific nomenclature.")
-    public String getGenus() {
-        return genus;
-    }
-
-    public void setGenus(String genus) {
-        this.genus = genus;
-    }
-
-    public Germplasm germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm within the given database server  &lt;br&gt;MIAPPE V1.1 (DM-41) Biological material ID - Code used to identify the biological material in the data file. Should be unique within the Investigation. Can correspond to experimental plant ID, seed lot ID, etc. This material identification is different from a BiosampleID which corresponds to Observation Unit or Samples sections below.
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "d4076594", description = "The ID which uniquely identifies a germplasm within the given database server  <br>MIAPPE V1.1 (DM-41) Biological material ID - Code used to identify the biological material in the data file. Should be unique within the Investigation. Can correspond to experimental plant ID, seed lot ID, etc. This material identification is different from a BiosampleID which corresponds to Observation Unit or Samples sections below.")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public Germplasm germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * Name of the germplasm. It can be the preferred name and does not have to be unique.  MCPD (v2.1) (ACCENAME) 11. Either a registered or other designation given to the material received, other than the donors accession number (23) or collecting number (3). First letter uppercase. Multiple names are separated by a semicolon without space.
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000003", description = "Name of the germplasm. It can be the preferred name and does not have to be unique.  MCPD (v2.1) (ACCENAME) 11. Either a registered or other designation given to the material received, other than the donors accession number (23) or collecting number (3). First letter uppercase. Multiple names are separated by a semicolon without space.")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public Germplasm germplasmOrigin(List<GermplasmGermplasmOrigin> germplasmOrigin) {
-        this.germplasmOrigin = germplasmOrigin;
-        return this;
-    }
-
-    public Germplasm addGermplasmOriginItem(GermplasmGermplasmOrigin germplasmOriginItem) {
-        if (this.germplasmOrigin == null) {
-            this.germplasmOrigin = new ArrayList<GermplasmGermplasmOrigin>();
-        }
-        this.germplasmOrigin.add(germplasmOriginItem);
-        return this;
-    }
-
-    /**
-     * Information for material (orchard, natural sites, ...). Geographic identification of the plants from which seeds or cutting have been taken to produce that germplasm.
-     *
-     * @return germplasmOrigin
-     **/
-    @Schema(description = "Information for material (orchard, natural sites, ...). Geographic identification of the plants from which seeds or cutting have been taken to produce that germplasm.")
-    public List<GermplasmGermplasmOrigin> getGermplasmOrigin() {
-        return germplasmOrigin;
-    }
-
-    public void setGermplasmOrigin(List<GermplasmGermplasmOrigin> germplasmOrigin) {
-        this.germplasmOrigin = germplasmOrigin;
-    }
-
-    public Germplasm germplasmPUI(String germplasmPUI) {
-        this.germplasmPUI = germplasmPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier which represents a germplasm  MIAPPE V1.1 (DM-41) Biological material ID - Code used to identify the biological material in the data file. Should be unique within the Investigation. Can correspond to experimental plant ID, seed lot ID, etc This material identification is different from a BiosampleID which corresponds to Observation Unit or Samples sections below.  MIAPPE V1.1 (DM-51) Material source DOI - Digital Object Identifier (DOI) of the material source  MCPD (v2.1) (PUID) 0. Any persistent, unique identifier assigned to the accession so it can be unambiguously referenced at the global level and the information associated with it harvested through automated means. Report one PUID for each accession. The Secretariat of the International Treaty on Plant Genetic Resources for Food and Agriculture (PGRFA) is facilitating the assignment of a persistent unique identifier (PUID), in the form of a DOI, to PGRFA at the accession level. Genebanks not applying a true PUID to their accessions should use, and request recipients to use, the concatenation of INSTCODE, ACCENUMB, and GENUS as a globally unique identifier similar in most respects to the PUID whenever they exchange information on accessions with third parties.
-     *
-     * @return germplasmPUI
-     **/
-    @Schema(example = "http://pui.per/accession/A0000003", description = "The Permanent Unique Identifier which represents a germplasm  MIAPPE V1.1 (DM-41) Biological material ID - Code used to identify the biological material in the data file. Should be unique within the Investigation. Can correspond to experimental plant ID, seed lot ID, etc This material identification is different from a BiosampleID which corresponds to Observation Unit or Samples sections below.  MIAPPE V1.1 (DM-51) Material source DOI - Digital Object Identifier (DOI) of the material source  MCPD (v2.1) (PUID) 0. Any persistent, unique identifier assigned to the accession so it can be unambiguously referenced at the global level and the information associated with it harvested through automated means. Report one PUID for each accession. The Secretariat of the International Treaty on Plant Genetic Resources for Food and Agriculture (PGRFA) is facilitating the assignment of a persistent unique identifier (PUID), in the form of a DOI, to PGRFA at the accession level. Genebanks not applying a true PUID to their accessions should use, and request recipients to use, the concatenation of INSTCODE, ACCENUMB, and GENUS as a globally unique identifier similar in most respects to the PUID whenever they exchange information on accessions with third parties.")
-    public String getGermplasmPUI() {
-        return germplasmPUI;
-    }
-
-    public void setGermplasmPUI(String germplasmPUI) {
-        this.germplasmPUI = germplasmPUI;
-    }
-
-    public Germplasm germplasmPreprocessing(String germplasmPreprocessing) {
-        this.germplasmPreprocessing = germplasmPreprocessing;
-        return this;
-    }
-
-    /**
-     * Description of any process or treatment applied uniformly to the germplasm, prior to the study itself. Can be provided as free text or as an accession number from a suitable controlled vocabulary.
-     *
-     * @return germplasmPreprocessing
-     **/
-    @Schema(example = "EO:0007210; transplanted from study 2351 observation unit ID: pot:894", description = "Description of any process or treatment applied uniformly to the germplasm, prior to the study itself. Can be provided as free text or as an accession number from a suitable controlled vocabulary.")
-    public String getGermplasmPreprocessing() {
-        return germplasmPreprocessing;
-    }
-
-    public void setGermplasmPreprocessing(String germplasmPreprocessing) {
-        this.germplasmPreprocessing = germplasmPreprocessing;
-    }
-
-    public Germplasm instituteCode(String instituteCode) {
-        this.instituteCode = instituteCode;
-        return this;
-    }
-
-    /**
-     * The code for the institute that maintains the material.   MCPD (v2.1) (INSTCODE) 1. FAO WIEWS code of the institute where the accession is maintained. The codes consist of the 3-letter ISO 3166 country code of the country where the institute is located plus a number (e.g. PER001). The current set of institute codes is available from http://www.fao.org/wiews. For those institutes not yet having an FAO Code, or for those with \&quot;obsolete\&quot; codes, see \&quot;Common formatting rules (v)\&quot;.
-     *
-     * @return instituteCode
-     **/
-    @Schema(example = "PER001", description = "The code for the institute that maintains the material.   MCPD (v2.1) (INSTCODE) 1. FAO WIEWS code of the institute where the accession is maintained. The codes consist of the 3-letter ISO 3166 country code of the country where the institute is located plus a number (e.g. PER001). The current set of institute codes is available from http://www.fao.org/wiews. For those institutes not yet having an FAO Code, or for those with \"obsolete\" codes, see \"Common formatting rules (v)\".")
-    public String getInstituteCode() {
-        return instituteCode;
-    }
-
-    public void setInstituteCode(String instituteCode) {
-        this.instituteCode = instituteCode;
-    }
-
-    public Germplasm instituteName(String instituteName) {
-        this.instituteName = instituteName;
-        return this;
-    }
-
-    /**
-     * The name of the institute that maintains the material
-     *
-     * @return instituteName
-     **/
-    @Schema(example = "The BrAPI Institute", description = "The name of the institute that maintains the material")
-    public String getInstituteName() {
-        return instituteName;
-    }
-
-    public void setInstituteName(String instituteName) {
-        this.instituteName = instituteName;
-    }
-
-    public Germplasm pedigree(String pedigree) {
-        this.pedigree = pedigree;
-        return this;
-    }
-
-    /**
-     * The cross name and optional selection history.  MCPD (v2.1) (ANCEST) 20. Information about either pedigree or other description of ancestral information (e.g. parent variety in case of mutant or selection). For example a pedigree &#x27;Hanna/7*Atlas//Turk/8*Atlas&#x27; or a description &#x27;mutation found in Hanna&#x27;, &#x27;selection from Irene&#x27; or &#x27;cross involving amongst others Hanna and Irene&#x27;.
-     *
-     * @return pedigree
-     **/
-    @Schema(example = "A0000001/A0000002", description = "The cross name and optional selection history.  MCPD (v2.1) (ANCEST) 20. Information about either pedigree or other description of ancestral information (e.g. parent variety in case of mutant or selection). For example a pedigree 'Hanna/7*Atlas//Turk/8*Atlas' or a description 'mutation found in Hanna', 'selection from Irene' or 'cross involving amongst others Hanna and Irene'.")
-    public String getPedigree() {
-        return pedigree;
-    }
-
-    public void setPedigree(String pedigree) {
-        this.pedigree = pedigree;
-    }
-
-    public Germplasm seedSource(String seedSource) {
-        this.seedSource = seedSource;
-        return this;
-    }
-
-    /**
-     * An identifier for the source of the biological material &lt;br/&gt;MIAPPE V1.1 (DM-50) Material source ID (Holding institute/stock centre, accession) - An identifier for the source of the biological material, in the form of a key-value pair comprising the name/identifier of the repository from which the material was sourced plus the accession number of the repository for that material. Where an accession number has not been assigned, but the material has been derived from the crossing of known accessions, the material can be defined as follows: \&quot;mother_accession X father_accession\&quot;, or, if father is unknown, as \&quot;mother_accession X UNKNOWN\&quot;. For in situ material, the region of provenance may be used when an accession is not available.
-     *
-     * @return seedSource
-     **/
-    @Schema(example = "INRA:095115_inra", description = "An identifier for the source of the biological material <br/>MIAPPE V1.1 (DM-50) Material source ID (Holding institute/stock centre, accession) - An identifier for the source of the biological material, in the form of a key-value pair comprising the name/identifier of the repository from which the material was sourced plus the accession number of the repository for that material. Where an accession number has not been assigned, but the material has been derived from the crossing of known accessions, the material can be defined as follows: \"mother_accession X father_accession\", or, if father is unknown, as \"mother_accession X UNKNOWN\". For in situ material, the region of provenance may be used when an accession is not available.")
-    public String getSeedSource() {
-        return seedSource;
-    }
-
-    public void setSeedSource(String seedSource) {
-        this.seedSource = seedSource;
-    }
-
-    public Germplasm seedSourceDescription(String seedSourceDescription) {
-        this.seedSourceDescription = seedSourceDescription;
-        return this;
-    }
-
-    /**
-     * Description of the material source  MIAPPE V1.1 (DM-56) Material source description - Description of the material source
-     *
-     * @return seedSourceDescription
-     **/
-    @Schema(example = "Branches were collected from a 10-year-old tree growing in a progeny trial established in a loamy brown earth soil.", description = "Description of the material source  MIAPPE V1.1 (DM-56) Material source description - Description of the material source")
-    public String getSeedSourceDescription() {
-        return seedSourceDescription;
-    }
-
-    public void setSeedSourceDescription(String seedSourceDescription) {
-        this.seedSourceDescription = seedSourceDescription;
-    }
-
-    public Germplasm species(String species) {
-        this.species = species;
-        return this;
-    }
-
-    /**
-     * Specific epithet portion of the scientific name in lowercase letters.  MCPD (v2.1) (SPECIES) 6. Specific epithet portion of the scientific name in lowercase letters. Only the following abbreviation is allowed: \&quot;sp.\&quot;   MIAPPE V1.1 (DM-44) Species - Species name (formally: specific epithet) for the organism under study, according to standard scientific nomenclature.
-     *
-     * @return species
-     **/
-    @Schema(example = "fructus", description = "Specific epithet portion of the scientific name in lowercase letters.  MCPD (v2.1) (SPECIES) 6. Specific epithet portion of the scientific name in lowercase letters. Only the following abbreviation is allowed: \"sp.\"   MIAPPE V1.1 (DM-44) Species - Species name (formally: specific epithet) for the organism under study, according to standard scientific nomenclature.")
-    public String getSpecies() {
-        return species;
-    }
-
-    public void setSpecies(String species) {
-        this.species = species;
-    }
-
-    public Germplasm speciesAuthority(String speciesAuthority) {
-        this.speciesAuthority = speciesAuthority;
-        return this;
-    }
-
-    /**
-     * The authority organization responsible for tracking and maintaining the species name   MCPD (v2.1) (SPAUTHOR) 7. Provide the authority for the species name.
-     *
-     * @return speciesAuthority
-     **/
-    @Schema(example = "Smith, 1822", description = "The authority organization responsible for tracking and maintaining the species name   MCPD (v2.1) (SPAUTHOR) 7. Provide the authority for the species name.")
-    public String getSpeciesAuthority() {
-        return speciesAuthority;
-    }
-
-    public void setSpeciesAuthority(String speciesAuthority) {
-        this.speciesAuthority = speciesAuthority;
-    }
-
-    public Germplasm storageTypes(List<GermplasmStorageTypes> storageTypes) {
-        this.storageTypes = storageTypes;
-        return this;
-    }
-
-    public Germplasm addStorageTypesItem(GermplasmStorageTypes storageTypesItem) {
-        if (this.storageTypes == null) {
-            this.storageTypes = new ArrayList<GermplasmStorageTypes>();
-        }
-        this.storageTypes.add(storageTypesItem);
-        return this;
-    }
-
-    /**
-     * The type of storage this germplasm is kept in at a genebank.
-     *
-     * @return storageTypes
-     **/
-    @Schema(example = "[{\"code\":\"20\",\"description\":\"Field collection\"},{\"code\":\"11\",\"description\":\"Short term\"}]", description = "The type of storage this germplasm is kept in at a genebank.")
-    public List<GermplasmStorageTypes> getStorageTypes() {
-        return storageTypes;
-    }
-
-    public void setStorageTypes(List<GermplasmStorageTypes> storageTypes) {
-        this.storageTypes = storageTypes;
-    }
-
-    public Germplasm subtaxa(String subtaxa) {
-        this.subtaxa = subtaxa;
-        return this;
-    }
-
-    /**
-     * Subtaxon can be used to store any additional taxonomic identifier.  MCPD (v2.1) (SUBTAXA) 8. Subtaxon can be used to store any additional taxonomic identifier. The following abbreviations are allowed: \&quot;subsp.\&quot; (for subspecies); \&quot;convar.\&quot; (for convariety); \&quot;var.\&quot; (for variety); \&quot;f.\&quot; (for form); \&quot;Group\&quot; (for \&quot;cultivar group\&quot;).  MIAPPE V1.1 (DM-44) Infraspecific name - Name of any subtaxa level, including variety, crossing name, etc. It can be used to store any additional taxonomic identifier. Either free text description or key-value pair list format (the key is the name of the rank and the value is the value of  the rank). Ranks can be among the following terms: subspecies, cultivar, variety, subvariety, convariety, group, subgroup, hybrid, line, form, subform. For MCPD compliance, the following abbreviations are allowed: subsp. (subspecies); convar. (convariety); var. (variety); f. (form); Group (cultivar group).
-     *
-     * @return subtaxa
-     **/
-    @Schema(example = "Aspergillus fructus A", description = "Subtaxon can be used to store any additional taxonomic identifier.  MCPD (v2.1) (SUBTAXA) 8. Subtaxon can be used to store any additional taxonomic identifier. The following abbreviations are allowed: \"subsp.\" (for subspecies); \"convar.\" (for convariety); \"var.\" (for variety); \"f.\" (for form); \"Group\" (for \"cultivar group\").  MIAPPE V1.1 (DM-44) Infraspecific name - Name of any subtaxa level, including variety, crossing name, etc. It can be used to store any additional taxonomic identifier. Either free text description or key-value pair list format (the key is the name of the rank and the value is the value of  the rank). Ranks can be among the following terms: subspecies, cultivar, variety, subvariety, convariety, group, subgroup, hybrid, line, form, subform. For MCPD compliance, the following abbreviations are allowed: subsp. (subspecies); convar. (convariety); var. (variety); f. (form); Group (cultivar group).")
-    public String getSubtaxa() {
-        return subtaxa;
-    }
-
-    public void setSubtaxa(String subtaxa) {
-        this.subtaxa = subtaxa;
-    }
-
-    public Germplasm subtaxaAuthority(String subtaxaAuthority) {
-        this.subtaxaAuthority = subtaxaAuthority;
-        return this;
-    }
-
-    /**
-     * The authority organization responsible for tracking and maintaining the subtaxon information  MCPD (v2.1) (SUBTAUTHOR) 9. Provide the subtaxon authority at the most detailed taxonomic level.
-     *
-     * @return subtaxaAuthority
-     **/
-    @Schema(example = "Smith, 1822", description = "The authority organization responsible for tracking and maintaining the subtaxon information  MCPD (v2.1) (SUBTAUTHOR) 9. Provide the subtaxon authority at the most detailed taxonomic level.")
-    public String getSubtaxaAuthority() {
-        return subtaxaAuthority;
-    }
-
-    public void setSubtaxaAuthority(String subtaxaAuthority) {
-        this.subtaxaAuthority = subtaxaAuthority;
-    }
-
-    public Germplasm synonyms(List<GermplasmSynonyms> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public Germplasm addSynonymsItem(GermplasmSynonyms synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<GermplasmSynonyms>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * List of alternative names or IDs used to reference this germplasm  MCPD (v2.1) (OTHERNUMB) 24. Any other identifiers known to exist in other collections for this accession. Use the following format: INSTCODE:ACCENUMB;INSTCODE:identifier;INSTCODE and identifier are separated by a colon without space. Pairs of INSTCODE and identifier are separated by a semicolon without space. When the institute is not known, the identifier should be preceded by a colon.
-     *
-     * @return synonyms
-     **/
-    @Schema(description = "List of alternative names or IDs used to reference this germplasm  MCPD (v2.1) (OTHERNUMB) 24. Any other identifiers known to exist in other collections for this accession. Use the following format: INSTCODE:ACCENUMB;INSTCODE:identifier;INSTCODE and identifier are separated by a colon without space. Pairs of INSTCODE and identifier are separated by a semicolon without space. When the institute is not known, the identifier should be preceded by a colon.")
-    public List<GermplasmSynonyms> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<GermplasmSynonyms> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public Germplasm taxonIds(List<GermplasmTaxonIds> taxonIds) {
-        this.taxonIds = taxonIds;
-        return this;
-    }
-
-    public Germplasm addTaxonIdsItem(GermplasmTaxonIds taxonIdsItem) {
-        if (this.taxonIds == null) {
-            this.taxonIds = new ArrayList<GermplasmTaxonIds>();
-        }
-        this.taxonIds.add(taxonIdsItem);
-        return this;
-    }
-
-    /**
-     * The list of IDs for this SPECIES from different sources. If present, NCBI Taxon should be always listed as \&quot;ncbiTaxon\&quot; preferably with a purl. The rank of this ID should be species.  MIAPPE V1.1 (DM-42) Organism - An identifier for the organism at the species level. Use of the NCBI taxon ID is recommended.
-     *
-     * @return taxonIds
-     **/
-    @Schema(description = "The list of IDs for this SPECIES from different sources. If present, NCBI Taxon should be always listed as \"ncbiTaxon\" preferably with a purl. The rank of this ID should be species.  MIAPPE V1.1 (DM-42) Organism - An identifier for the organism at the species level. Use of the NCBI taxon ID is recommended.")
-    public List<GermplasmTaxonIds> getTaxonIds() {
-        return taxonIds;
-    }
-
-    public void setTaxonIds(List<GermplasmTaxonIds> taxonIds) {
-        this.taxonIds = taxonIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Germplasm germplasm = (Germplasm) o;
-        return Objects.equals(this.accessionNumber, germplasm.accessionNumber) &&
-                Objects.equals(this.acquisitionDate, germplasm.acquisitionDate) &&
-                Objects.equals(this.additionalInfo, germplasm.additionalInfo) &&
-                Objects.equals(this.biologicalStatusOfAccessionCode, germplasm.biologicalStatusOfAccessionCode) &&
-                Objects.equals(this.biologicalStatusOfAccessionDescription, germplasm.biologicalStatusOfAccessionDescription) &&
-                Objects.equals(this.breedingMethodDbId, germplasm.breedingMethodDbId) &&
-                Objects.equals(this.breedingMethodName, germplasm.breedingMethodName) &&
-                Objects.equals(this.collection, germplasm.collection) &&
-                Objects.equals(this.commonCropName, germplasm.commonCropName) &&
-                Objects.equals(this.countryOfOriginCode, germplasm.countryOfOriginCode) &&
-                Objects.equals(this.defaultDisplayName, germplasm.defaultDisplayName) &&
-                Objects.equals(this.documentationURL, germplasm.documentationURL) &&
-                Objects.equals(this.donors, germplasm.donors) &&
-                Objects.equals(this.externalReferences, germplasm.externalReferences) &&
-                Objects.equals(this.genus, germplasm.genus) &&
-                Objects.equals(this.germplasmDbId, germplasm.germplasmDbId) &&
-                Objects.equals(this.germplasmName, germplasm.germplasmName) &&
-                Objects.equals(this.germplasmOrigin, germplasm.germplasmOrigin) &&
-                Objects.equals(this.germplasmPUI, germplasm.germplasmPUI) &&
-                Objects.equals(this.germplasmPreprocessing, germplasm.germplasmPreprocessing) &&
-                Objects.equals(this.instituteCode, germplasm.instituteCode) &&
-                Objects.equals(this.instituteName, germplasm.instituteName) &&
-                Objects.equals(this.pedigree, germplasm.pedigree) &&
-                Objects.equals(this.seedSource, germplasm.seedSource) &&
-                Objects.equals(this.seedSourceDescription, germplasm.seedSourceDescription) &&
-                Objects.equals(this.species, germplasm.species) &&
-                Objects.equals(this.speciesAuthority, germplasm.speciesAuthority) &&
-                Objects.equals(this.storageTypes, germplasm.storageTypes) &&
-                Objects.equals(this.subtaxa, germplasm.subtaxa) &&
-                Objects.equals(this.subtaxaAuthority, germplasm.subtaxaAuthority) &&
-                Objects.equals(this.synonyms, germplasm.synonyms) &&
-                Objects.equals(this.taxonIds, germplasm.taxonIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(accessionNumber, acquisitionDate, additionalInfo, biologicalStatusOfAccessionCode, biologicalStatusOfAccessionDescription, breedingMethodDbId, breedingMethodName, collection, commonCropName, countryOfOriginCode, defaultDisplayName, documentationURL, donors, externalReferences, genus, germplasmDbId, germplasmName, germplasmOrigin, germplasmPUI, germplasmPreprocessing, instituteCode, instituteName, pedigree, seedSource, seedSourceDescription, species, speciesAuthority, storageTypes, subtaxa, subtaxaAuthority, synonyms, taxonIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Germplasm {\n");
-
-        sb.append("    accessionNumber: ").append(toIndentedString(accessionNumber)).append("\n");
-        sb.append("    acquisitionDate: ").append(toIndentedString(acquisitionDate)).append("\n");
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    biologicalStatusOfAccessionCode: ").append(toIndentedString(biologicalStatusOfAccessionCode)).append("\n");
-        sb.append("    biologicalStatusOfAccessionDescription: ").append(toIndentedString(biologicalStatusOfAccessionDescription)).append("\n");
-        sb.append("    breedingMethodDbId: ").append(toIndentedString(breedingMethodDbId)).append("\n");
-        sb.append("    breedingMethodName: ").append(toIndentedString(breedingMethodName)).append("\n");
-        sb.append("    collection: ").append(toIndentedString(collection)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    countryOfOriginCode: ").append(toIndentedString(countryOfOriginCode)).append("\n");
-        sb.append("    defaultDisplayName: ").append(toIndentedString(defaultDisplayName)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    donors: ").append(toIndentedString(donors)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    genus: ").append(toIndentedString(genus)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    germplasmOrigin: ").append(toIndentedString(germplasmOrigin)).append("\n");
-        sb.append("    germplasmPUI: ").append(toIndentedString(germplasmPUI)).append("\n");
-        sb.append("    germplasmPreprocessing: ").append(toIndentedString(germplasmPreprocessing)).append("\n");
-        sb.append("    instituteCode: ").append(toIndentedString(instituteCode)).append("\n");
-        sb.append("    instituteName: ").append(toIndentedString(instituteName)).append("\n");
-        sb.append("    pedigree: ").append(toIndentedString(pedigree)).append("\n");
-        sb.append("    seedSource: ").append(toIndentedString(seedSource)).append("\n");
-        sb.append("    seedSourceDescription: ").append(toIndentedString(seedSourceDescription)).append("\n");
-        sb.append("    species: ").append(toIndentedString(species)).append("\n");
-        sb.append("    speciesAuthority: ").append(toIndentedString(speciesAuthority)).append("\n");
-        sb.append("    storageTypes: ").append(toIndentedString(storageTypes)).append("\n");
-        sb.append("    subtaxa: ").append(toIndentedString(subtaxa)).append("\n");
-        sb.append("    subtaxaAuthority: ").append(toIndentedString(subtaxaAuthority)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    taxonIds: ").append(toIndentedString(taxonIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttribute.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttribute.java
deleted file mode 100644
index 00294d66..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttribute.java
+++ /dev/null
@@ -1,625 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * GermplasmAttribute
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttribute {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("attributeCategory")
-    private String attributeCategory = null;
-
-    @SerializedName("attributeDbId")
-    private String attributeDbId = null;
-
-    @SerializedName("attributeDescription")
-    private String attributeDescription = null;
-
-    @SerializedName("attributeName")
-    private String attributeName = null;
-
-    @SerializedName("attributePUI")
-    private String attributePUI = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("contextOfUse")
-    private List<String> contextOfUse = null;
-
-    @SerializedName("defaultValue")
-    private String defaultValue = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("growthStage")
-    private String growthStage = null;
-
-    @SerializedName("institution")
-    private String institution = null;
-
-    @SerializedName("language")
-    private String language = null;
-
-    @SerializedName("method")
-    private GermplasmAttributeMethod method = null;
-
-    @SerializedName("ontologyReference")
-    private GermplasmAttributeMethodOntologyReference ontologyReference = null;
-
-    @SerializedName("scale")
-    private GermplasmAttributeScale scale = null;
-
-    @SerializedName("scientist")
-    private String scientist = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("submissionTimestamp")
-    private OffsetDateTime submissionTimestamp = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("trait")
-    private GermplasmAttributeTrait trait = null;
-
-    public GermplasmAttribute additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public GermplasmAttribute putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public GermplasmAttribute attributeCategory(String attributeCategory) {
-        this.attributeCategory = attributeCategory;
-        return this;
-    }
-
-    /**
-     * General category for the attribute. very similar to Trait class.
-     *
-     * @return attributeCategory
-     **/
-    @Schema(example = "Morphological", description = "General category for the attribute. very similar to Trait class.")
-    public String getAttributeCategory() {
-        return attributeCategory;
-    }
-
-    public void setAttributeCategory(String attributeCategory) {
-        this.attributeCategory = attributeCategory;
-    }
-
-    public GermplasmAttribute attributeDbId(String attributeDbId) {
-        this.attributeDbId = attributeDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies this attribute within the given database server
-     *
-     * @return attributeDbId
-     **/
-    @Schema(example = "2f08b902", description = "The ID which uniquely identifies this attribute within the given database server")
-    public String getAttributeDbId() {
-        return attributeDbId;
-    }
-
-    public void setAttributeDbId(String attributeDbId) {
-        this.attributeDbId = attributeDbId;
-    }
-
-    public GermplasmAttribute attributeDescription(String attributeDescription) {
-        this.attributeDescription = attributeDescription;
-        return this;
-    }
-
-    /**
-     * A human readable description of this attribute
-     *
-     * @return attributeDescription
-     **/
-    @Schema(example = "Height of the plant measured in meters by a tape", description = "A human readable description of this attribute")
-    public String getAttributeDescription() {
-        return attributeDescription;
-    }
-
-    public void setAttributeDescription(String attributeDescription) {
-        this.attributeDescription = attributeDescription;
-    }
-
-    public GermplasmAttribute attributeName(String attributeName) {
-        this.attributeName = attributeName;
-        return this;
-    }
-
-    /**
-     * A human readable name for this attribute
-     *
-     * @return attributeName
-     **/
-    @Schema(example = "Plant Height 1", description = "A human readable name for this attribute")
-    public String getAttributeName() {
-        return attributeName;
-    }
-
-    public void setAttributeName(String attributeName) {
-        this.attributeName = attributeName;
-    }
-
-    public GermplasmAttribute attributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of an Attribute, usually in the form of a URI
-     *
-     * @return attributePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0008012", description = "The Permanent Unique Identifier of an Attribute, usually in the form of a URI")
-    public String getAttributePUI() {
-        return attributePUI;
-    }
-
-    public void setAttributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-    }
-
-    public GermplasmAttribute commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Crop name (examples: \&quot;Maize\&quot;, \&quot;Wheat\&quot;)
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Maize", description = "Crop name (examples: \"Maize\", \"Wheat\")")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public GermplasmAttribute contextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-        return this;
-    }
-
-    public GermplasmAttribute addContextOfUseItem(String contextOfUseItem) {
-        if (this.contextOfUse == null) {
-            this.contextOfUse = new ArrayList<String>();
-        }
-        this.contextOfUse.add(contextOfUseItem);
-        return this;
-    }
-
-    /**
-     * Indication of how trait is routinely used. (examples: [\&quot;Trial evaluation\&quot;, \&quot;Nursery evaluation\&quot;])
-     *
-     * @return contextOfUse
-     **/
-    @Schema(example = "[\"Trial evaluation\",\"Nursery evaluation\"]", description = "Indication of how trait is routinely used. (examples: [\"Trial evaluation\", \"Nursery evaluation\"])")
-    public List<String> getContextOfUse() {
-        return contextOfUse;
-    }
-
-    public void setContextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-    }
-
-    public GermplasmAttribute defaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-        return this;
-    }
-
-    /**
-     * Variable default value. (examples: \&quot;red\&quot;, \&quot;2.3\&quot;, etc.)
-     *
-     * @return defaultValue
-     **/
-    @Schema(example = "2.0", description = "Variable default value. (examples: \"red\", \"2.3\", etc.)")
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    public void setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    public GermplasmAttribute documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/documentation.html", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public GermplasmAttribute externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public GermplasmAttribute addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public GermplasmAttribute growthStage(String growthStage) {
-        this.growthStage = growthStage;
-        return this;
-    }
-
-    /**
-     * Growth stage at which measurement is made (examples: \&quot;flowering\&quot;)
-     *
-     * @return growthStage
-     **/
-    @Schema(example = "flowering", description = "Growth stage at which measurement is made (examples: \"flowering\")")
-    public String getGrowthStage() {
-        return growthStage;
-    }
-
-    public void setGrowthStage(String growthStage) {
-        this.growthStage = growthStage;
-    }
-
-    public GermplasmAttribute institution(String institution) {
-        this.institution = institution;
-        return this;
-    }
-
-    /**
-     * Name of institution submitting the variable
-     *
-     * @return institution
-     **/
-    @Schema(example = "The BrAPI Institute", description = "Name of institution submitting the variable")
-    public String getInstitution() {
-        return institution;
-    }
-
-    public void setInstitution(String institution) {
-        this.institution = institution;
-    }
-
-    public GermplasmAttribute language(String language) {
-        this.language = language;
-        return this;
-    }
-
-    /**
-     * 2 letter ISO 639-1 code for the language of submission of the variable.
-     *
-     * @return language
-     **/
-    @Schema(example = "en", description = "2 letter ISO 639-1 code for the language of submission of the variable.")
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public GermplasmAttribute method(GermplasmAttributeMethod method) {
-        this.method = method;
-        return this;
-    }
-
-    /**
-     * Get method
-     *
-     * @return method
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeMethod getMethod() {
-        return method;
-    }
-
-    public void setMethod(GermplasmAttributeMethod method) {
-        this.method = method;
-    }
-
-    public GermplasmAttribute ontologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeMethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public GermplasmAttribute scale(GermplasmAttributeScale scale) {
-        this.scale = scale;
-        return this;
-    }
-
-    /**
-     * Get scale
-     *
-     * @return scale
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeScale getScale() {
-        return scale;
-    }
-
-    public void setScale(GermplasmAttributeScale scale) {
-        this.scale = scale;
-    }
-
-    public GermplasmAttribute scientist(String scientist) {
-        this.scientist = scientist;
-        return this;
-    }
-
-    /**
-     * Name of scientist submitting the variable.
-     *
-     * @return scientist
-     **/
-    @Schema(example = "Dr. Bob Robertson", description = "Name of scientist submitting the variable.")
-    public String getScientist() {
-        return scientist;
-    }
-
-    public void setScientist(String scientist) {
-        this.scientist = scientist;
-    }
-
-    public GermplasmAttribute status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Variable status. (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Variable status. (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public GermplasmAttribute submissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-        return this;
-    }
-
-    /**
-     * Timestamp when the Variable was added (ISO 8601)
-     *
-     * @return submissionTimestamp
-     **/
-    @Schema(description = "Timestamp when the Variable was added (ISO 8601)")
-    public OffsetDateTime getSubmissionTimestamp() {
-        return submissionTimestamp;
-    }
-
-    public void setSubmissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-    }
-
-    public GermplasmAttribute synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public GermplasmAttribute addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other variable names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Maize Height\",\"Stalk Height\",\"Corn Height\"]", description = "Other variable names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public GermplasmAttribute trait(GermplasmAttributeTrait trait) {
-        this.trait = trait;
-        return this;
-    }
-
-    /**
-     * Get trait
-     *
-     * @return trait
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeTrait getTrait() {
-        return trait;
-    }
-
-    public void setTrait(GermplasmAttributeTrait trait) {
-        this.trait = trait;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttribute germplasmAttribute = (GermplasmAttribute) o;
-        return Objects.equals(this.additionalInfo, germplasmAttribute.additionalInfo) &&
-                Objects.equals(this.attributeCategory, germplasmAttribute.attributeCategory) &&
-                Objects.equals(this.attributeDbId, germplasmAttribute.attributeDbId) &&
-                Objects.equals(this.attributeDescription, germplasmAttribute.attributeDescription) &&
-                Objects.equals(this.attributeName, germplasmAttribute.attributeName) &&
-                Objects.equals(this.attributePUI, germplasmAttribute.attributePUI) &&
-                Objects.equals(this.commonCropName, germplasmAttribute.commonCropName) &&
-                Objects.equals(this.contextOfUse, germplasmAttribute.contextOfUse) &&
-                Objects.equals(this.defaultValue, germplasmAttribute.defaultValue) &&
-                Objects.equals(this.documentationURL, germplasmAttribute.documentationURL) &&
-                Objects.equals(this.externalReferences, germplasmAttribute.externalReferences) &&
-                Objects.equals(this.growthStage, germplasmAttribute.growthStage) &&
-                Objects.equals(this.institution, germplasmAttribute.institution) &&
-                Objects.equals(this.language, germplasmAttribute.language) &&
-                Objects.equals(this.method, germplasmAttribute.method) &&
-                Objects.equals(this.ontologyReference, germplasmAttribute.ontologyReference) &&
-                Objects.equals(this.scale, germplasmAttribute.scale) &&
-                Objects.equals(this.scientist, germplasmAttribute.scientist) &&
-                Objects.equals(this.status, germplasmAttribute.status) &&
-                Objects.equals(this.submissionTimestamp, germplasmAttribute.submissionTimestamp) &&
-                Objects.equals(this.synonyms, germplasmAttribute.synonyms) &&
-                Objects.equals(this.trait, germplasmAttribute.trait);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, attributeCategory, attributeDbId, attributeDescription, attributeName, attributePUI, commonCropName, contextOfUse, defaultValue, documentationURL, externalReferences, growthStage, institution, language, method, ontologyReference, scale, scientist, status, submissionTimestamp, synonyms, trait);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttribute {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    attributeCategory: ").append(toIndentedString(attributeCategory)).append("\n");
-        sb.append("    attributeDbId: ").append(toIndentedString(attributeDbId)).append("\n");
-        sb.append("    attributeDescription: ").append(toIndentedString(attributeDescription)).append("\n");
-        sb.append("    attributeName: ").append(toIndentedString(attributeName)).append("\n");
-        sb.append("    attributePUI: ").append(toIndentedString(attributePUI)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    contextOfUse: ").append(toIndentedString(contextOfUse)).append("\n");
-        sb.append("    defaultValue: ").append(toIndentedString(defaultValue)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    growthStage: ").append(toIndentedString(growthStage)).append("\n");
-        sb.append("    institution: ").append(toIndentedString(institution)).append("\n");
-        sb.append("    language: ").append(toIndentedString(language)).append("\n");
-        sb.append("    method: ").append(toIndentedString(method)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scale: ").append(toIndentedString(scale)).append("\n");
-        sb.append("    scientist: ").append(toIndentedString(scientist)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    submissionTimestamp: ").append(toIndentedString(submissionTimestamp)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    trait: ").append(toIndentedString(trait)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeCategoryListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeCategoryListResponse.java
deleted file mode 100644
index 090cbbfa..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeCategoryListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * GermplasmAttributeCategoryListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeCategoryListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private GermplasmAttributeCategoryListResponseResult result = null;
-
-    public GermplasmAttributeCategoryListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public GermplasmAttributeCategoryListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public GermplasmAttributeCategoryListResponse result(GermplasmAttributeCategoryListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public GermplasmAttributeCategoryListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(GermplasmAttributeCategoryListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeCategoryListResponse germplasmAttributeCategoryListResponse = (GermplasmAttributeCategoryListResponse) o;
-        return Objects.equals(this._atContext, germplasmAttributeCategoryListResponse._atContext) &&
-                Objects.equals(this.metadata, germplasmAttributeCategoryListResponse.metadata) &&
-                Objects.equals(this.result, germplasmAttributeCategoryListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeCategoryListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeCategoryListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeCategoryListResponseResult.java
deleted file mode 100644
index cde0e82a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeCategoryListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * GermplasmAttributeCategoryListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeCategoryListResponseResult {
-    @SerializedName("data")
-    private List<String> data = new ArrayList<String>();
-
-    public GermplasmAttributeCategoryListResponseResult data(List<String> data) {
-        this.data = data;
-        return this;
-    }
-
-    public GermplasmAttributeCategoryListResponseResult addDataItem(String dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(example = "[\"Morphological\",\"Agronomic\"]", required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<String> getData() {
-        return data;
-    }
-
-    public void setData(List<String> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeCategoryListResponseResult germplasmAttributeCategoryListResponseResult = (GermplasmAttributeCategoryListResponseResult) o;
-        return Objects.equals(this.data, germplasmAttributeCategoryListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeCategoryListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeListResponse.java
deleted file mode 100644
index b9eb12b6..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * GermplasmAttributeListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private GermplasmAttributeListResponseResult result = null;
-
-    public GermplasmAttributeListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public GermplasmAttributeListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public GermplasmAttributeListResponse result(GermplasmAttributeListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public GermplasmAttributeListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(GermplasmAttributeListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeListResponse germplasmAttributeListResponse = (GermplasmAttributeListResponse) o;
-        return Objects.equals(this._atContext, germplasmAttributeListResponse._atContext) &&
-                Objects.equals(this.metadata, germplasmAttributeListResponse.metadata) &&
-                Objects.equals(this.result, germplasmAttributeListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeListResponseResult.java
deleted file mode 100644
index 75f57506..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * GermplasmAttributeListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeListResponseResult {
-    @SerializedName("data")
-    private List<GermplasmAttribute> data = new ArrayList<GermplasmAttribute>();
-
-    public GermplasmAttributeListResponseResult data(List<GermplasmAttribute> data) {
-        this.data = data;
-        return this;
-    }
-
-    public GermplasmAttributeListResponseResult addDataItem(GermplasmAttribute dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<GermplasmAttribute> getData() {
-        return data;
-    }
-
-    public void setData(List<GermplasmAttribute> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeListResponseResult germplasmAttributeListResponseResult = (GermplasmAttributeListResponseResult) o;
-        return Objects.equals(this.data, germplasmAttributeListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeMethod.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeMethod.java
deleted file mode 100644
index b8564a99..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeMethod.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A description of the way an Observation should be collected.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Method \&quot;estimation\&quot; or \&quot;drone image processing\&quot;.
- */
-@Schema(description = "A description of the way an Observation should be collected.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Method \"estimation\" or \"drone image processing\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeMethod {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("bibliographicalReference")
-    private String bibliographicalReference = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("formula")
-    private String formula = null;
-
-    @SerializedName("methodClass")
-    private String methodClass = null;
-
-    @SerializedName("methodDbId")
-    private String methodDbId = null;
-
-    @SerializedName("methodName")
-    private String methodName = null;
-
-    @SerializedName("methodPUI")
-    private String methodPUI = null;
-
-    @SerializedName("ontologyReference")
-    private GermplasmAttributeMethodOntologyReference ontologyReference = null;
-
-    public GermplasmAttributeMethod additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public GermplasmAttributeMethod putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public GermplasmAttributeMethod bibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-        return this;
-    }
-
-    /**
-     * Bibliographical reference describing the method. &lt;br/&gt;MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.
-     *
-     * @return bibliographicalReference
-     **/
-    @Schema(example = "Smith, 1893, Really Cool Paper, Popular Journal", description = "Bibliographical reference describing the method. <br/>MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.")
-    public String getBibliographicalReference() {
-        return bibliographicalReference;
-    }
-
-    public void setBibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-    }
-
-    public GermplasmAttributeMethod description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Method description &lt;br/&gt;MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)
-     *
-     * @return description
-     **/
-    @Schema(example = "A measuring tape was used", description = "Method description <br/>MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public GermplasmAttributeMethod externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public GermplasmAttributeMethod addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public GermplasmAttributeMethod formula(String formula) {
-        this.formula = formula;
-        return this;
-    }
-
-    /**
-     * For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation
-     *
-     * @return formula
-     **/
-    @Schema(example = "a^2 + b^2 = c^2", description = "For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation")
-    public String getFormula() {
-        return formula;
-    }
-
-    public void setFormula(String formula) {
-        this.formula = formula;
-    }
-
-    public GermplasmAttributeMethod methodClass(String methodClass) {
-        this.methodClass = methodClass;
-        return this;
-    }
-
-    /**
-     * Method class (examples: \&quot;Measurement\&quot;, \&quot;Counting\&quot;, \&quot;Estimation\&quot;, \&quot;Computation\&quot;, etc.)
-     *
-     * @return methodClass
-     **/
-    @Schema(example = "Measurement", description = "Method class (examples: \"Measurement\", \"Counting\", \"Estimation\", \"Computation\", etc.)")
-    public String getMethodClass() {
-        return methodClass;
-    }
-
-    public void setMethodClass(String methodClass) {
-        this.methodClass = methodClass;
-    }
-
-    public GermplasmAttributeMethod methodDbId(String methodDbId) {
-        this.methodDbId = methodDbId;
-        return this;
-    }
-
-    /**
-     * Method unique identifier
-     *
-     * @return methodDbId
-     **/
-    @Schema(example = "0adb2764", description = "Method unique identifier")
-    public String getMethodDbId() {
-        return methodDbId;
-    }
-
-    public void setMethodDbId(String methodDbId) {
-        this.methodDbId = methodDbId;
-    }
-
-    public GermplasmAttributeMethod methodName(String methodName) {
-        this.methodName = methodName;
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodName
-     **/
-    @Schema(example = "Measuring Tape", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public String getMethodName() {
-        return methodName;
-    }
-
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
-    public GermplasmAttributeMethod methodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000212", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public String getMethodPUI() {
-        return methodPUI;
-    }
-
-    public void setMethodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-    }
-
-    public GermplasmAttributeMethod ontologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeMethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeMethod germplasmAttributeMethod = (GermplasmAttributeMethod) o;
-        return Objects.equals(this.additionalInfo, germplasmAttributeMethod.additionalInfo) &&
-                Objects.equals(this.bibliographicalReference, germplasmAttributeMethod.bibliographicalReference) &&
-                Objects.equals(this.description, germplasmAttributeMethod.description) &&
-                Objects.equals(this.externalReferences, germplasmAttributeMethod.externalReferences) &&
-                Objects.equals(this.formula, germplasmAttributeMethod.formula) &&
-                Objects.equals(this.methodClass, germplasmAttributeMethod.methodClass) &&
-                Objects.equals(this.methodDbId, germplasmAttributeMethod.methodDbId) &&
-                Objects.equals(this.methodName, germplasmAttributeMethod.methodName) &&
-                Objects.equals(this.methodPUI, germplasmAttributeMethod.methodPUI) &&
-                Objects.equals(this.ontologyReference, germplasmAttributeMethod.ontologyReference);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, bibliographicalReference, description, externalReferences, formula, methodClass, methodDbId, methodName, methodPUI, ontologyReference);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeMethod {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    bibliographicalReference: ").append(toIndentedString(bibliographicalReference)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    formula: ").append(toIndentedString(formula)).append("\n");
-        sb.append("    methodClass: ").append(toIndentedString(methodClass)).append("\n");
-        sb.append("    methodDbId: ").append(toIndentedString(methodDbId)).append("\n");
-        sb.append("    methodName: ").append(toIndentedString(methodName)).append("\n");
-        sb.append("    methodPUI: ").append(toIndentedString(methodPUI)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeMethodOntologyReference.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeMethodOntologyReference.java
deleted file mode 100644
index 73cfdeb1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeMethodOntologyReference.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).
- */
-@Schema(description = "MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeMethodOntologyReference {
-    @SerializedName("documentationLinks")
-    private List<GermplasmAttributeMethodOntologyReferenceDocumentationLinks> documentationLinks = null;
-
-    @SerializedName("ontologyDbId")
-    private String ontologyDbId = null;
-
-    @SerializedName("ontologyName")
-    private String ontologyName = null;
-
-    @SerializedName("version")
-    private String version = null;
-
-    public GermplasmAttributeMethodOntologyReference documentationLinks(List<GermplasmAttributeMethodOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-        return this;
-    }
-
-    public GermplasmAttributeMethodOntologyReference addDocumentationLinksItem(GermplasmAttributeMethodOntologyReferenceDocumentationLinks documentationLinksItem) {
-        if (this.documentationLinks == null) {
-            this.documentationLinks = new ArrayList<GermplasmAttributeMethodOntologyReferenceDocumentationLinks>();
-        }
-        this.documentationLinks.add(documentationLinksItem);
-        return this;
-    }
-
-    /**
-     * links to various ontology documentation
-     *
-     * @return documentationLinks
-     **/
-    @Schema(description = "links to various ontology documentation")
-    public List<GermplasmAttributeMethodOntologyReferenceDocumentationLinks> getDocumentationLinks() {
-        return documentationLinks;
-    }
-
-    public void setDocumentationLinks(List<GermplasmAttributeMethodOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-    }
-
-    public GermplasmAttributeMethodOntologyReference ontologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-        return this;
-    }
-
-    /**
-     * Ontology database unique identifier
-     *
-     * @return ontologyDbId
-     **/
-    @Schema(example = "6b071868", required = true, description = "Ontology database unique identifier")
-    public String getOntologyDbId() {
-        return ontologyDbId;
-    }
-
-    public void setOntologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-    }
-
-    public GermplasmAttributeMethodOntologyReference ontologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-        return this;
-    }
-
-    /**
-     * Ontology name
-     *
-     * @return ontologyName
-     **/
-    @Schema(example = "The Crop Ontology", required = true, description = "Ontology name")
-    public String getOntologyName() {
-        return ontologyName;
-    }
-
-    public void setOntologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-    }
-
-    public GermplasmAttributeMethodOntologyReference version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    /**
-     * Ontology version (no specific format)
-     *
-     * @return version
-     **/
-    @Schema(example = "7.2.3", description = "Ontology version (no specific format)")
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeMethodOntologyReference germplasmAttributeMethodOntologyReference = (GermplasmAttributeMethodOntologyReference) o;
-        return Objects.equals(this.documentationLinks, germplasmAttributeMethodOntologyReference.documentationLinks) &&
-                Objects.equals(this.ontologyDbId, germplasmAttributeMethodOntologyReference.ontologyDbId) &&
-                Objects.equals(this.ontologyName, germplasmAttributeMethodOntologyReference.ontologyName) &&
-                Objects.equals(this.version, germplasmAttributeMethodOntologyReference.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(documentationLinks, ontologyDbId, ontologyName, version);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeMethodOntologyReference {\n");
-
-        sb.append("    documentationLinks: ").append(toIndentedString(documentationLinks)).append("\n");
-        sb.append("    ontologyDbId: ").append(toIndentedString(ontologyDbId)).append("\n");
-        sb.append("    ontologyName: ").append(toIndentedString(ontologyName)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeMethodOntologyReferenceDocumentationLinks.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeMethodOntologyReferenceDocumentationLinks.java
deleted file mode 100644
index e72c2818..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeMethodOntologyReferenceDocumentationLinks.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * GermplasmAttributeMethodOntologyReferenceDocumentationLinks
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeMethodOntologyReferenceDocumentationLinks {
-    @SerializedName("URL")
-    private String URL = null;
-
-    /**
-     * Gets or Sets type
-     */
-    @JsonAdapter(TypeEnum.Adapter.class)
-    public enum TypeEnum {
-        OBO("OBO"),
-        RDF("RDF"),
-        WEBPAGE("WEBPAGE");
-
-        private String value;
-
-        TypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static TypeEnum fromValue(String input) {
-            for (TypeEnum b : TypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<TypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final TypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public TypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return TypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("type")
-    private TypeEnum type = null;
-
-    public GermplasmAttributeMethodOntologyReferenceDocumentationLinks URL(String URL) {
-        this.URL = URL;
-        return this;
-    }
-
-    /**
-     * Get URL
-     *
-     * @return URL
-     **/
-    @Schema(example = "http://purl.obolibrary.org/obo/ro.owl", description = "")
-    public String getURL() {
-        return URL;
-    }
-
-    public void setURL(String URL) {
-        this.URL = URL;
-    }
-
-    public GermplasmAttributeMethodOntologyReferenceDocumentationLinks type(TypeEnum type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * Get type
-     *
-     * @return type
-     **/
-    @Schema(example = "OBO", description = "")
-    public TypeEnum getType() {
-        return type;
-    }
-
-    public void setType(TypeEnum type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeMethodOntologyReferenceDocumentationLinks germplasmAttributeMethodOntologyReferenceDocumentationLinks = (GermplasmAttributeMethodOntologyReferenceDocumentationLinks) o;
-        return Objects.equals(this.URL, germplasmAttributeMethodOntologyReferenceDocumentationLinks.URL) &&
-                Objects.equals(this.type, germplasmAttributeMethodOntologyReferenceDocumentationLinks.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(URL, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeMethodOntologyReferenceDocumentationLinks {\n");
-
-        sb.append("    URL: ").append(toIndentedString(URL)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeNewRequest.java
deleted file mode 100644
index 46fd0d3a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeNewRequest.java
+++ /dev/null
@@ -1,601 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * GermplasmAttributeNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("attributeCategory")
-    private String attributeCategory = null;
-
-    @SerializedName("attributeDescription")
-    private String attributeDescription = null;
-
-    @SerializedName("attributeName")
-    private String attributeName = null;
-
-    @SerializedName("attributePUI")
-    private String attributePUI = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("contextOfUse")
-    private List<String> contextOfUse = null;
-
-    @SerializedName("defaultValue")
-    private String defaultValue = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("growthStage")
-    private String growthStage = null;
-
-    @SerializedName("institution")
-    private String institution = null;
-
-    @SerializedName("language")
-    private String language = null;
-
-    @SerializedName("method")
-    private GermplasmAttributeMethod method = null;
-
-    @SerializedName("ontologyReference")
-    private GermplasmAttributeMethodOntologyReference ontologyReference = null;
-
-    @SerializedName("scale")
-    private GermplasmAttributeScale scale = null;
-
-    @SerializedName("scientist")
-    private String scientist = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("submissionTimestamp")
-    private OffsetDateTime submissionTimestamp = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("trait")
-    private GermplasmAttributeTrait trait = null;
-
-    public GermplasmAttributeNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public GermplasmAttributeNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public GermplasmAttributeNewRequest attributeCategory(String attributeCategory) {
-        this.attributeCategory = attributeCategory;
-        return this;
-    }
-
-    /**
-     * General category for the attribute. very similar to Trait class.
-     *
-     * @return attributeCategory
-     **/
-    @Schema(example = "Morphological", description = "General category for the attribute. very similar to Trait class.")
-    public String getAttributeCategory() {
-        return attributeCategory;
-    }
-
-    public void setAttributeCategory(String attributeCategory) {
-        this.attributeCategory = attributeCategory;
-    }
-
-    public GermplasmAttributeNewRequest attributeDescription(String attributeDescription) {
-        this.attributeDescription = attributeDescription;
-        return this;
-    }
-
-    /**
-     * A human readable description of this attribute
-     *
-     * @return attributeDescription
-     **/
-    @Schema(example = "Height of the plant measured in meters by a tape", description = "A human readable description of this attribute")
-    public String getAttributeDescription() {
-        return attributeDescription;
-    }
-
-    public void setAttributeDescription(String attributeDescription) {
-        this.attributeDescription = attributeDescription;
-    }
-
-    public GermplasmAttributeNewRequest attributeName(String attributeName) {
-        this.attributeName = attributeName;
-        return this;
-    }
-
-    /**
-     * A human readable name for this attribute
-     *
-     * @return attributeName
-     **/
-    @Schema(example = "Plant Height 1", description = "A human readable name for this attribute")
-    public String getAttributeName() {
-        return attributeName;
-    }
-
-    public void setAttributeName(String attributeName) {
-        this.attributeName = attributeName;
-    }
-
-    public GermplasmAttributeNewRequest attributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of an Attribute, usually in the form of a URI
-     *
-     * @return attributePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0008012", description = "The Permanent Unique Identifier of an Attribute, usually in the form of a URI")
-    public String getAttributePUI() {
-        return attributePUI;
-    }
-
-    public void setAttributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-    }
-
-    public GermplasmAttributeNewRequest commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Crop name (examples: \&quot;Maize\&quot;, \&quot;Wheat\&quot;)
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Maize", description = "Crop name (examples: \"Maize\", \"Wheat\")")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public GermplasmAttributeNewRequest contextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-        return this;
-    }
-
-    public GermplasmAttributeNewRequest addContextOfUseItem(String contextOfUseItem) {
-        if (this.contextOfUse == null) {
-            this.contextOfUse = new ArrayList<String>();
-        }
-        this.contextOfUse.add(contextOfUseItem);
-        return this;
-    }
-
-    /**
-     * Indication of how trait is routinely used. (examples: [\&quot;Trial evaluation\&quot;, \&quot;Nursery evaluation\&quot;])
-     *
-     * @return contextOfUse
-     **/
-    @Schema(example = "[\"Trial evaluation\",\"Nursery evaluation\"]", description = "Indication of how trait is routinely used. (examples: [\"Trial evaluation\", \"Nursery evaluation\"])")
-    public List<String> getContextOfUse() {
-        return contextOfUse;
-    }
-
-    public void setContextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-    }
-
-    public GermplasmAttributeNewRequest defaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-        return this;
-    }
-
-    /**
-     * Variable default value. (examples: \&quot;red\&quot;, \&quot;2.3\&quot;, etc.)
-     *
-     * @return defaultValue
-     **/
-    @Schema(example = "2.0", description = "Variable default value. (examples: \"red\", \"2.3\", etc.)")
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    public void setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    public GermplasmAttributeNewRequest documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/documentation.html", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public GermplasmAttributeNewRequest externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public GermplasmAttributeNewRequest addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public GermplasmAttributeNewRequest growthStage(String growthStage) {
-        this.growthStage = growthStage;
-        return this;
-    }
-
-    /**
-     * Growth stage at which measurement is made (examples: \&quot;flowering\&quot;)
-     *
-     * @return growthStage
-     **/
-    @Schema(example = "flowering", description = "Growth stage at which measurement is made (examples: \"flowering\")")
-    public String getGrowthStage() {
-        return growthStage;
-    }
-
-    public void setGrowthStage(String growthStage) {
-        this.growthStage = growthStage;
-    }
-
-    public GermplasmAttributeNewRequest institution(String institution) {
-        this.institution = institution;
-        return this;
-    }
-
-    /**
-     * Name of institution submitting the variable
-     *
-     * @return institution
-     **/
-    @Schema(example = "The BrAPI Institute", description = "Name of institution submitting the variable")
-    public String getInstitution() {
-        return institution;
-    }
-
-    public void setInstitution(String institution) {
-        this.institution = institution;
-    }
-
-    public GermplasmAttributeNewRequest language(String language) {
-        this.language = language;
-        return this;
-    }
-
-    /**
-     * 2 letter ISO 639-1 code for the language of submission of the variable.
-     *
-     * @return language
-     **/
-    @Schema(example = "en", description = "2 letter ISO 639-1 code for the language of submission of the variable.")
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public GermplasmAttributeNewRequest method(GermplasmAttributeMethod method) {
-        this.method = method;
-        return this;
-    }
-
-    /**
-     * Get method
-     *
-     * @return method
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeMethod getMethod() {
-        return method;
-    }
-
-    public void setMethod(GermplasmAttributeMethod method) {
-        this.method = method;
-    }
-
-    public GermplasmAttributeNewRequest ontologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeMethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public GermplasmAttributeNewRequest scale(GermplasmAttributeScale scale) {
-        this.scale = scale;
-        return this;
-    }
-
-    /**
-     * Get scale
-     *
-     * @return scale
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeScale getScale() {
-        return scale;
-    }
-
-    public void setScale(GermplasmAttributeScale scale) {
-        this.scale = scale;
-    }
-
-    public GermplasmAttributeNewRequest scientist(String scientist) {
-        this.scientist = scientist;
-        return this;
-    }
-
-    /**
-     * Name of scientist submitting the variable.
-     *
-     * @return scientist
-     **/
-    @Schema(example = "Dr. Bob Robertson", description = "Name of scientist submitting the variable.")
-    public String getScientist() {
-        return scientist;
-    }
-
-    public void setScientist(String scientist) {
-        this.scientist = scientist;
-    }
-
-    public GermplasmAttributeNewRequest status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Variable status. (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Variable status. (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public GermplasmAttributeNewRequest submissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-        return this;
-    }
-
-    /**
-     * Timestamp when the Variable was added (ISO 8601)
-     *
-     * @return submissionTimestamp
-     **/
-    @Schema(description = "Timestamp when the Variable was added (ISO 8601)")
-    public OffsetDateTime getSubmissionTimestamp() {
-        return submissionTimestamp;
-    }
-
-    public void setSubmissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-    }
-
-    public GermplasmAttributeNewRequest synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public GermplasmAttributeNewRequest addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other variable names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Maize Height\",\"Stalk Height\",\"Corn Height\"]", description = "Other variable names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public GermplasmAttributeNewRequest trait(GermplasmAttributeTrait trait) {
-        this.trait = trait;
-        return this;
-    }
-
-    /**
-     * Get trait
-     *
-     * @return trait
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeTrait getTrait() {
-        return trait;
-    }
-
-    public void setTrait(GermplasmAttributeTrait trait) {
-        this.trait = trait;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeNewRequest germplasmAttributeNewRequest = (GermplasmAttributeNewRequest) o;
-        return Objects.equals(this.additionalInfo, germplasmAttributeNewRequest.additionalInfo) &&
-                Objects.equals(this.attributeCategory, germplasmAttributeNewRequest.attributeCategory) &&
-                Objects.equals(this.attributeDescription, germplasmAttributeNewRequest.attributeDescription) &&
-                Objects.equals(this.attributeName, germplasmAttributeNewRequest.attributeName) &&
-                Objects.equals(this.attributePUI, germplasmAttributeNewRequest.attributePUI) &&
-                Objects.equals(this.commonCropName, germplasmAttributeNewRequest.commonCropName) &&
-                Objects.equals(this.contextOfUse, germplasmAttributeNewRequest.contextOfUse) &&
-                Objects.equals(this.defaultValue, germplasmAttributeNewRequest.defaultValue) &&
-                Objects.equals(this.documentationURL, germplasmAttributeNewRequest.documentationURL) &&
-                Objects.equals(this.externalReferences, germplasmAttributeNewRequest.externalReferences) &&
-                Objects.equals(this.growthStage, germplasmAttributeNewRequest.growthStage) &&
-                Objects.equals(this.institution, germplasmAttributeNewRequest.institution) &&
-                Objects.equals(this.language, germplasmAttributeNewRequest.language) &&
-                Objects.equals(this.method, germplasmAttributeNewRequest.method) &&
-                Objects.equals(this.ontologyReference, germplasmAttributeNewRequest.ontologyReference) &&
-                Objects.equals(this.scale, germplasmAttributeNewRequest.scale) &&
-                Objects.equals(this.scientist, germplasmAttributeNewRequest.scientist) &&
-                Objects.equals(this.status, germplasmAttributeNewRequest.status) &&
-                Objects.equals(this.submissionTimestamp, germplasmAttributeNewRequest.submissionTimestamp) &&
-                Objects.equals(this.synonyms, germplasmAttributeNewRequest.synonyms) &&
-                Objects.equals(this.trait, germplasmAttributeNewRequest.trait);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, attributeCategory, attributeDescription, attributeName, attributePUI, commonCropName, contextOfUse, defaultValue, documentationURL, externalReferences, growthStage, institution, language, method, ontologyReference, scale, scientist, status, submissionTimestamp, synonyms, trait);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    attributeCategory: ").append(toIndentedString(attributeCategory)).append("\n");
-        sb.append("    attributeDescription: ").append(toIndentedString(attributeDescription)).append("\n");
-        sb.append("    attributeName: ").append(toIndentedString(attributeName)).append("\n");
-        sb.append("    attributePUI: ").append(toIndentedString(attributePUI)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    contextOfUse: ").append(toIndentedString(contextOfUse)).append("\n");
-        sb.append("    defaultValue: ").append(toIndentedString(defaultValue)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    growthStage: ").append(toIndentedString(growthStage)).append("\n");
-        sb.append("    institution: ").append(toIndentedString(institution)).append("\n");
-        sb.append("    language: ").append(toIndentedString(language)).append("\n");
-        sb.append("    method: ").append(toIndentedString(method)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scale: ").append(toIndentedString(scale)).append("\n");
-        sb.append("    scientist: ").append(toIndentedString(scientist)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    submissionTimestamp: ").append(toIndentedString(submissionTimestamp)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    trait: ").append(toIndentedString(trait)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeScale.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeScale.java
deleted file mode 100644
index 6e681bea..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeScale.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * A Scale describes the units and acceptable values for an ObservationVariable.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Scale \&quot;inches\&quot; or \&quot;pixels\&quot;.
- */
-@Schema(description = "A Scale describes the units and acceptable values for an ObservationVariable.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Scale \"inches\" or \"pixels\".")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeScale {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypeEnum.Adapter.class)
-    public enum DataTypeEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypeEnum fromValue(String input) {
-            for (DataTypeEnum b : DataTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataType")
-    private DataTypeEnum dataType = null;
-
-    @SerializedName("decimalPlaces")
-    private Integer decimalPlaces = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("ontologyReference")
-    private GermplasmAttributeMethodOntologyReference ontologyReference = null;
-
-    @SerializedName("scaleDbId")
-    private String scaleDbId = null;
-
-    @SerializedName("scaleName")
-    private String scaleName = null;
-
-    @SerializedName("scalePUI")
-    private String scalePUI = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    @SerializedName("validValues")
-    private GermplasmAttributeScaleValidValues validValues = null;
-
-    public GermplasmAttributeScale additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public GermplasmAttributeScale putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public GermplasmAttributeScale dataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-        return this;
-    }
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     *
-     * @return dataType
-     **/
-    @Schema(example = "Numerical", description = "<p>Class of the scale, entries can be</p> <p>\"Code\" -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \"75VD\" means \"75 %\" of the plant is infected and the plant is very delayed.</p> <p>\"Date\" - The date class is for events expressed in a time format, See ISO 8601</p> <p>\"Duration\" - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months</p> <p>\"Nominal\" - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories</p> <p>\"Numerical\" - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches</p> <p>\"Ordinal\" - Ordinal scales are scales composed of ordered categories</p> <p>\"Text\" - A free text is used to express the trait.</p>")
-    public DataTypeEnum getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-    }
-
-    public GermplasmAttributeScale decimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-        return this;
-    }
-
-    /**
-     * For numerical, number of decimal places to be reported
-     *
-     * @return decimalPlaces
-     **/
-    @Schema(example = "2", description = "For numerical, number of decimal places to be reported")
-    public Integer getDecimalPlaces() {
-        return decimalPlaces;
-    }
-
-    public void setDecimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-    }
-
-    public GermplasmAttributeScale externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public GermplasmAttributeScale addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public GermplasmAttributeScale ontologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeMethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public GermplasmAttributeScale scaleDbId(String scaleDbId) {
-        this.scaleDbId = scaleDbId;
-        return this;
-    }
-
-    /**
-     * Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.
-     *
-     * @return scaleDbId
-     **/
-    @Schema(example = "af730171", description = "Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.")
-    public String getScaleDbId() {
-        return scaleDbId;
-    }
-
-    public void setScaleDbId(String scaleDbId) {
-        this.scaleDbId = scaleDbId;
-    }
-
-    public GermplasmAttributeScale scaleName(String scaleName) {
-        this.scaleName = scaleName;
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleName
-     **/
-    @Schema(example = "Meters", description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public String getScaleName() {
-        return scaleName;
-    }
-
-    public void setScaleName(String scaleName) {
-        this.scaleName = scaleName;
-    }
-
-    public GermplasmAttributeScale scalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000112", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public String getScalePUI() {
-        return scalePUI;
-    }
-
-    public void setScalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-    }
-
-    public GermplasmAttributeScale units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when &#x60;dataType&#x60; is Numeric, but could also be included for other dataTypes when applicable.
-     *
-     * @return units
-     **/
-    @Schema(example = "m", description = "This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when `dataType` is Numeric, but could also be included for other dataTypes when applicable.")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    public GermplasmAttributeScale validValues(GermplasmAttributeScaleValidValues validValues) {
-        this.validValues = validValues;
-        return this;
-    }
-
-    /**
-     * Get validValues
-     *
-     * @return validValues
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeScaleValidValues getValidValues() {
-        return validValues;
-    }
-
-    public void setValidValues(GermplasmAttributeScaleValidValues validValues) {
-        this.validValues = validValues;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeScale germplasmAttributeScale = (GermplasmAttributeScale) o;
-        return Objects.equals(this.additionalInfo, germplasmAttributeScale.additionalInfo) &&
-                Objects.equals(this.dataType, germplasmAttributeScale.dataType) &&
-                Objects.equals(this.decimalPlaces, germplasmAttributeScale.decimalPlaces) &&
-                Objects.equals(this.externalReferences, germplasmAttributeScale.externalReferences) &&
-                Objects.equals(this.ontologyReference, germplasmAttributeScale.ontologyReference) &&
-                Objects.equals(this.scaleDbId, germplasmAttributeScale.scaleDbId) &&
-                Objects.equals(this.scaleName, germplasmAttributeScale.scaleName) &&
-                Objects.equals(this.scalePUI, germplasmAttributeScale.scalePUI) &&
-                Objects.equals(this.units, germplasmAttributeScale.units) &&
-                Objects.equals(this.validValues, germplasmAttributeScale.validValues);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, dataType, decimalPlaces, externalReferences, ontologyReference, scaleDbId, scaleName, scalePUI, units, validValues);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeScale {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
-        sb.append("    decimalPlaces: ").append(toIndentedString(decimalPlaces)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scaleDbId: ").append(toIndentedString(scaleDbId)).append("\n");
-        sb.append("    scaleName: ").append(toIndentedString(scaleName)).append("\n");
-        sb.append("    scalePUI: ").append(toIndentedString(scalePUI)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("    validValues: ").append(toIndentedString(validValues)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeScaleValidValues.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeScaleValidValues.java
deleted file mode 100644
index 5c4b01ed..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeScaleValidValues.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * GermplasmAttributeScaleValidValues
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeScaleValidValues {
-    @SerializedName("categories")
-    private List<GermplasmAttributeScaleValidValuesCategories> categories = null;
-
-    @SerializedName("max")
-    private Integer max = null;
-
-    @SerializedName("maximumValue")
-    private String maximumValue = null;
-
-    @SerializedName("min")
-    private Integer min = null;
-
-    @SerializedName("minimumValue")
-    private String minimumValue = null;
-
-    public GermplasmAttributeScaleValidValues categories(List<GermplasmAttributeScaleValidValuesCategories> categories) {
-        this.categories = categories;
-        return this;
-    }
-
-    public GermplasmAttributeScaleValidValues addCategoriesItem(GermplasmAttributeScaleValidValuesCategories categoriesItem) {
-        if (this.categories == null) {
-            this.categories = new ArrayList<GermplasmAttributeScaleValidValuesCategories>();
-        }
-        this.categories.add(categoriesItem);
-        return this;
-    }
-
-    /**
-     * List of possible values with optional labels
-     *
-     * @return categories
-     **/
-    @Schema(example = "[{\"label\":\"low\",\"value\":\"0\"},{\"label\":\"medium\",\"value\":\"5\"},{\"label\":\"high\",\"value\":\"10\"}]", description = "List of possible values with optional labels")
-    public List<GermplasmAttributeScaleValidValuesCategories> getCategories() {
-        return categories;
-    }
-
-    public void setCategories(List<GermplasmAttributeScaleValidValuesCategories> categories) {
-        this.categories = categories;
-    }
-
-    public GermplasmAttributeScaleValidValues max(Integer max) {
-        this.max = max;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;maximumValue&#x60;. Github issue number #450  &lt;br&gt;Maximum value for numerical scales. Typically used for data capture control and QC.
-     *
-     * @return max
-     **/
-    @Schema(example = "9999", description = "**Deprecated in v2.1** Please use `maximumValue`. Github issue number #450  <br>Maximum value for numerical scales. Typically used for data capture control and QC.")
-    public Integer getMax() {
-        return max;
-    }
-
-    public void setMax(Integer max) {
-        this.max = max;
-    }
-
-    public GermplasmAttributeScaleValidValues maximumValue(String maximumValue) {
-        this.maximumValue = maximumValue;
-        return this;
-    }
-
-    /**
-     * Maximum value for numerical, date, and time scales. Typically used for data capture control and QC.
-     *
-     * @return maximumValue
-     **/
-    @Schema(example = "9999", description = "Maximum value for numerical, date, and time scales. Typically used for data capture control and QC.")
-    public String getMaximumValue() {
-        return maximumValue;
-    }
-
-    public void setMaximumValue(String maximumValue) {
-        this.maximumValue = maximumValue;
-    }
-
-    public GermplasmAttributeScaleValidValues min(Integer min) {
-        this.min = min;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;minimumValue&#x60;. Github issue number #450  &lt;br&gt;Minimum value for numerical scales. Typically used for data capture control and QC.
-     *
-     * @return min
-     **/
-    @Schema(example = "2", description = "**Deprecated in v2.1** Please use `minimumValue`. Github issue number #450  <br>Minimum value for numerical scales. Typically used for data capture control and QC.")
-    public Integer getMin() {
-        return min;
-    }
-
-    public void setMin(Integer min) {
-        this.min = min;
-    }
-
-    public GermplasmAttributeScaleValidValues minimumValue(String minimumValue) {
-        this.minimumValue = minimumValue;
-        return this;
-    }
-
-    /**
-     * Minimum value for numerical, date, and time scales. Typically used for data capture control and QC.
-     *
-     * @return minimumValue
-     **/
-    @Schema(example = "2", description = "Minimum value for numerical, date, and time scales. Typically used for data capture control and QC.")
-    public String getMinimumValue() {
-        return minimumValue;
-    }
-
-    public void setMinimumValue(String minimumValue) {
-        this.minimumValue = minimumValue;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeScaleValidValues germplasmAttributeScaleValidValues = (GermplasmAttributeScaleValidValues) o;
-        return Objects.equals(this.categories, germplasmAttributeScaleValidValues.categories) &&
-                Objects.equals(this.max, germplasmAttributeScaleValidValues.max) &&
-                Objects.equals(this.maximumValue, germplasmAttributeScaleValidValues.maximumValue) &&
-                Objects.equals(this.min, germplasmAttributeScaleValidValues.min) &&
-                Objects.equals(this.minimumValue, germplasmAttributeScaleValidValues.minimumValue);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(categories, max, maximumValue, min, minimumValue);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeScaleValidValues {\n");
-
-        sb.append("    categories: ").append(toIndentedString(categories)).append("\n");
-        sb.append("    max: ").append(toIndentedString(max)).append("\n");
-        sb.append("    maximumValue: ").append(toIndentedString(maximumValue)).append("\n");
-        sb.append("    min: ").append(toIndentedString(min)).append("\n");
-        sb.append("    minimumValue: ").append(toIndentedString(minimumValue)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeScaleValidValuesCategories.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeScaleValidValuesCategories.java
deleted file mode 100644
index dab26553..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeScaleValidValuesCategories.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * GermplasmAttributeScaleValidValuesCategories
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeScaleValidValuesCategories {
-    @SerializedName("label")
-    private String label = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    public GermplasmAttributeScaleValidValuesCategories label(String label) {
-        this.label = label;
-        return this;
-    }
-
-    /**
-     * A text label for a category
-     *
-     * @return label
-     **/
-    @Schema(description = "A text label for a category")
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    public GermplasmAttributeScaleValidValuesCategories value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * The actual value for a category
-     *
-     * @return value
-     **/
-    @Schema(description = "The actual value for a category")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeScaleValidValuesCategories germplasmAttributeScaleValidValuesCategories = (GermplasmAttributeScaleValidValuesCategories) o;
-        return Objects.equals(this.label, germplasmAttributeScaleValidValuesCategories.label) &&
-                Objects.equals(this.value, germplasmAttributeScaleValidValuesCategories.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(label, value);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeScaleValidValuesCategories {\n");
-
-        sb.append("    label: ").append(toIndentedString(label)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeSearchRequest.java
deleted file mode 100644
index f9d997a0..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeSearchRequest.java
+++ /dev/null
@@ -1,1226 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * GermplasmAttributeSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeSearchRequest {
-    @SerializedName("attributeCategories")
-    private List<String> attributeCategories = null;
-
-    @SerializedName("attributeDbIds")
-    private List<String> attributeDbIds = null;
-
-    @SerializedName("attributeNames")
-    private List<String> attributeNames = null;
-
-    @SerializedName("attributePUIs")
-    private List<String> attributePUIs = null;
-
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypesEnum.Adapter.class)
-    public enum DataTypesEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypesEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypesEnum fromValue(String input) {
-            for (DataTypesEnum b : DataTypesEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypesEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypesEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypesEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypesEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataTypes")
-    private List<DataTypesEnum> dataTypes = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("methodDbIds")
-    private List<String> methodDbIds = null;
-
-    @SerializedName("methodNames")
-    private List<String> methodNames = null;
-
-    @SerializedName("methodPUIs")
-    private List<String> methodPUIs = null;
-
-    @SerializedName("ontologyDbIds")
-    private List<String> ontologyDbIds = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("scaleDbIds")
-    private List<String> scaleDbIds = null;
-
-    @SerializedName("scaleNames")
-    private List<String> scaleNames = null;
-
-    @SerializedName("scalePUIs")
-    private List<String> scalePUIs = null;
-
-    @SerializedName("studyDbId")
-    private List<String> studyDbId = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("traitAttributePUIs")
-    private List<String> traitAttributePUIs = null;
-
-    @SerializedName("traitAttributes")
-    private List<String> traitAttributes = null;
-
-    @SerializedName("traitClasses")
-    private List<String> traitClasses = null;
-
-    @SerializedName("traitDbIds")
-    private List<String> traitDbIds = null;
-
-    @SerializedName("traitEntities")
-    private List<String> traitEntities = null;
-
-    @SerializedName("traitEntityPUIs")
-    private List<String> traitEntityPUIs = null;
-
-    @SerializedName("traitNames")
-    private List<String> traitNames = null;
-
-    @SerializedName("traitPUIs")
-    private List<String> traitPUIs = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public GermplasmAttributeSearchRequest attributeCategories(List<String> attributeCategories) {
-        this.attributeCategories = attributeCategories;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addAttributeCategoriesItem(String attributeCategoriesItem) {
-        if (this.attributeCategories == null) {
-            this.attributeCategories = new ArrayList<String>();
-        }
-        this.attributeCategories.add(attributeCategoriesItem);
-        return this;
-    }
-
-    /**
-     * General category for the attribute. very similar to Trait class.
-     *
-     * @return attributeCategories
-     **/
-    @Schema(example = "[\"Morphological\",\"Physical\"]", description = "General category for the attribute. very similar to Trait class.")
-    public List<String> getAttributeCategories() {
-        return attributeCategories;
-    }
-
-    public void setAttributeCategories(List<String> attributeCategories) {
-        this.attributeCategories = attributeCategories;
-    }
-
-    public GermplasmAttributeSearchRequest attributeDbIds(List<String> attributeDbIds) {
-        this.attributeDbIds = attributeDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addAttributeDbIdsItem(String attributeDbIdsItem) {
-        if (this.attributeDbIds == null) {
-            this.attributeDbIds = new ArrayList<String>();
-        }
-        this.attributeDbIds.add(attributeDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of Germplasm Attribute IDs to search for
-     *
-     * @return attributeDbIds
-     **/
-    @Schema(example = "[\"2ef15c9f\",\"318e7f7d\"]", description = "List of Germplasm Attribute IDs to search for")
-    public List<String> getAttributeDbIds() {
-        return attributeDbIds;
-    }
-
-    public void setAttributeDbIds(List<String> attributeDbIds) {
-        this.attributeDbIds = attributeDbIds;
-    }
-
-    public GermplasmAttributeSearchRequest attributeNames(List<String> attributeNames) {
-        this.attributeNames = attributeNames;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addAttributeNamesItem(String attributeNamesItem) {
-        if (this.attributeNames == null) {
-            this.attributeNames = new ArrayList<String>();
-        }
-        this.attributeNames.add(attributeNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable Germplasm Attribute names to search for
-     *
-     * @return attributeNames
-     **/
-    @Schema(example = "[\"Plant Height 1\",\"Root Color\"]", description = "List of human readable Germplasm Attribute names to search for")
-    public List<String> getAttributeNames() {
-        return attributeNames;
-    }
-
-    public void setAttributeNames(List<String> attributeNames) {
-        this.attributeNames = attributeNames;
-    }
-
-    public GermplasmAttributeSearchRequest attributePUIs(List<String> attributePUIs) {
-        this.attributePUIs = attributePUIs;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addAttributePUIsItem(String attributePUIsItem) {
-        if (this.attributePUIs == null) {
-            this.attributePUIs = new ArrayList<String>();
-        }
-        this.attributePUIs.add(attributePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of an Attribute, usually in the form of a URI
-     *
-     * @return attributePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008012\",\"http://my-traits.com/trait/CO_123:0007261\"]", description = "The Permanent Unique Identifier of an Attribute, usually in the form of a URI")
-    public List<String> getAttributePUIs() {
-        return attributePUIs;
-    }
-
-    public void setAttributePUIs(List<String> attributePUIs) {
-        this.attributePUIs = attributePUIs;
-    }
-
-    public GermplasmAttributeSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public GermplasmAttributeSearchRequest dataTypes(List<DataTypesEnum> dataTypes) {
-        this.dataTypes = dataTypes;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addDataTypesItem(DataTypesEnum dataTypesItem) {
-        if (this.dataTypes == null) {
-            this.dataTypes = new ArrayList<DataTypesEnum>();
-        }
-        this.dataTypes.add(dataTypesItem);
-        return this;
-    }
-
-    /**
-     * List of scale data types to filter search results
-     *
-     * @return dataTypes
-     **/
-    @Schema(example = "[\"Numerical\",\"Ordinal\",\"Text\"]", description = "List of scale data types to filter search results")
-    public List<DataTypesEnum> getDataTypes() {
-        return dataTypes;
-    }
-
-    public void setDataTypes(List<DataTypesEnum> dataTypes) {
-        this.dataTypes = dataTypes;
-    }
-
-    public GermplasmAttributeSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public GermplasmAttributeSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public GermplasmAttributeSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public GermplasmAttributeSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public GermplasmAttributeSearchRequest germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public GermplasmAttributeSearchRequest methodDbIds(List<String> methodDbIds) {
-        this.methodDbIds = methodDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addMethodDbIdsItem(String methodDbIdsItem) {
-        if (this.methodDbIds == null) {
-            this.methodDbIds = new ArrayList<String>();
-        }
-        this.methodDbIds.add(methodDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of methods to filter search results
-     *
-     * @return methodDbIds
-     **/
-    @Schema(example = "[\"07e34f83\",\"d3d5517a\"]", description = "List of methods to filter search results")
-    public List<String> getMethodDbIds() {
-        return methodDbIds;
-    }
-
-    public void setMethodDbIds(List<String> methodDbIds) {
-        this.methodDbIds = methodDbIds;
-    }
-
-    public GermplasmAttributeSearchRequest methodNames(List<String> methodNames) {
-        this.methodNames = methodNames;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addMethodNamesItem(String methodNamesItem) {
-        if (this.methodNames == null) {
-            this.methodNames = new ArrayList<String>();
-        }
-        this.methodNames.add(methodNamesItem);
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodNames
-     **/
-    @Schema(example = "[\"Measuring Tape\",\"Spectrometer\"]", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public List<String> getMethodNames() {
-        return methodNames;
-    }
-
-    public void setMethodNames(List<String> methodNames) {
-        this.methodNames = methodNames;
-    }
-
-    public GermplasmAttributeSearchRequest methodPUIs(List<String> methodPUIs) {
-        this.methodPUIs = methodPUIs;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addMethodPUIsItem(String methodPUIsItem) {
-        if (this.methodPUIs == null) {
-            this.methodPUIs = new ArrayList<String>();
-        }
-        this.methodPUIs.add(methodPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000212\",\"http://my-traits.com/trait/CO_123:0003557\"]", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public List<String> getMethodPUIs() {
-        return methodPUIs;
-    }
-
-    public void setMethodPUIs(List<String> methodPUIs) {
-        this.methodPUIs = methodPUIs;
-    }
-
-    public GermplasmAttributeSearchRequest ontologyDbIds(List<String> ontologyDbIds) {
-        this.ontologyDbIds = ontologyDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addOntologyDbIdsItem(String ontologyDbIdsItem) {
-        if (this.ontologyDbIds == null) {
-            this.ontologyDbIds = new ArrayList<String>();
-        }
-        this.ontologyDbIds.add(ontologyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of ontology IDs to search for
-     *
-     * @return ontologyDbIds
-     **/
-    @Schema(example = "[\"f44f7b23\",\"a26b576e\"]", description = "List of ontology IDs to search for")
-    public List<String> getOntologyDbIds() {
-        return ontologyDbIds;
-    }
-
-    public void setOntologyDbIds(List<String> ontologyDbIds) {
-        this.ontologyDbIds = ontologyDbIds;
-    }
-
-    public GermplasmAttributeSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public GermplasmAttributeSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public GermplasmAttributeSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public GermplasmAttributeSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public GermplasmAttributeSearchRequest scaleDbIds(List<String> scaleDbIds) {
-        this.scaleDbIds = scaleDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addScaleDbIdsItem(String scaleDbIdsItem) {
-        if (this.scaleDbIds == null) {
-            this.scaleDbIds = new ArrayList<String>();
-        }
-        this.scaleDbIds.add(scaleDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Scale
-     *
-     * @return scaleDbIds
-     **/
-    @Schema(example = "[\"a13ecffa\",\"7e1afe4f\"]", description = "The unique identifier for a Scale")
-    public List<String> getScaleDbIds() {
-        return scaleDbIds;
-    }
-
-    public void setScaleDbIds(List<String> scaleDbIds) {
-        this.scaleDbIds = scaleDbIds;
-    }
-
-    public GermplasmAttributeSearchRequest scaleNames(List<String> scaleNames) {
-        this.scaleNames = scaleNames;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addScaleNamesItem(String scaleNamesItem) {
-        if (this.scaleNames == null) {
-            this.scaleNames = new ArrayList<String>();
-        }
-        this.scaleNames.add(scaleNamesItem);
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleNames
-     **/
-    @Schema(example = "[\"Meters\",\"Liters\"]", description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public List<String> getScaleNames() {
-        return scaleNames;
-    }
-
-    public void setScaleNames(List<String> scaleNames) {
-        this.scaleNames = scaleNames;
-    }
-
-    public GermplasmAttributeSearchRequest scalePUIs(List<String> scalePUIs) {
-        this.scalePUIs = scalePUIs;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addScalePUIsItem(String scalePUIsItem) {
-        if (this.scalePUIs == null) {
-            this.scalePUIs = new ArrayList<String>();
-        }
-        this.scalePUIs.add(scalePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000336\",\"http://my-traits.com/trait/CO_123:0000560\"]", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public List<String> getScalePUIs() {
-        return scalePUIs;
-    }
-
-    public void setScalePUIs(List<String> scalePUIs) {
-        this.scalePUIs = scalePUIs;
-    }
-
-    public GermplasmAttributeSearchRequest studyDbId(List<String> studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addStudyDbIdItem(String studyDbIdItem) {
-        if (this.studyDbId == null) {
-            this.studyDbId = new ArrayList<String>();
-        }
-        this.studyDbId.add(studyDbIdItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;studyDbIds&#x60;. Github issue number #483  &lt;br&gt;The unique ID of a studies to filter on
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "[\"5bcac0ae\",\"7f48e22d\"]", description = "**Deprecated in v2.1** Please use `studyDbIds`. Github issue number #483  <br>The unique ID of a studies to filter on")
-    public List<String> getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(List<String> studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public GermplasmAttributeSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public GermplasmAttributeSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public GermplasmAttributeSearchRequest traitAttributePUIs(List<String> traitAttributePUIs) {
-        this.traitAttributePUIs = traitAttributePUIs;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addTraitAttributePUIsItem(String traitAttributePUIsItem) {
-        if (this.traitAttributePUIs == null) {
-            this.traitAttributePUIs = new ArrayList<String>();
-        }
-        this.traitAttributePUIs.add(traitAttributePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return traitAttributePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008336\",\"http://my-traits.com/trait/CO_123:0001092\"]", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public List<String> getTraitAttributePUIs() {
-        return traitAttributePUIs;
-    }
-
-    public void setTraitAttributePUIs(List<String> traitAttributePUIs) {
-        this.traitAttributePUIs = traitAttributePUIs;
-    }
-
-    public GermplasmAttributeSearchRequest traitAttributes(List<String> traitAttributes) {
-        this.traitAttributes = traitAttributes;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addTraitAttributesItem(String traitAttributesItem) {
-        if (this.traitAttributes == null) {
-            this.traitAttributes = new ArrayList<String>();
-        }
-        this.traitAttributes.add(traitAttributesItem);
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return traitAttributes
-     **/
-    @Schema(example = "[\"Height\",\"Color\"]", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public List<String> getTraitAttributes() {
-        return traitAttributes;
-    }
-
-    public void setTraitAttributes(List<String> traitAttributes) {
-        this.traitAttributes = traitAttributes;
-    }
-
-    public GermplasmAttributeSearchRequest traitClasses(List<String> traitClasses) {
-        this.traitClasses = traitClasses;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addTraitClassesItem(String traitClassesItem) {
-        if (this.traitClasses == null) {
-            this.traitClasses = new ArrayList<String>();
-        }
-        this.traitClasses.add(traitClassesItem);
-        return this;
-    }
-
-    /**
-     * List of trait classes to filter search results
-     *
-     * @return traitClasses
-     **/
-    @Schema(example = "[\"morphological\",\"phenological\",\"agronomical\"]", description = "List of trait classes to filter search results")
-    public List<String> getTraitClasses() {
-        return traitClasses;
-    }
-
-    public void setTraitClasses(List<String> traitClasses) {
-        this.traitClasses = traitClasses;
-    }
-
-    public GermplasmAttributeSearchRequest traitDbIds(List<String> traitDbIds) {
-        this.traitDbIds = traitDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addTraitDbIdsItem(String traitDbIdsItem) {
-        if (this.traitDbIds == null) {
-            this.traitDbIds = new ArrayList<String>();
-        }
-        this.traitDbIds.add(traitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Trait
-     *
-     * @return traitDbIds
-     **/
-    @Schema(example = "[\"ef81147b\",\"78d82fad\"]", description = "The unique identifier for a Trait")
-    public List<String> getTraitDbIds() {
-        return traitDbIds;
-    }
-
-    public void setTraitDbIds(List<String> traitDbIds) {
-        this.traitDbIds = traitDbIds;
-    }
-
-    public GermplasmAttributeSearchRequest traitEntities(List<String> traitEntities) {
-        this.traitEntities = traitEntities;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addTraitEntitiesItem(String traitEntitiesItem) {
-        if (this.traitEntities == null) {
-            this.traitEntities = new ArrayList<String>();
-        }
-        this.traitEntities.add(traitEntitiesItem);
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return traitEntities
-     **/
-    @Schema(example = "[\"Stalk\",\"Root\"]", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public List<String> getTraitEntities() {
-        return traitEntities;
-    }
-
-    public void setTraitEntities(List<String> traitEntities) {
-        this.traitEntities = traitEntities;
-    }
-
-    public GermplasmAttributeSearchRequest traitEntityPUIs(List<String> traitEntityPUIs) {
-        this.traitEntityPUIs = traitEntityPUIs;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addTraitEntityPUIsItem(String traitEntityPUIsItem) {
-        if (this.traitEntityPUIs == null) {
-            this.traitEntityPUIs = new ArrayList<String>();
-        }
-        this.traitEntityPUIs.add(traitEntityPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return traitEntityPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0004098\",\"http://my-traits.com/trait/CO_123:0002366\"]", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public List<String> getTraitEntityPUIs() {
-        return traitEntityPUIs;
-    }
-
-    public void setTraitEntityPUIs(List<String> traitEntityPUIs) {
-        this.traitEntityPUIs = traitEntityPUIs;
-    }
-
-    public GermplasmAttributeSearchRequest traitNames(List<String> traitNames) {
-        this.traitNames = traitNames;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addTraitNamesItem(String traitNamesItem) {
-        if (this.traitNames == null) {
-            this.traitNames = new ArrayList<String>();
-        }
-        this.traitNames.add(traitNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitNames
-     **/
-    @Schema(example = "[\"Stalk Height\",\"Root Color\"]", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public List<String> getTraitNames() {
-        return traitNames;
-    }
-
-    public void setTraitNames(List<String> traitNames) {
-        this.traitNames = traitNames;
-    }
-
-    public GermplasmAttributeSearchRequest traitPUIs(List<String> traitPUIs) {
-        this.traitPUIs = traitPUIs;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addTraitPUIsItem(String traitPUIsItem) {
-        if (this.traitPUIs == null) {
-            this.traitPUIs = new ArrayList<String>();
-        }
-        this.traitPUIs.add(traitPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000456\",\"http://my-traits.com/trait/CO_123:0000820\"]", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public List<String> getTraitPUIs() {
-        return traitPUIs;
-    }
-
-    public void setTraitPUIs(List<String> traitPUIs) {
-        this.traitPUIs = traitPUIs;
-    }
-
-    public GermplasmAttributeSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public GermplasmAttributeSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public GermplasmAttributeSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeSearchRequest germplasmAttributeSearchRequest = (GermplasmAttributeSearchRequest) o;
-        return Objects.equals(this.attributeCategories, germplasmAttributeSearchRequest.attributeCategories) &&
-                Objects.equals(this.attributeDbIds, germplasmAttributeSearchRequest.attributeDbIds) &&
-                Objects.equals(this.attributeNames, germplasmAttributeSearchRequest.attributeNames) &&
-                Objects.equals(this.attributePUIs, germplasmAttributeSearchRequest.attributePUIs) &&
-                Objects.equals(this.commonCropNames, germplasmAttributeSearchRequest.commonCropNames) &&
-                Objects.equals(this.dataTypes, germplasmAttributeSearchRequest.dataTypes) &&
-                Objects.equals(this.externalReferenceIDs, germplasmAttributeSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, germplasmAttributeSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, germplasmAttributeSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.germplasmDbIds, germplasmAttributeSearchRequest.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, germplasmAttributeSearchRequest.germplasmNames) &&
-                Objects.equals(this.methodDbIds, germplasmAttributeSearchRequest.methodDbIds) &&
-                Objects.equals(this.methodNames, germplasmAttributeSearchRequest.methodNames) &&
-                Objects.equals(this.methodPUIs, germplasmAttributeSearchRequest.methodPUIs) &&
-                Objects.equals(this.ontologyDbIds, germplasmAttributeSearchRequest.ontologyDbIds) &&
-                Objects.equals(this.page, germplasmAttributeSearchRequest.page) &&
-                Objects.equals(this.pageSize, germplasmAttributeSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, germplasmAttributeSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, germplasmAttributeSearchRequest.programNames) &&
-                Objects.equals(this.scaleDbIds, germplasmAttributeSearchRequest.scaleDbIds) &&
-                Objects.equals(this.scaleNames, germplasmAttributeSearchRequest.scaleNames) &&
-                Objects.equals(this.scalePUIs, germplasmAttributeSearchRequest.scalePUIs) &&
-                Objects.equals(this.studyDbId, germplasmAttributeSearchRequest.studyDbId) &&
-                Objects.equals(this.studyDbIds, germplasmAttributeSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, germplasmAttributeSearchRequest.studyNames) &&
-                Objects.equals(this.traitAttributePUIs, germplasmAttributeSearchRequest.traitAttributePUIs) &&
-                Objects.equals(this.traitAttributes, germplasmAttributeSearchRequest.traitAttributes) &&
-                Objects.equals(this.traitClasses, germplasmAttributeSearchRequest.traitClasses) &&
-                Objects.equals(this.traitDbIds, germplasmAttributeSearchRequest.traitDbIds) &&
-                Objects.equals(this.traitEntities, germplasmAttributeSearchRequest.traitEntities) &&
-                Objects.equals(this.traitEntityPUIs, germplasmAttributeSearchRequest.traitEntityPUIs) &&
-                Objects.equals(this.traitNames, germplasmAttributeSearchRequest.traitNames) &&
-                Objects.equals(this.traitPUIs, germplasmAttributeSearchRequest.traitPUIs) &&
-                Objects.equals(this.trialDbIds, germplasmAttributeSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, germplasmAttributeSearchRequest.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(attributeCategories, attributeDbIds, attributeNames, attributePUIs, commonCropNames, dataTypes, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds, germplasmNames, methodDbIds, methodNames, methodPUIs, ontologyDbIds, page, pageSize, programDbIds, programNames, scaleDbIds, scaleNames, scalePUIs, studyDbId, studyDbIds, studyNames, traitAttributePUIs, traitAttributes, traitClasses, traitDbIds, traitEntities, traitEntityPUIs, traitNames, traitPUIs, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeSearchRequest {\n");
-
-        sb.append("    attributeCategories: ").append(toIndentedString(attributeCategories)).append("\n");
-        sb.append("    attributeDbIds: ").append(toIndentedString(attributeDbIds)).append("\n");
-        sb.append("    attributeNames: ").append(toIndentedString(attributeNames)).append("\n");
-        sb.append("    attributePUIs: ").append(toIndentedString(attributePUIs)).append("\n");
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    dataTypes: ").append(toIndentedString(dataTypes)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    methodDbIds: ").append(toIndentedString(methodDbIds)).append("\n");
-        sb.append("    methodNames: ").append(toIndentedString(methodNames)).append("\n");
-        sb.append("    methodPUIs: ").append(toIndentedString(methodPUIs)).append("\n");
-        sb.append("    ontologyDbIds: ").append(toIndentedString(ontologyDbIds)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    scaleDbIds: ").append(toIndentedString(scaleDbIds)).append("\n");
-        sb.append("    scaleNames: ").append(toIndentedString(scaleNames)).append("\n");
-        sb.append("    scalePUIs: ").append(toIndentedString(scalePUIs)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    traitAttributePUIs: ").append(toIndentedString(traitAttributePUIs)).append("\n");
-        sb.append("    traitAttributes: ").append(toIndentedString(traitAttributes)).append("\n");
-        sb.append("    traitClasses: ").append(toIndentedString(traitClasses)).append("\n");
-        sb.append("    traitDbIds: ").append(toIndentedString(traitDbIds)).append("\n");
-        sb.append("    traitEntities: ").append(toIndentedString(traitEntities)).append("\n");
-        sb.append("    traitEntityPUIs: ").append(toIndentedString(traitEntityPUIs)).append("\n");
-        sb.append("    traitNames: ").append(toIndentedString(traitNames)).append("\n");
-        sb.append("    traitPUIs: ").append(toIndentedString(traitPUIs)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeSingleResponse.java
deleted file mode 100644
index e07960c7..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * GermplasmAttributeSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private GermplasmAttribute result = null;
-
-    public GermplasmAttributeSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public GermplasmAttributeSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public GermplasmAttributeSingleResponse result(GermplasmAttribute result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public GermplasmAttribute getResult() {
-        return result;
-    }
-
-    public void setResult(GermplasmAttribute result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeSingleResponse germplasmAttributeSingleResponse = (GermplasmAttributeSingleResponse) o;
-        return Objects.equals(this._atContext, germplasmAttributeSingleResponse._atContext) &&
-                Objects.equals(this.metadata, germplasmAttributeSingleResponse.metadata) &&
-                Objects.equals(this.result, germplasmAttributeSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeTrait.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeTrait.java
deleted file mode 100644
index 8a30d884..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeTrait.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A Trait describes what property is being observed.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Trait \&quot;Leaf length\&quot; or \&quot;Flower height\&quot;.
- */
-@Schema(description = "A Trait describes what property is being observed.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Trait \"Leaf length\" or \"Flower height\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeTrait {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("alternativeAbbreviations")
-    private List<String> alternativeAbbreviations = null;
-
-    @SerializedName("attribute")
-    private String attribute = null;
-
-    @SerializedName("attributePUI")
-    private String attributePUI = null;
-
-    @SerializedName("entity")
-    private String entity = null;
-
-    @SerializedName("entityPUI")
-    private String entityPUI = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("mainAbbreviation")
-    private String mainAbbreviation = null;
-
-    @SerializedName("ontologyReference")
-    private GermplasmAttributeMethodOntologyReference ontologyReference = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("traitClass")
-    private String traitClass = null;
-
-    @SerializedName("traitDbId")
-    private String traitDbId = null;
-
-    @SerializedName("traitDescription")
-    private String traitDescription = null;
-
-    @SerializedName("traitName")
-    private String traitName = null;
-
-    @SerializedName("traitPUI")
-    private String traitPUI = null;
-
-    public GermplasmAttributeTrait additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public GermplasmAttributeTrait putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public GermplasmAttributeTrait alternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-        return this;
-    }
-
-    public GermplasmAttributeTrait addAlternativeAbbreviationsItem(String alternativeAbbreviationsItem) {
-        if (this.alternativeAbbreviations == null) {
-            this.alternativeAbbreviations = new ArrayList<String>();
-        }
-        this.alternativeAbbreviations.add(alternativeAbbreviationsItem);
-        return this;
-    }
-
-    /**
-     * A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.
-     *
-     * @return alternativeAbbreviations
-     **/
-    @Schema(example = "[\"H\",\"PH\",\"H1\"]", description = "A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.")
-    public List<String> getAlternativeAbbreviations() {
-        return alternativeAbbreviations;
-    }
-
-    public void setAlternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-    }
-
-    public GermplasmAttributeTrait attribute(String attribute) {
-        this.attribute = attribute;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attribute
-     **/
-    @Schema(example = "height", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    public GermplasmAttributeTrait attributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attributePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PO:00012345", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttributePUI() {
-        return attributePUI;
-    }
-
-    public void setAttributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-    }
-
-    public GermplasmAttributeTrait entity(String entity) {
-        this.entity = entity;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entity
-     **/
-    @Schema(example = "Stalk", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public String getEntity() {
-        return entity;
-    }
-
-    public void setEntity(String entity) {
-        this.entity = entity;
-    }
-
-    public GermplasmAttributeTrait entityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A Trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the Entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entityPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PATO:00098765", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A Trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the Entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public String getEntityPUI() {
-        return entityPUI;
-    }
-
-    public void setEntityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-    }
-
-    public GermplasmAttributeTrait externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public GermplasmAttributeTrait addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public GermplasmAttributeTrait mainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Trait
-     *
-     * @return mainAbbreviation
-     **/
-    @Schema(example = "PH", description = "A shortened version of the human readable name for a Trait")
-    public String getMainAbbreviation() {
-        return mainAbbreviation;
-    }
-
-    public void setMainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-    }
-
-    public GermplasmAttributeTrait ontologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeMethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public GermplasmAttributeTrait status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Trait status (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Trait status (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public GermplasmAttributeTrait synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public GermplasmAttributeTrait addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other trait names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Height\",\"Plant Height\",\"Stalk Height\",\"Canopy Height\"]", description = "Other trait names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public GermplasmAttributeTrait traitClass(String traitClass) {
-        this.traitClass = traitClass;
-        return this;
-    }
-
-    /**
-     * A classification to describe the type of trait and the context it should be considered in. &lt;br/&gt; examples- \&quot;morphological\&quot;, \&quot;phenological\&quot;, \&quot;agronomical\&quot;, \&quot;physiological\&quot;, \&quot;abiotic stress\&quot;, \&quot;biotic stress\&quot;, \&quot;biochemical\&quot;, \&quot;quality traits\&quot;, \&quot;fertility\&quot;, etc.
-     *
-     * @return traitClass
-     **/
-    @Schema(example = "phenological", description = "A classification to describe the type of trait and the context it should be considered in. <br/> examples- \"morphological\", \"phenological\", \"agronomical\", \"physiological\", \"abiotic stress\", \"biotic stress\", \"biochemical\", \"quality traits\", \"fertility\", etc.")
-    public String getTraitClass() {
-        return traitClass;
-    }
-
-    public void setTraitClass(String traitClass) {
-        this.traitClass = traitClass;
-    }
-
-    public GermplasmAttributeTrait traitDbId(String traitDbId) {
-        this.traitDbId = traitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trait
-     *
-     * @return traitDbId
-     **/
-    @Schema(example = "9b2e34f5", description = "The ID which uniquely identifies a trait")
-    public String getTraitDbId() {
-        return traitDbId;
-    }
-
-    public void setTraitDbId(String traitDbId) {
-        this.traitDbId = traitDbId;
-    }
-
-    public GermplasmAttributeTrait traitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-        return this;
-    }
-
-    /**
-     * The description of a trait
-     *
-     * @return traitDescription
-     **/
-    @Schema(example = "The height of the plant", description = "The description of a trait")
-    public String getTraitDescription() {
-        return traitDescription;
-    }
-
-    public void setTraitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-    }
-
-    public GermplasmAttributeTrait traitName(String traitName) {
-        this.traitName = traitName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitName
-     **/
-    @Schema(example = "Height", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public String getTraitName() {
-        return traitName;
-    }
-
-    public void setTraitName(String traitName) {
-        this.traitName = traitName;
-    }
-
-    public GermplasmAttributeTrait traitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000012", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public String getTraitPUI() {
-        return traitPUI;
-    }
-
-    public void setTraitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeTrait germplasmAttributeTrait = (GermplasmAttributeTrait) o;
-        return Objects.equals(this.additionalInfo, germplasmAttributeTrait.additionalInfo) &&
-                Objects.equals(this.alternativeAbbreviations, germplasmAttributeTrait.alternativeAbbreviations) &&
-                Objects.equals(this.attribute, germplasmAttributeTrait.attribute) &&
-                Objects.equals(this.attributePUI, germplasmAttributeTrait.attributePUI) &&
-                Objects.equals(this.entity, germplasmAttributeTrait.entity) &&
-                Objects.equals(this.entityPUI, germplasmAttributeTrait.entityPUI) &&
-                Objects.equals(this.externalReferences, germplasmAttributeTrait.externalReferences) &&
-                Objects.equals(this.mainAbbreviation, germplasmAttributeTrait.mainAbbreviation) &&
-                Objects.equals(this.ontologyReference, germplasmAttributeTrait.ontologyReference) &&
-                Objects.equals(this.status, germplasmAttributeTrait.status) &&
-                Objects.equals(this.synonyms, germplasmAttributeTrait.synonyms) &&
-                Objects.equals(this.traitClass, germplasmAttributeTrait.traitClass) &&
-                Objects.equals(this.traitDbId, germplasmAttributeTrait.traitDbId) &&
-                Objects.equals(this.traitDescription, germplasmAttributeTrait.traitDescription) &&
-                Objects.equals(this.traitName, germplasmAttributeTrait.traitName) &&
-                Objects.equals(this.traitPUI, germplasmAttributeTrait.traitPUI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, alternativeAbbreviations, attribute, attributePUI, entity, entityPUI, externalReferences, mainAbbreviation, ontologyReference, status, synonyms, traitClass, traitDbId, traitDescription, traitName, traitPUI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeTrait {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    alternativeAbbreviations: ").append(toIndentedString(alternativeAbbreviations)).append("\n");
-        sb.append("    attribute: ").append(toIndentedString(attribute)).append("\n");
-        sb.append("    attributePUI: ").append(toIndentedString(attributePUI)).append("\n");
-        sb.append("    entity: ").append(toIndentedString(entity)).append("\n");
-        sb.append("    entityPUI: ").append(toIndentedString(entityPUI)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    mainAbbreviation: ").append(toIndentedString(mainAbbreviation)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    traitClass: ").append(toIndentedString(traitClass)).append("\n");
-        sb.append("    traitDbId: ").append(toIndentedString(traitDbId)).append("\n");
-        sb.append("    traitDescription: ").append(toIndentedString(traitDescription)).append("\n");
-        sb.append("    traitName: ").append(toIndentedString(traitName)).append("\n");
-        sb.append("    traitPUI: ").append(toIndentedString(traitPUI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValue.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValue.java
deleted file mode 100644
index a58fdf60..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValue.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * GermplasmAttributeValue
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeValue {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("attributeDbId")
-    private String attributeDbId = null;
-
-    @SerializedName("attributeName")
-    private String attributeName = null;
-
-    @SerializedName("attributeValueDbId")
-    private String attributeValueDbId = null;
-
-    @SerializedName("determinedDate")
-    private OffsetDateTime determinedDate = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    public GermplasmAttributeValue additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public GermplasmAttributeValue putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public GermplasmAttributeValue attributeDbId(String attributeDbId) {
-        this.attributeDbId = attributeDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies this attribute within the given database server
-     *
-     * @return attributeDbId
-     **/
-    @Schema(example = "e529dd5a", description = "The ID which uniquely identifies this attribute within the given database server")
-    public String getAttributeDbId() {
-        return attributeDbId;
-    }
-
-    public void setAttributeDbId(String attributeDbId) {
-        this.attributeDbId = attributeDbId;
-    }
-
-    public GermplasmAttributeValue attributeName(String attributeName) {
-        this.attributeName = attributeName;
-        return this;
-    }
-
-    /**
-     * A human readable name for this attribute
-     *
-     * @return attributeName
-     **/
-    @Schema(example = "Weevil Resistance", description = "A human readable name for this attribute")
-    public String getAttributeName() {
-        return attributeName;
-    }
-
-    public void setAttributeName(String attributeName) {
-        this.attributeName = attributeName;
-    }
-
-    public GermplasmAttributeValue attributeValueDbId(String attributeValueDbId) {
-        this.attributeValueDbId = attributeValueDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies this attribute value within the given database server
-     *
-     * @return attributeValueDbId
-     **/
-    @Schema(example = "33edbab7", description = "The ID which uniquely identifies this attribute value within the given database server")
-    public String getAttributeValueDbId() {
-        return attributeValueDbId;
-    }
-
-    public void setAttributeValueDbId(String attributeValueDbId) {
-        this.attributeValueDbId = attributeValueDbId;
-    }
-
-    public GermplasmAttributeValue determinedDate(OffsetDateTime determinedDate) {
-        this.determinedDate = determinedDate;
-        return this;
-    }
-
-    /**
-     * The date the value of this attribute was determined for a given germplasm
-     *
-     * @return determinedDate
-     **/
-    @Schema(description = "The date the value of this attribute was determined for a given germplasm")
-    public OffsetDateTime getDeterminedDate() {
-        return determinedDate;
-    }
-
-    public void setDeterminedDate(OffsetDateTime determinedDate) {
-        this.determinedDate = determinedDate;
-    }
-
-    public GermplasmAttributeValue externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public GermplasmAttributeValue addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public GermplasmAttributeValue germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm within the given database server
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "d4076594", description = "The ID which uniquely identifies a germplasm within the given database server")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public GermplasmAttributeValue germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * Name of the germplasm. It can be the preferred name and does not have to be unique.
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000003", description = "Name of the germplasm. It can be the preferred name and does not have to be unique.")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public GermplasmAttributeValue value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * The value of this attribute for a given germplasm
-     *
-     * @return value
-     **/
-    @Schema(example = "Present", description = "The value of this attribute for a given germplasm")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeValue germplasmAttributeValue = (GermplasmAttributeValue) o;
-        return Objects.equals(this.additionalInfo, germplasmAttributeValue.additionalInfo) &&
-                Objects.equals(this.attributeDbId, germplasmAttributeValue.attributeDbId) &&
-                Objects.equals(this.attributeName, germplasmAttributeValue.attributeName) &&
-                Objects.equals(this.attributeValueDbId, germplasmAttributeValue.attributeValueDbId) &&
-                Objects.equals(this.determinedDate, germplasmAttributeValue.determinedDate) &&
-                Objects.equals(this.externalReferences, germplasmAttributeValue.externalReferences) &&
-                Objects.equals(this.germplasmDbId, germplasmAttributeValue.germplasmDbId) &&
-                Objects.equals(this.germplasmName, germplasmAttributeValue.germplasmName) &&
-                Objects.equals(this.value, germplasmAttributeValue.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, attributeDbId, attributeName, attributeValueDbId, determinedDate, externalReferences, germplasmDbId, germplasmName, value);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeValue {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    attributeDbId: ").append(toIndentedString(attributeDbId)).append("\n");
-        sb.append("    attributeName: ").append(toIndentedString(attributeName)).append("\n");
-        sb.append("    attributeValueDbId: ").append(toIndentedString(attributeValueDbId)).append("\n");
-        sb.append("    determinedDate: ").append(toIndentedString(determinedDate)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueListResponse.java
deleted file mode 100644
index f91a4814..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * GermplasmAttributeValueListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeValueListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private GermplasmAttributeValueListResponseResult result = null;
-
-    public GermplasmAttributeValueListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public GermplasmAttributeValueListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public GermplasmAttributeValueListResponse result(GermplasmAttributeValueListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public GermplasmAttributeValueListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(GermplasmAttributeValueListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeValueListResponse germplasmAttributeValueListResponse = (GermplasmAttributeValueListResponse) o;
-        return Objects.equals(this._atContext, germplasmAttributeValueListResponse._atContext) &&
-                Objects.equals(this.metadata, germplasmAttributeValueListResponse.metadata) &&
-                Objects.equals(this.result, germplasmAttributeValueListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeValueListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueListResponseResult.java
deleted file mode 100644
index 5bd9a564..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * GermplasmAttributeValueListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeValueListResponseResult {
-    @SerializedName("data")
-    private List<GermplasmAttributeValue> data = new ArrayList<GermplasmAttributeValue>();
-
-    public GermplasmAttributeValueListResponseResult data(List<GermplasmAttributeValue> data) {
-        this.data = data;
-        return this;
-    }
-
-    public GermplasmAttributeValueListResponseResult addDataItem(GermplasmAttributeValue dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<GermplasmAttributeValue> getData() {
-        return data;
-    }
-
-    public void setData(List<GermplasmAttributeValue> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeValueListResponseResult germplasmAttributeValueListResponseResult = (GermplasmAttributeValueListResponseResult) o;
-        return Objects.equals(this.data, germplasmAttributeValueListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeValueListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueNewRequest.java
deleted file mode 100644
index 11815440..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueNewRequest.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * GermplasmAttributeValueNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeValueNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("attributeDbId")
-    private String attributeDbId = null;
-
-    @SerializedName("attributeName")
-    private String attributeName = null;
-
-    @SerializedName("determinedDate")
-    private OffsetDateTime determinedDate = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    public GermplasmAttributeValueNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public GermplasmAttributeValueNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public GermplasmAttributeValueNewRequest attributeDbId(String attributeDbId) {
-        this.attributeDbId = attributeDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies this attribute within the given database server
-     *
-     * @return attributeDbId
-     **/
-    @Schema(example = "e529dd5a", description = "The ID which uniquely identifies this attribute within the given database server")
-    public String getAttributeDbId() {
-        return attributeDbId;
-    }
-
-    public void setAttributeDbId(String attributeDbId) {
-        this.attributeDbId = attributeDbId;
-    }
-
-    public GermplasmAttributeValueNewRequest attributeName(String attributeName) {
-        this.attributeName = attributeName;
-        return this;
-    }
-
-    /**
-     * A human readable name for this attribute
-     *
-     * @return attributeName
-     **/
-    @Schema(example = "Weevil Resistance", required = true, description = "A human readable name for this attribute")
-    public String getAttributeName() {
-        return attributeName;
-    }
-
-    public void setAttributeName(String attributeName) {
-        this.attributeName = attributeName;
-    }
-
-    public GermplasmAttributeValueNewRequest determinedDate(OffsetDateTime determinedDate) {
-        this.determinedDate = determinedDate;
-        return this;
-    }
-
-    /**
-     * The date the value of this attribute was determined for a given germplasm
-     *
-     * @return determinedDate
-     **/
-    @Schema(description = "The date the value of this attribute was determined for a given germplasm")
-    public OffsetDateTime getDeterminedDate() {
-        return determinedDate;
-    }
-
-    public void setDeterminedDate(OffsetDateTime determinedDate) {
-        this.determinedDate = determinedDate;
-    }
-
-    public GermplasmAttributeValueNewRequest externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public GermplasmAttributeValueNewRequest addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public GermplasmAttributeValueNewRequest germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm within the given database server
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "d4076594", description = "The ID which uniquely identifies a germplasm within the given database server")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public GermplasmAttributeValueNewRequest germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * Name of the germplasm. It can be the preferred name and does not have to be unique.
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000003", description = "Name of the germplasm. It can be the preferred name and does not have to be unique.")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public GermplasmAttributeValueNewRequest value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * The value of this attribute for a given germplasm
-     *
-     * @return value
-     **/
-    @Schema(example = "Present", description = "The value of this attribute for a given germplasm")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeValueNewRequest germplasmAttributeValueNewRequest = (GermplasmAttributeValueNewRequest) o;
-        return Objects.equals(this.additionalInfo, germplasmAttributeValueNewRequest.additionalInfo) &&
-                Objects.equals(this.attributeDbId, germplasmAttributeValueNewRequest.attributeDbId) &&
-                Objects.equals(this.attributeName, germplasmAttributeValueNewRequest.attributeName) &&
-                Objects.equals(this.determinedDate, germplasmAttributeValueNewRequest.determinedDate) &&
-                Objects.equals(this.externalReferences, germplasmAttributeValueNewRequest.externalReferences) &&
-                Objects.equals(this.germplasmDbId, germplasmAttributeValueNewRequest.germplasmDbId) &&
-                Objects.equals(this.germplasmName, germplasmAttributeValueNewRequest.germplasmName) &&
-                Objects.equals(this.value, germplasmAttributeValueNewRequest.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, attributeDbId, attributeName, determinedDate, externalReferences, germplasmDbId, germplasmName, value);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeValueNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    attributeDbId: ").append(toIndentedString(attributeDbId)).append("\n");
-        sb.append("    attributeName: ").append(toIndentedString(attributeName)).append("\n");
-        sb.append("    determinedDate: ").append(toIndentedString(determinedDate)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueSearchRequest.java
deleted file mode 100644
index f49e73ee..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueSearchRequest.java
+++ /dev/null
@@ -1,714 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * GermplasmAttributeValueSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeValueSearchRequest {
-    @SerializedName("attributeDbIds")
-    private List<String> attributeDbIds = null;
-
-    @SerializedName("attributeNames")
-    private List<String> attributeNames = null;
-
-    @SerializedName("attributeValueDbIds")
-    private List<String> attributeValueDbIds = null;
-
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypesEnum.Adapter.class)
-    public enum DataTypesEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypesEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypesEnum fromValue(String input) {
-            for (DataTypesEnum b : DataTypesEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypesEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypesEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypesEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypesEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataTypes")
-    private List<DataTypesEnum> dataTypes = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("methodDbIds")
-    private List<String> methodDbIds = null;
-
-    @SerializedName("ontologyDbIds")
-    private List<String> ontologyDbIds = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("scaleDbIds")
-    private List<String> scaleDbIds = null;
-
-    @SerializedName("traitClasses")
-    private List<String> traitClasses = null;
-
-    @SerializedName("traitDbIds")
-    private List<String> traitDbIds = null;
-
-    public GermplasmAttributeValueSearchRequest attributeDbIds(List<String> attributeDbIds) {
-        this.attributeDbIds = attributeDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addAttributeDbIdsItem(String attributeDbIdsItem) {
-        if (this.attributeDbIds == null) {
-            this.attributeDbIds = new ArrayList<String>();
-        }
-        this.attributeDbIds.add(attributeDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of Germplasm Attribute IDs to search for
-     *
-     * @return attributeDbIds
-     **/
-    @Schema(example = "[\"2ef15c9f\",\"318e7f7d\"]", description = "List of Germplasm Attribute IDs to search for")
-    public List<String> getAttributeDbIds() {
-        return attributeDbIds;
-    }
-
-    public void setAttributeDbIds(List<String> attributeDbIds) {
-        this.attributeDbIds = attributeDbIds;
-    }
-
-    public GermplasmAttributeValueSearchRequest attributeNames(List<String> attributeNames) {
-        this.attributeNames = attributeNames;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addAttributeNamesItem(String attributeNamesItem) {
-        if (this.attributeNames == null) {
-            this.attributeNames = new ArrayList<String>();
-        }
-        this.attributeNames.add(attributeNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable Germplasm Attribute names to search for
-     *
-     * @return attributeNames
-     **/
-    @Schema(example = "[\"Plant Height 1\",\"Root Color\"]", description = "List of human readable Germplasm Attribute names to search for")
-    public List<String> getAttributeNames() {
-        return attributeNames;
-    }
-
-    public void setAttributeNames(List<String> attributeNames) {
-        this.attributeNames = attributeNames;
-    }
-
-    public GermplasmAttributeValueSearchRequest attributeValueDbIds(List<String> attributeValueDbIds) {
-        this.attributeValueDbIds = attributeValueDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addAttributeValueDbIdsItem(String attributeValueDbIdsItem) {
-        if (this.attributeValueDbIds == null) {
-            this.attributeValueDbIds = new ArrayList<String>();
-        }
-        this.attributeValueDbIds.add(attributeValueDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of Germplasm Attribute Value IDs to search for
-     *
-     * @return attributeValueDbIds
-     **/
-    @Schema(example = "[\"ca4636d0\",\"c8a92409\"]", description = "List of Germplasm Attribute Value IDs to search for")
-    public List<String> getAttributeValueDbIds() {
-        return attributeValueDbIds;
-    }
-
-    public void setAttributeValueDbIds(List<String> attributeValueDbIds) {
-        this.attributeValueDbIds = attributeValueDbIds;
-    }
-
-    public GermplasmAttributeValueSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public GermplasmAttributeValueSearchRequest dataTypes(List<DataTypesEnum> dataTypes) {
-        this.dataTypes = dataTypes;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addDataTypesItem(DataTypesEnum dataTypesItem) {
-        if (this.dataTypes == null) {
-            this.dataTypes = new ArrayList<DataTypesEnum>();
-        }
-        this.dataTypes.add(dataTypesItem);
-        return this;
-    }
-
-    /**
-     * List of scale data types to filter search results
-     *
-     * @return dataTypes
-     **/
-    @Schema(example = "[\"Numerical\",\"Ordinal\",\"Text\"]", description = "List of scale data types to filter search results")
-    public List<DataTypesEnum> getDataTypes() {
-        return dataTypes;
-    }
-
-    public void setDataTypes(List<DataTypesEnum> dataTypes) {
-        this.dataTypes = dataTypes;
-    }
-
-    public GermplasmAttributeValueSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public GermplasmAttributeValueSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public GermplasmAttributeValueSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public GermplasmAttributeValueSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public GermplasmAttributeValueSearchRequest germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public GermplasmAttributeValueSearchRequest methodDbIds(List<String> methodDbIds) {
-        this.methodDbIds = methodDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addMethodDbIdsItem(String methodDbIdsItem) {
-        if (this.methodDbIds == null) {
-            this.methodDbIds = new ArrayList<String>();
-        }
-        this.methodDbIds.add(methodDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of methods to filter search results
-     *
-     * @return methodDbIds
-     **/
-    @Schema(example = "[\"07e34f83\",\"d3d5517a\"]", description = "List of methods to filter search results")
-    public List<String> getMethodDbIds() {
-        return methodDbIds;
-    }
-
-    public void setMethodDbIds(List<String> methodDbIds) {
-        this.methodDbIds = methodDbIds;
-    }
-
-    public GermplasmAttributeValueSearchRequest ontologyDbIds(List<String> ontologyDbIds) {
-        this.ontologyDbIds = ontologyDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addOntologyDbIdsItem(String ontologyDbIdsItem) {
-        if (this.ontologyDbIds == null) {
-            this.ontologyDbIds = new ArrayList<String>();
-        }
-        this.ontologyDbIds.add(ontologyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of ontology IDs to search for
-     *
-     * @return ontologyDbIds
-     **/
-    @Schema(example = "[\"f44f7b23\",\"a26b576e\"]", description = "List of ontology IDs to search for")
-    public List<String> getOntologyDbIds() {
-        return ontologyDbIds;
-    }
-
-    public void setOntologyDbIds(List<String> ontologyDbIds) {
-        this.ontologyDbIds = ontologyDbIds;
-    }
-
-    public GermplasmAttributeValueSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public GermplasmAttributeValueSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public GermplasmAttributeValueSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public GermplasmAttributeValueSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public GermplasmAttributeValueSearchRequest scaleDbIds(List<String> scaleDbIds) {
-        this.scaleDbIds = scaleDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addScaleDbIdsItem(String scaleDbIdsItem) {
-        if (this.scaleDbIds == null) {
-            this.scaleDbIds = new ArrayList<String>();
-        }
-        this.scaleDbIds.add(scaleDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of scales to filter search results
-     *
-     * @return scaleDbIds
-     **/
-    @Schema(example = "[\"a13ecffa\",\"7e1afe4f\"]", description = "List of scales to filter search results")
-    public List<String> getScaleDbIds() {
-        return scaleDbIds;
-    }
-
-    public void setScaleDbIds(List<String> scaleDbIds) {
-        this.scaleDbIds = scaleDbIds;
-    }
-
-    public GermplasmAttributeValueSearchRequest traitClasses(List<String> traitClasses) {
-        this.traitClasses = traitClasses;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addTraitClassesItem(String traitClassesItem) {
-        if (this.traitClasses == null) {
-            this.traitClasses = new ArrayList<String>();
-        }
-        this.traitClasses.add(traitClassesItem);
-        return this;
-    }
-
-    /**
-     * List of trait classes to filter search results
-     *
-     * @return traitClasses
-     **/
-    @Schema(example = "[\"morphological\",\"phenological\",\"agronomical\"]", description = "List of trait classes to filter search results")
-    public List<String> getTraitClasses() {
-        return traitClasses;
-    }
-
-    public void setTraitClasses(List<String> traitClasses) {
-        this.traitClasses = traitClasses;
-    }
-
-    public GermplasmAttributeValueSearchRequest traitDbIds(List<String> traitDbIds) {
-        this.traitDbIds = traitDbIds;
-        return this;
-    }
-
-    public GermplasmAttributeValueSearchRequest addTraitDbIdsItem(String traitDbIdsItem) {
-        if (this.traitDbIds == null) {
-            this.traitDbIds = new ArrayList<String>();
-        }
-        this.traitDbIds.add(traitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of trait unique ID to filter search results
-     *
-     * @return traitDbIds
-     **/
-    @Schema(example = "[\"ef81147b\",\"78d82fad\"]", description = "List of trait unique ID to filter search results")
-    public List<String> getTraitDbIds() {
-        return traitDbIds;
-    }
-
-    public void setTraitDbIds(List<String> traitDbIds) {
-        this.traitDbIds = traitDbIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeValueSearchRequest germplasmAttributeValueSearchRequest = (GermplasmAttributeValueSearchRequest) o;
-        return Objects.equals(this.attributeDbIds, germplasmAttributeValueSearchRequest.attributeDbIds) &&
-                Objects.equals(this.attributeNames, germplasmAttributeValueSearchRequest.attributeNames) &&
-                Objects.equals(this.attributeValueDbIds, germplasmAttributeValueSearchRequest.attributeValueDbIds) &&
-                Objects.equals(this.commonCropNames, germplasmAttributeValueSearchRequest.commonCropNames) &&
-                Objects.equals(this.dataTypes, germplasmAttributeValueSearchRequest.dataTypes) &&
-                Objects.equals(this.externalReferenceIDs, germplasmAttributeValueSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, germplasmAttributeValueSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, germplasmAttributeValueSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.germplasmDbIds, germplasmAttributeValueSearchRequest.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, germplasmAttributeValueSearchRequest.germplasmNames) &&
-                Objects.equals(this.methodDbIds, germplasmAttributeValueSearchRequest.methodDbIds) &&
-                Objects.equals(this.ontologyDbIds, germplasmAttributeValueSearchRequest.ontologyDbIds) &&
-                Objects.equals(this.page, germplasmAttributeValueSearchRequest.page) &&
-                Objects.equals(this.pageSize, germplasmAttributeValueSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, germplasmAttributeValueSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, germplasmAttributeValueSearchRequest.programNames) &&
-                Objects.equals(this.scaleDbIds, germplasmAttributeValueSearchRequest.scaleDbIds) &&
-                Objects.equals(this.traitClasses, germplasmAttributeValueSearchRequest.traitClasses) &&
-                Objects.equals(this.traitDbIds, germplasmAttributeValueSearchRequest.traitDbIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(attributeDbIds, attributeNames, attributeValueDbIds, commonCropNames, dataTypes, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds, germplasmNames, methodDbIds, ontologyDbIds, page, pageSize, programDbIds, programNames, scaleDbIds, traitClasses, traitDbIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeValueSearchRequest {\n");
-
-        sb.append("    attributeDbIds: ").append(toIndentedString(attributeDbIds)).append("\n");
-        sb.append("    attributeNames: ").append(toIndentedString(attributeNames)).append("\n");
-        sb.append("    attributeValueDbIds: ").append(toIndentedString(attributeValueDbIds)).append("\n");
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    dataTypes: ").append(toIndentedString(dataTypes)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    methodDbIds: ").append(toIndentedString(methodDbIds)).append("\n");
-        sb.append("    ontologyDbIds: ").append(toIndentedString(ontologyDbIds)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    scaleDbIds: ").append(toIndentedString(scaleDbIds)).append("\n");
-        sb.append("    traitClasses: ").append(toIndentedString(traitClasses)).append("\n");
-        sb.append("    traitDbIds: ").append(toIndentedString(traitDbIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueSingleResponse.java
deleted file mode 100644
index 2003cf29..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmAttributeValueSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * GermplasmAttributeValueSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmAttributeValueSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private GermplasmAttributeValue result = null;
-
-    public GermplasmAttributeValueSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public GermplasmAttributeValueSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public GermplasmAttributeValueSingleResponse result(GermplasmAttributeValue result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public GermplasmAttributeValue getResult() {
-        return result;
-    }
-
-    public void setResult(GermplasmAttributeValue result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmAttributeValueSingleResponse germplasmAttributeValueSingleResponse = (GermplasmAttributeValueSingleResponse) o;
-        return Objects.equals(this._atContext, germplasmAttributeValueSingleResponse._atContext) &&
-                Objects.equals(this.metadata, germplasmAttributeValueSingleResponse.metadata) &&
-                Objects.equals(this.result, germplasmAttributeValueSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmAttributeValueSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmDonors.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmDonors.java
deleted file mode 100644
index da4540d6..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmDonors.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * GermplasmDonors
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmDonors {
-    @SerializedName("donorAccessionNumber")
-    private String donorAccessionNumber = null;
-
-    @SerializedName("donorInstituteCode")
-    private String donorInstituteCode = null;
-
-    public GermplasmDonors donorAccessionNumber(String donorAccessionNumber) {
-        this.donorAccessionNumber = donorAccessionNumber;
-        return this;
-    }
-
-    /**
-     * The accession number assigned by the donor                                MCPD (v2.1) (DONORNUMB) 23. Identifier assigned to an accession by the donor. Follows ACCENUMB standard.
-     *
-     * @return donorAccessionNumber
-     **/
-    @Schema(example = "A0000123", description = "The accession number assigned by the donor                                MCPD (v2.1) (DONORNUMB) 23. Identifier assigned to an accession by the donor. Follows ACCENUMB standard.")
-    public String getDonorAccessionNumber() {
-        return donorAccessionNumber;
-    }
-
-    public void setDonorAccessionNumber(String donorAccessionNumber) {
-        this.donorAccessionNumber = donorAccessionNumber;
-    }
-
-    public GermplasmDonors donorInstituteCode(String donorInstituteCode) {
-        this.donorInstituteCode = donorInstituteCode;
-        return this;
-    }
-
-    /**
-     * The institute code for the donor institute &lt;br/&gt;MCPD (v2.1) (DONORCODE) 22. FAO WIEWS code of the donor institute. Follows INSTCODE standard.
-     *
-     * @return donorInstituteCode
-     **/
-    @Schema(example = "PER001", description = "The institute code for the donor institute <br/>MCPD (v2.1) (DONORCODE) 22. FAO WIEWS code of the donor institute. Follows INSTCODE standard.")
-    public String getDonorInstituteCode() {
-        return donorInstituteCode;
-    }
-
-    public void setDonorInstituteCode(String donorInstituteCode) {
-        this.donorInstituteCode = donorInstituteCode;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmDonors germplasmDonors = (GermplasmDonors) o;
-        return Objects.equals(this.donorAccessionNumber, germplasmDonors.donorAccessionNumber) &&
-                Objects.equals(this.donorInstituteCode, germplasmDonors.donorInstituteCode);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(donorAccessionNumber, donorInstituteCode);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmDonors {\n");
-
-        sb.append("    donorAccessionNumber: ").append(toIndentedString(donorAccessionNumber)).append("\n");
-        sb.append("    donorInstituteCode: ").append(toIndentedString(donorInstituteCode)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmGermplasmOrigin.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmGermplasmOrigin.java
deleted file mode 100644
index 59e7e6ae..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmGermplasmOrigin.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * MIAPPE V1.1 (DM-52)   MIAPPE V1.1 (DM-53)   MIAPPE V1.1 (DM-54)   MIAPPE V1.1 (DM-55)  MCPD (v2.1) (COORDUNCERT) 15.5   MCPD (v2.1) (ELEVATION) 16.   MCPD (v2.1) (GEOREFMETH) 15.7   MCPD (v2.1) (DECLATITUDE) 15.1   MCPD (v2.1) (DECLONGITUDE) 15.3
- */
-@Schema(description = "MIAPPE V1.1 (DM-52)   MIAPPE V1.1 (DM-53)   MIAPPE V1.1 (DM-54)   MIAPPE V1.1 (DM-55)  MCPD (v2.1) (COORDUNCERT) 15.5   MCPD (v2.1) (ELEVATION) 16.   MCPD (v2.1) (GEOREFMETH) 15.7   MCPD (v2.1) (DECLATITUDE) 15.1   MCPD (v2.1) (DECLONGITUDE) 15.3 ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmGermplasmOrigin {
-    @SerializedName("coordinateUncertainty")
-    private String coordinateUncertainty = null;
-
-    @SerializedName("coordinates")
-    private GeoJSON coordinates = null;
-
-    public GermplasmGermplasmOrigin coordinateUncertainty(String coordinateUncertainty) {
-        this.coordinateUncertainty = coordinateUncertainty;
-        return this;
-    }
-
-    /**
-     * Uncertainty associated with the coordinates in meters. Leave the value empty if the uncertainty is unknown.
-     *
-     * @return coordinateUncertainty
-     **/
-    @Schema(example = "20", description = "Uncertainty associated with the coordinates in meters. Leave the value empty if the uncertainty is unknown.")
-    public String getCoordinateUncertainty() {
-        return coordinateUncertainty;
-    }
-
-    public void setCoordinateUncertainty(String coordinateUncertainty) {
-        this.coordinateUncertainty = coordinateUncertainty;
-    }
-
-    public GermplasmGermplasmOrigin coordinates(GeoJSON coordinates) {
-        this.coordinates = coordinates;
-        return this;
-    }
-
-    /**
-     * Get coordinates
-     *
-     * @return coordinates
-     **/
-    @Schema(description = "")
-    public GeoJSON getCoordinates() {
-        return coordinates;
-    }
-
-    public void setCoordinates(GeoJSON coordinates) {
-        this.coordinates = coordinates;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmGermplasmOrigin germplasmGermplasmOrigin = (GermplasmGermplasmOrigin) o;
-        return Objects.equals(this.coordinateUncertainty, germplasmGermplasmOrigin.coordinateUncertainty) &&
-                Objects.equals(this.coordinates, germplasmGermplasmOrigin.coordinates);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(coordinateUncertainty, coordinates);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmGermplasmOrigin {\n");
-
-        sb.append("    coordinateUncertainty: ").append(toIndentedString(coordinateUncertainty)).append("\n");
-        sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmListResponse.java
deleted file mode 100644
index 19ff9b8b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * GermplasmListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private GermplasmListResponseResult result = null;
-
-    public GermplasmListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public GermplasmListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public GermplasmListResponse result(GermplasmListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public GermplasmListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(GermplasmListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmListResponse germplasmListResponse = (GermplasmListResponse) o;
-        return Objects.equals(this._atContext, germplasmListResponse._atContext) &&
-                Objects.equals(this.metadata, germplasmListResponse.metadata) &&
-                Objects.equals(this.result, germplasmListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmListResponseResult.java
deleted file mode 100644
index b2091c91..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * GermplasmListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmListResponseResult {
-    @SerializedName("data")
-    private List<Germplasm> data = new ArrayList<Germplasm>();
-
-    public GermplasmListResponseResult data(List<Germplasm> data) {
-        this.data = data;
-        return this;
-    }
-
-    public GermplasmListResponseResult addDataItem(Germplasm dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Germplasm> getData() {
-        return data;
-    }
-
-    public void setData(List<Germplasm> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmListResponseResult germplasmListResponseResult = (GermplasmListResponseResult) o;
-        return Objects.equals(this.data, germplasmListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPD.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPD.java
deleted file mode 100644
index 676456cd..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPD.java
+++ /dev/null
@@ -1,920 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.LocalDate;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * GermplasmMCPD
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmMCPD {
-    @SerializedName("accessionNames")
-    private List<String> accessionNames = null;
-
-    @SerializedName("accessionNumber")
-    private String accessionNumber = null;
-
-    @SerializedName("acquisitionDate")
-    private LocalDate acquisitionDate = null;
-
-    /**
-     * MCPD (v2.1) (COLLSRC) 21. The coding scheme proposed can be used at 2 different levels of detail: either by using the general codes (in bold-face) such as 10, 20, 30, 40, etc., or by using the more specific codes, such as 11, 12, etc.   10) Wild habitat  11) Forest or woodland  12) Shrubland  13) Grassland  14) Desert or tundra  15) Aquatic habitat  20) Farm or cultivated habitat  21) Field  22) Orchard  23) Backyard, kitchen or home garden (urban, peri-urban or rural)  24) Fallow land  25) Pasture  26) Farm store  27) Threshing floor  28) Park  30) Market or shop  40) Institute, Experimental station, Research organization, Genebank  50) Seed company  60) Weedy, disturbed or ruderal habitat  61) Roadside  62) Field margin  99) Other (Elaborate in REMARKS field)
-     */
-    @JsonAdapter(AcquisitionSourceCodeEnum.Adapter.class)
-    public enum AcquisitionSourceCodeEnum {
-        _10("10"),
-        _11("11"),
-        _12("12"),
-        _13("13"),
-        _14("14"),
-        _15("15"),
-        _20("20"),
-        _21("21"),
-        _22("22"),
-        _23("23"),
-        _24("24"),
-        _25("25"),
-        _26("26"),
-        _27("27"),
-        _28("28"),
-        _30("30"),
-        _40("40"),
-        _50("50"),
-        _60("60"),
-        _61("61"),
-        _62("62"),
-        _99("99");
-
-        private String value;
-
-        AcquisitionSourceCodeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static AcquisitionSourceCodeEnum fromValue(String input) {
-            for (AcquisitionSourceCodeEnum b : AcquisitionSourceCodeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<AcquisitionSourceCodeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final AcquisitionSourceCodeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public AcquisitionSourceCodeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return AcquisitionSourceCodeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("acquisitionSourceCode")
-    private AcquisitionSourceCodeEnum acquisitionSourceCode = null;
-
-    @SerializedName("alternateIDs")
-    private List<String> alternateIDs = null;
-
-    @SerializedName("ancestralData")
-    private String ancestralData = null;
-
-    /**
-     * MCPD (v2.1) (SAMPSTAT) 19. The coding scheme proposed can be used at 3 different levels of detail: either by using the general codes such as 100, 200, 300, 400, or by using the more specific codes such as 110, 120, etc.   100) Wild  110) Natural  120) Semi-natural/wild  130) Semi-natural/sown  200) Weedy  300) Traditional cultivar/landrace  400) Breeding/research material  410) Breeders line  411) Synthetic population  412) Hybrid  413) Founder stock/base population  414) Inbred line (parent of hybrid cultivar)  415) Segregating population  416) Clonal selection  420) Genetic stock  421) Mutant (e.g. induced/insertion mutants, tilling populations)  422) Cytogenetic stocks (e.g. chromosome addition/substitution, aneuploids,  amphiploids)  423) Other genetic stocks (e.g. mapping populations)  500) Advanced or improved cultivar (conventional breeding methods)  600) GMO (by genetic engineering)  999) Other (Elaborate in REMARKS field)
-     */
-    @JsonAdapter(BiologicalStatusOfAccessionCodeEnum.Adapter.class)
-    public enum BiologicalStatusOfAccessionCodeEnum {
-        _100("100"),
-        _110("110"),
-        _120("120"),
-        _130("130"),
-        _200("200"),
-        _300("300"),
-        _400("400"),
-        _410("410"),
-        _411("411"),
-        _412("412"),
-        _413("413"),
-        _414("414"),
-        _415("415"),
-        _416("416"),
-        _420("420"),
-        _421("421"),
-        _422("422"),
-        _423("423"),
-        _500("500"),
-        _600("600"),
-        _999("999");
-
-        private String value;
-
-        BiologicalStatusOfAccessionCodeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static BiologicalStatusOfAccessionCodeEnum fromValue(String input) {
-            for (BiologicalStatusOfAccessionCodeEnum b : BiologicalStatusOfAccessionCodeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<BiologicalStatusOfAccessionCodeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final BiologicalStatusOfAccessionCodeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public BiologicalStatusOfAccessionCodeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return BiologicalStatusOfAccessionCodeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("biologicalStatusOfAccessionCode")
-    private BiologicalStatusOfAccessionCodeEnum biologicalStatusOfAccessionCode = null;
-
-    @SerializedName("breedingInstitutes")
-    private List<GermplasmMCPDBreedingInstitutes> breedingInstitutes = null;
-
-    @SerializedName("collectingInfo")
-    private GermplasmMCPDCollectingInfo collectingInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("countryOfOrigin")
-    private String countryOfOrigin = null;
-
-    @SerializedName("donorInfo")
-    private GermplasmMCPDDonorInfo donorInfo = null;
-
-    @SerializedName("genus")
-    private String genus = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmPUI")
-    private String germplasmPUI = null;
-
-    @SerializedName("instituteCode")
-    private String instituteCode = null;
-
-    /**
-     * MCPD (v2.1) (MLSSTAT) 27. The status of an accession with regards to the Multilateral System (MLS) of the International Treaty on Plant Genetic Resources for Food and Agriculture. Leave the value empty if the status is not known 0 No (not included) 1 Yes (included) 99 Other (elaborate in REMARKS field, e.g. \&quot;under development\&quot;)
-     */
-    @JsonAdapter(MlsStatusEnum.Adapter.class)
-    public enum MlsStatusEnum {
-        EMPTY(""),
-        _0("0"),
-        _1("1"),
-        _99("99");
-
-        private String value;
-
-        MlsStatusEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static MlsStatusEnum fromValue(String input) {
-            for (MlsStatusEnum b : MlsStatusEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<MlsStatusEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final MlsStatusEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public MlsStatusEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return MlsStatusEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("mlsStatus")
-    private MlsStatusEnum mlsStatus = null;
-
-    @SerializedName("remarks")
-    private String remarks = null;
-
-    @SerializedName("safetyDuplicateInstitutes")
-    private List<GermplasmMCPDSafetyDuplicateInstitutes> safetyDuplicateInstitutes = null;
-
-    @SerializedName("species")
-    private String species = null;
-
-    @SerializedName("speciesAuthority")
-    private String speciesAuthority = null;
-
-    /**
-     * Gets or Sets storageTypeCodes
-     */
-    @JsonAdapter(StorageTypeCodesEnum.Adapter.class)
-    public enum StorageTypeCodesEnum {
-        _10("10"),
-        _11("11"),
-        _12("12"),
-        _13("13"),
-        _20("20"),
-        _30("30"),
-        _40("40"),
-        _50("50"),
-        _99("99");
-
-        private String value;
-
-        StorageTypeCodesEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static StorageTypeCodesEnum fromValue(String input) {
-            for (StorageTypeCodesEnum b : StorageTypeCodesEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<StorageTypeCodesEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final StorageTypeCodesEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public StorageTypeCodesEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return StorageTypeCodesEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("storageTypeCodes")
-    private List<StorageTypeCodesEnum> storageTypeCodes = null;
-
-    @SerializedName("subtaxon")
-    private String subtaxon = null;
-
-    @SerializedName("subtaxonAuthority")
-    private String subtaxonAuthority = null;
-
-    public GermplasmMCPD accessionNames(List<String> accessionNames) {
-        this.accessionNames = accessionNames;
-        return this;
-    }
-
-    public GermplasmMCPD addAccessionNamesItem(String accessionNamesItem) {
-        if (this.accessionNames == null) {
-            this.accessionNames = new ArrayList<String>();
-        }
-        this.accessionNames.add(accessionNamesItem);
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (ACCENAME) 11. A collection of either a registered names or other designations given to the material received, other than the donors accession number (23) or collecting number (3). First letter uppercase.
-     *
-     * @return accessionNames
-     **/
-    @Schema(example = "[\"Symphony\",\"Emma\"]", description = "MCPD (v2.1) (ACCENAME) 11. A collection of either a registered names or other designations given to the material received, other than the donors accession number (23) or collecting number (3). First letter uppercase.")
-    public List<String> getAccessionNames() {
-        return accessionNames;
-    }
-
-    public void setAccessionNames(List<String> accessionNames) {
-        this.accessionNames = accessionNames;
-    }
-
-    public GermplasmMCPD accessionNumber(String accessionNumber) {
-        this.accessionNumber = accessionNumber;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a material or germplasm within a genebank  MCPD (v2.1) (ACCENUMB) 2. This is the unique identifier for accessions within a genebank, and is assigned when a sample is entered into the genebank collection (e.g. \&quot;PI 113869\&quot;).
-     *
-     * @return accessionNumber
-     **/
-    @Schema(example = "A0000003", description = "The unique identifier for a material or germplasm within a genebank  MCPD (v2.1) (ACCENUMB) 2. This is the unique identifier for accessions within a genebank, and is assigned when a sample is entered into the genebank collection (e.g. \"PI 113869\").")
-    public String getAccessionNumber() {
-        return accessionNumber;
-    }
-
-    public void setAccessionNumber(String accessionNumber) {
-        this.accessionNumber = accessionNumber;
-    }
-
-    public GermplasmMCPD acquisitionDate(LocalDate acquisitionDate) {
-        this.acquisitionDate = acquisitionDate;
-        return this;
-    }
-
-    /**
-     * The date a material or germplasm was acquired by the genebank   MCPD (v2.1) (ACQDATE) 12. Date on which the accession entered the collection [YYYYMMDD] where YYYY is the year, MM is the month and DD is the day. Missing data (MM or DD) should be indicated with hyphens or \&quot;00\&quot; [double zero].
-     *
-     * @return acquisitionDate
-     **/
-    @Schema(description = "The date a material or germplasm was acquired by the genebank   MCPD (v2.1) (ACQDATE) 12. Date on which the accession entered the collection [YYYYMMDD] where YYYY is the year, MM is the month and DD is the day. Missing data (MM or DD) should be indicated with hyphens or \"00\" [double zero].")
-    public LocalDate getAcquisitionDate() {
-        return acquisitionDate;
-    }
-
-    public void setAcquisitionDate(LocalDate acquisitionDate) {
-        this.acquisitionDate = acquisitionDate;
-    }
-
-    public GermplasmMCPD acquisitionSourceCode(AcquisitionSourceCodeEnum acquisitionSourceCode) {
-        this.acquisitionSourceCode = acquisitionSourceCode;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (COLLSRC) 21. The coding scheme proposed can be used at 2 different levels of detail: either by using the general codes (in bold-face) such as 10, 20, 30, 40, etc., or by using the more specific codes, such as 11, 12, etc.   10) Wild habitat  11) Forest or woodland  12) Shrubland  13) Grassland  14) Desert or tundra  15) Aquatic habitat  20) Farm or cultivated habitat  21) Field  22) Orchard  23) Backyard, kitchen or home garden (urban, peri-urban or rural)  24) Fallow land  25) Pasture  26) Farm store  27) Threshing floor  28) Park  30) Market or shop  40) Institute, Experimental station, Research organization, Genebank  50) Seed company  60) Weedy, disturbed or ruderal habitat  61) Roadside  62) Field margin  99) Other (Elaborate in REMARKS field)
-     *
-     * @return acquisitionSourceCode
-     **/
-    @Schema(example = "26", description = "MCPD (v2.1) (COLLSRC) 21. The coding scheme proposed can be used at 2 different levels of detail: either by using the general codes (in bold-face) such as 10, 20, 30, 40, etc., or by using the more specific codes, such as 11, 12, etc.   10) Wild habitat  11) Forest or woodland  12) Shrubland  13) Grassland  14) Desert or tundra  15) Aquatic habitat  20) Farm or cultivated habitat  21) Field  22) Orchard  23) Backyard, kitchen or home garden (urban, peri-urban or rural)  24) Fallow land  25) Pasture  26) Farm store  27) Threshing floor  28) Park  30) Market or shop  40) Institute, Experimental station, Research organization, Genebank  50) Seed company  60) Weedy, disturbed or ruderal habitat  61) Roadside  62) Field margin  99) Other (Elaborate in REMARKS field)")
-    public AcquisitionSourceCodeEnum getAcquisitionSourceCode() {
-        return acquisitionSourceCode;
-    }
-
-    public void setAcquisitionSourceCode(AcquisitionSourceCodeEnum acquisitionSourceCode) {
-        this.acquisitionSourceCode = acquisitionSourceCode;
-    }
-
-    public GermplasmMCPD alternateIDs(List<String> alternateIDs) {
-        this.alternateIDs = alternateIDs;
-        return this;
-    }
-
-    public GermplasmMCPD addAlternateIDsItem(String alternateIDsItem) {
-        if (this.alternateIDs == null) {
-            this.alternateIDs = new ArrayList<String>();
-        }
-        this.alternateIDs.add(alternateIDsItem);
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (OTHERNUMB) 24. Any other identifiers known to exist in other collections for this accession. Use the following format: INSTCODE:ACCENUMB;INSTCODE:identifier;INSTCODE and identifier are separated by a colon without space. Pairs of INSTCODE and identifier are separated by a semicolon without space. When the institute is not known, the identifier should be preceded by a colon.
-     *
-     * @return alternateIDs
-     **/
-    @Schema(example = "[\"PER001:3\",\"PER001:http://pui.per/accession/A0000003\",\"USA001:A0000003\"]", description = "MCPD (v2.1) (OTHERNUMB) 24. Any other identifiers known to exist in other collections for this accession. Use the following format: INSTCODE:ACCENUMB;INSTCODE:identifier;INSTCODE and identifier are separated by a colon without space. Pairs of INSTCODE and identifier are separated by a semicolon without space. When the institute is not known, the identifier should be preceded by a colon. ")
-    public List<String> getAlternateIDs() {
-        return alternateIDs;
-    }
-
-    public void setAlternateIDs(List<String> alternateIDs) {
-        this.alternateIDs = alternateIDs;
-    }
-
-    public GermplasmMCPD ancestralData(String ancestralData) {
-        this.ancestralData = ancestralData;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (ANCEST) 20. Information about either pedigree or other description of ancestral information (e.g. parent variety in case of mutant or selection). For example a pedigree &#x27;Hanna/7*Atlas//Turk/8*Atlas&#x27; or a description &#x27;mutation found in Hanna&#x27;, &#x27;selection from Irene&#x27; or &#x27;cross involving amongst others Hanna and Irene&#x27;.
-     *
-     * @return ancestralData
-     **/
-    @Schema(example = "A0000001/A0000002", description = "MCPD (v2.1) (ANCEST) 20. Information about either pedigree or other description of ancestral information (e.g. parent variety in case of mutant or selection). For example a pedigree 'Hanna/7*Atlas//Turk/8*Atlas' or a description 'mutation found in Hanna', 'selection from Irene' or 'cross involving amongst others Hanna and Irene'.")
-    public String getAncestralData() {
-        return ancestralData;
-    }
-
-    public void setAncestralData(String ancestralData) {
-        this.ancestralData = ancestralData;
-    }
-
-    public GermplasmMCPD biologicalStatusOfAccessionCode(BiologicalStatusOfAccessionCodeEnum biologicalStatusOfAccessionCode) {
-        this.biologicalStatusOfAccessionCode = biologicalStatusOfAccessionCode;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (SAMPSTAT) 19. The coding scheme proposed can be used at 3 different levels of detail: either by using the general codes such as 100, 200, 300, 400, or by using the more specific codes such as 110, 120, etc.   100) Wild  110) Natural  120) Semi-natural/wild  130) Semi-natural/sown  200) Weedy  300) Traditional cultivar/landrace  400) Breeding/research material  410) Breeders line  411) Synthetic population  412) Hybrid  413) Founder stock/base population  414) Inbred line (parent of hybrid cultivar)  415) Segregating population  416) Clonal selection  420) Genetic stock  421) Mutant (e.g. induced/insertion mutants, tilling populations)  422) Cytogenetic stocks (e.g. chromosome addition/substitution, aneuploids,  amphiploids)  423) Other genetic stocks (e.g. mapping populations)  500) Advanced or improved cultivar (conventional breeding methods)  600) GMO (by genetic engineering)  999) Other (Elaborate in REMARKS field)
-     *
-     * @return biologicalStatusOfAccessionCode
-     **/
-    @Schema(example = "421", description = "MCPD (v2.1) (SAMPSTAT) 19. The coding scheme proposed can be used at 3 different levels of detail: either by using the general codes such as 100, 200, 300, 400, or by using the more specific codes such as 110, 120, etc.   100) Wild  110) Natural  120) Semi-natural/wild  130) Semi-natural/sown  200) Weedy  300) Traditional cultivar/landrace  400) Breeding/research material  410) Breeders line  411) Synthetic population  412) Hybrid  413) Founder stock/base population  414) Inbred line (parent of hybrid cultivar)  415) Segregating population  416) Clonal selection  420) Genetic stock  421) Mutant (e.g. induced/insertion mutants, tilling populations)  422) Cytogenetic stocks (e.g. chromosome addition/substitution, aneuploids,  amphiploids)  423) Other genetic stocks (e.g. mapping populations)  500) Advanced or improved cultivar (conventional breeding methods)  600) GMO (by genetic engineering)  999) Other (Elaborate in REMARKS field)")
-    public BiologicalStatusOfAccessionCodeEnum getBiologicalStatusOfAccessionCode() {
-        return biologicalStatusOfAccessionCode;
-    }
-
-    public void setBiologicalStatusOfAccessionCode(BiologicalStatusOfAccessionCodeEnum biologicalStatusOfAccessionCode) {
-        this.biologicalStatusOfAccessionCode = biologicalStatusOfAccessionCode;
-    }
-
-    public GermplasmMCPD breedingInstitutes(List<GermplasmMCPDBreedingInstitutes> breedingInstitutes) {
-        this.breedingInstitutes = breedingInstitutes;
-        return this;
-    }
-
-    public GermplasmMCPD addBreedingInstitutesItem(GermplasmMCPDBreedingInstitutes breedingInstitutesItem) {
-        if (this.breedingInstitutes == null) {
-            this.breedingInstitutes = new ArrayList<GermplasmMCPDBreedingInstitutes>();
-        }
-        this.breedingInstitutes.add(breedingInstitutesItem);
-        return this;
-    }
-
-    /**
-     * A list of institutes that were involved with breeding a material/germplasm &lt;br&gt; MCPD (v2.1) (BREDCODE) 18. FAO WIEWS code of the institute that has bred the material. If the holding institute has bred the material, the breeding institute code (BREDCODE) should be the same as the holding institute code (INSTCODE). Follows INSTCODE standard. &lt;br&gt; MCPD (v2.1) (BREDNAME) 18.1  Name of the institute (or person) that bred the material. This descriptor should be used only if BREDCODE can not be filled because the FAO WIEWS code for this institute is not available.
-     *
-     * @return breedingInstitutes
-     **/
-    @Schema(description = "A list of institutes that were involved with breeding a material/germplasm <br> MCPD (v2.1) (BREDCODE) 18. FAO WIEWS code of the institute that has bred the material. If the holding institute has bred the material, the breeding institute code (BREDCODE) should be the same as the holding institute code (INSTCODE). Follows INSTCODE standard. <br> MCPD (v2.1) (BREDNAME) 18.1  Name of the institute (or person) that bred the material. This descriptor should be used only if BREDCODE can not be filled because the FAO WIEWS code for this institute is not available.")
-    public List<GermplasmMCPDBreedingInstitutes> getBreedingInstitutes() {
-        return breedingInstitutes;
-    }
-
-    public void setBreedingInstitutes(List<GermplasmMCPDBreedingInstitutes> breedingInstitutes) {
-        this.breedingInstitutes = breedingInstitutes;
-    }
-
-    public GermplasmMCPD collectingInfo(GermplasmMCPDCollectingInfo collectingInfo) {
-        this.collectingInfo = collectingInfo;
-        return this;
-    }
-
-    /**
-     * Get collectingInfo
-     *
-     * @return collectingInfo
-     **/
-    @Schema(description = "")
-    public GermplasmMCPDCollectingInfo getCollectingInfo() {
-        return collectingInfo;
-    }
-
-    public void setCollectingInfo(GermplasmMCPDCollectingInfo collectingInfo) {
-        this.collectingInfo = collectingInfo;
-    }
-
-    public GermplasmMCPD commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (CROPNAME) 10. Common name of the crop. Example: \&quot;malting barley\&quot;, \&quot;mas\&quot;.
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "malting barley", description = "MCPD (v2.1) (CROPNAME) 10. Common name of the crop. Example: \"malting barley\", \"mas\". ")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public GermplasmMCPD countryOfOrigin(String countryOfOrigin) {
-        this.countryOfOrigin = countryOfOrigin;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (ORIGCTY) 13. 3-letter ISO 3166-1 code of the country in which the sample was originally collected (e.g. landrace, crop wild relative, farmers\&quot; variety), bred or selected (breeding lines, GMOs, segregating populations, hybrids, modern cultivars, etc.). Note: Descriptors 14 to 16 below should be completed accordingly only if it was \&quot;collected\&quot;.
-     *
-     * @return countryOfOrigin
-     **/
-    @Schema(example = "Peru", description = "MCPD (v2.1) (ORIGCTY) 13. 3-letter ISO 3166-1 code of the country in which the sample was originally collected (e.g. landrace, crop wild relative, farmers\" variety), bred or selected (breeding lines, GMOs, segregating populations, hybrids, modern cultivars, etc.). Note: Descriptors 14 to 16 below should be completed accordingly only if it was \"collected\".")
-    public String getCountryOfOrigin() {
-        return countryOfOrigin;
-    }
-
-    public void setCountryOfOrigin(String countryOfOrigin) {
-        this.countryOfOrigin = countryOfOrigin;
-    }
-
-    public GermplasmMCPD donorInfo(GermplasmMCPDDonorInfo donorInfo) {
-        this.donorInfo = donorInfo;
-        return this;
-    }
-
-    /**
-     * Get donorInfo
-     *
-     * @return donorInfo
-     **/
-    @Schema(description = "")
-    public GermplasmMCPDDonorInfo getDonorInfo() {
-        return donorInfo;
-    }
-
-    public void setDonorInfo(GermplasmMCPDDonorInfo donorInfo) {
-        this.donorInfo = donorInfo;
-    }
-
-    public GermplasmMCPD genus(String genus) {
-        this.genus = genus;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (GENUS) 5. Genus name for taxon. Initial uppercase letter required.
-     *
-     * @return genus
-     **/
-    @Schema(example = "Aspergillus", description = "MCPD (v2.1) (GENUS) 5. Genus name for taxon. Initial uppercase letter required.")
-    public String getGenus() {
-        return genus;
-    }
-
-    public void setGenus(String genus) {
-        this.genus = genus;
-    }
-
-    public GermplasmMCPD germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * A unique identifier which identifies a germplasm in this database
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "31c4efbc", description = "A unique identifier which identifies a germplasm in this database")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public GermplasmMCPD germplasmPUI(String germplasmPUI) {
-        this.germplasmPUI = germplasmPUI;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (PUID) 0. Any persistent, unique identifier assigned to the accession so it can be unambiguously referenced at the global level and the information associated with it harvested through automated means. Report one PUID for each accession. The Secretariat of the International Treaty on Plant Genetic Resources for Food and Agriculture (PGRFA) is facilitating the assignment of a persistent unique identifier (PUID), in the form of a DOI, to PGRFA at the accession level. Genebanks not applying a true PUID to their accessions should use, and request recipients to use, the concatenation of INSTCODE, ACCENUMB, and GENUS as a globally unique identifier similar in most respects to the PUID whenever they exchange information on accessions with third parties.
-     *
-     * @return germplasmPUI
-     **/
-    @Schema(example = "http://pui.per/accession/A0403652", description = "MCPD (v2.1) (PUID) 0. Any persistent, unique identifier assigned to the accession so it can be unambiguously referenced at the global level and the information associated with it harvested through automated means. Report one PUID for each accession. The Secretariat of the International Treaty on Plant Genetic Resources for Food and Agriculture (PGRFA) is facilitating the assignment of a persistent unique identifier (PUID), in the form of a DOI, to PGRFA at the accession level. Genebanks not applying a true PUID to their accessions should use, and request recipients to use, the concatenation of INSTCODE, ACCENUMB, and GENUS as a globally unique identifier similar in most respects to the PUID whenever they exchange information on accessions with third parties.")
-    public String getGermplasmPUI() {
-        return germplasmPUI;
-    }
-
-    public void setGermplasmPUI(String germplasmPUI) {
-        this.germplasmPUI = germplasmPUI;
-    }
-
-    public GermplasmMCPD instituteCode(String instituteCode) {
-        this.instituteCode = instituteCode;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (INSTCODE) 1. FAO WIEWS code of the institute where the accession is maintained. The codes consist of the 3-letter ISO 3166 country code of the country where the institute is located plus a number (e.g. PER001). The current set of institute codes is available from http://www.fao.org/wiews. For those institutes not yet having an FAO Code, or for those with \&quot;obsolete\&quot; codes, see \&quot;Common formatting rules (v)\&quot;.
-     *
-     * @return instituteCode
-     **/
-    @Schema(example = "PER001", description = "MCPD (v2.1) (INSTCODE) 1. FAO WIEWS code of the institute where the accession is maintained. The codes consist of the 3-letter ISO 3166 country code of the country where the institute is located plus a number (e.g. PER001). The current set of institute codes is available from http://www.fao.org/wiews. For those institutes not yet having an FAO Code, or for those with \"obsolete\" codes, see \"Common formatting rules (v)\".")
-    public String getInstituteCode() {
-        return instituteCode;
-    }
-
-    public void setInstituteCode(String instituteCode) {
-        this.instituteCode = instituteCode;
-    }
-
-    public GermplasmMCPD mlsStatus(MlsStatusEnum mlsStatus) {
-        this.mlsStatus = mlsStatus;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (MLSSTAT) 27. The status of an accession with regards to the Multilateral System (MLS) of the International Treaty on Plant Genetic Resources for Food and Agriculture. Leave the value empty if the status is not known 0 No (not included) 1 Yes (included) 99 Other (elaborate in REMARKS field, e.g. \&quot;under development\&quot;)
-     *
-     * @return mlsStatus
-     **/
-    @Schema(example = "0", description = "MCPD (v2.1) (MLSSTAT) 27. The status of an accession with regards to the Multilateral System (MLS) of the International Treaty on Plant Genetic Resources for Food and Agriculture. Leave the value empty if the status is not known 0 No (not included) 1 Yes (included) 99 Other (elaborate in REMARKS field, e.g. \"under development\")")
-    public MlsStatusEnum getMlsStatus() {
-        return mlsStatus;
-    }
-
-    public void setMlsStatus(MlsStatusEnum mlsStatus) {
-        this.mlsStatus = mlsStatus;
-    }
-
-    public GermplasmMCPD remarks(String remarks) {
-        this.remarks = remarks;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (REMARKS) 28. The remarks field is used to add notes or to elaborate on descriptors with value 99 or 999 (&#x3D; Other). Prefix remarks with the field name they refer to and a colon (:) without space (e.g. COLLSRC:riverside). Distinct remarks referring to different fields are separated by semi-colons without space.
-     *
-     * @return remarks
-     **/
-    @Schema(example = "This is an example remark to demonstrate that any notable information can be put here", description = "MCPD (v2.1) (REMARKS) 28. The remarks field is used to add notes or to elaborate on descriptors with value 99 or 999 (= Other). Prefix remarks with the field name they refer to and a colon (:) without space (e.g. COLLSRC:riverside). Distinct remarks referring to different fields are separated by semi-colons without space.")
-    public String getRemarks() {
-        return remarks;
-    }
-
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
-
-    public GermplasmMCPD safetyDuplicateInstitutes(List<GermplasmMCPDSafetyDuplicateInstitutes> safetyDuplicateInstitutes) {
-        this.safetyDuplicateInstitutes = safetyDuplicateInstitutes;
-        return this;
-    }
-
-    public GermplasmMCPD addSafetyDuplicateInstitutesItem(GermplasmMCPDSafetyDuplicateInstitutes safetyDuplicateInstitutesItem) {
-        if (this.safetyDuplicateInstitutes == null) {
-            this.safetyDuplicateInstitutes = new ArrayList<GermplasmMCPDSafetyDuplicateInstitutes>();
-        }
-        this.safetyDuplicateInstitutes.add(safetyDuplicateInstitutesItem);
-        return this;
-    }
-
-    /**
-     * Get safetyDuplicateInstitutes
-     *
-     * @return safetyDuplicateInstitutes
-     **/
-    @Schema(description = "")
-    public List<GermplasmMCPDSafetyDuplicateInstitutes> getSafetyDuplicateInstitutes() {
-        return safetyDuplicateInstitutes;
-    }
-
-    public void setSafetyDuplicateInstitutes(List<GermplasmMCPDSafetyDuplicateInstitutes> safetyDuplicateInstitutes) {
-        this.safetyDuplicateInstitutes = safetyDuplicateInstitutes;
-    }
-
-    public GermplasmMCPD species(String species) {
-        this.species = species;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (SPECIES) 6. Specific epithet portion of the scientific name in lowercase letters. Only the following abbreviation is allowed: \&quot;sp.\&quot;
-     *
-     * @return species
-     **/
-    @Schema(example = "fructus", description = "MCPD (v2.1) (SPECIES) 6. Specific epithet portion of the scientific name in lowercase letters. Only the following abbreviation is allowed: \"sp.\" ")
-    public String getSpecies() {
-        return species;
-    }
-
-    public void setSpecies(String species) {
-        this.species = species;
-    }
-
-    public GermplasmMCPD speciesAuthority(String speciesAuthority) {
-        this.speciesAuthority = speciesAuthority;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (SPAUTHOR) 7. Provide the authority for the species name.
-     *
-     * @return speciesAuthority
-     **/
-    @Schema(example = "Smith, 1822", description = "MCPD (v2.1) (SPAUTHOR) 7. Provide the authority for the species name.")
-    public String getSpeciesAuthority() {
-        return speciesAuthority;
-    }
-
-    public void setSpeciesAuthority(String speciesAuthority) {
-        this.speciesAuthority = speciesAuthority;
-    }
-
-    public GermplasmMCPD storageTypeCodes(List<StorageTypeCodesEnum> storageTypeCodes) {
-        this.storageTypeCodes = storageTypeCodes;
-        return this;
-    }
-
-    public GermplasmMCPD addStorageTypeCodesItem(StorageTypeCodesEnum storageTypeCodesItem) {
-        if (this.storageTypeCodes == null) {
-            this.storageTypeCodes = new ArrayList<StorageTypeCodesEnum>();
-        }
-        this.storageTypeCodes.add(storageTypeCodesItem);
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (STORAGE) 26. If germplasm is maintained under different types of storage, multiple choices are allowed, separated by a semicolon (e.g. 20;30). (Refer to FAO/IPGRI Genebank Standards 1994 for details on storage type.) 10) Seed collection 11) Short term 12) Medium term 13) Long term 20) Field collection 30) In vitro collection 40) Cryo-preserved collection 50) DNA collection 99) Other (elaborate in REMARKS field)
-     *
-     * @return storageTypeCodes
-     **/
-    @Schema(example = "[\"11\",\"13\"]", description = "MCPD (v2.1) (STORAGE) 26. If germplasm is maintained under different types of storage, multiple choices are allowed, separated by a semicolon (e.g. 20;30). (Refer to FAO/IPGRI Genebank Standards 1994 for details on storage type.) 10) Seed collection 11) Short term 12) Medium term 13) Long term 20) Field collection 30) In vitro collection 40) Cryo-preserved collection 50) DNA collection 99) Other (elaborate in REMARKS field)")
-    public List<StorageTypeCodesEnum> getStorageTypeCodes() {
-        return storageTypeCodes;
-    }
-
-    public void setStorageTypeCodes(List<StorageTypeCodesEnum> storageTypeCodes) {
-        this.storageTypeCodes = storageTypeCodes;
-    }
-
-    public GermplasmMCPD subtaxon(String subtaxon) {
-        this.subtaxon = subtaxon;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (SUBTAXA) 8. Subtaxon can be used to store any additional taxonomic identifier. The following abbreviations are allowed: \&quot;subsp.\&quot; (for subspecies); \&quot;convar.\&quot; (for convariety); \&quot;var.\&quot; (for variety); \&quot;f.\&quot; (for form); \&quot;Group\&quot; (for \&quot;cultivar group\&quot;).
-     *
-     * @return subtaxon
-     **/
-    @Schema(example = "Aspergillus fructus A", description = "MCPD (v2.1) (SUBTAXA) 8. Subtaxon can be used to store any additional taxonomic identifier. The following abbreviations are allowed: \"subsp.\" (for subspecies); \"convar.\" (for convariety); \"var.\" (for variety); \"f.\" (for form); \"Group\" (for \"cultivar group\").")
-    public String getSubtaxon() {
-        return subtaxon;
-    }
-
-    public void setSubtaxon(String subtaxon) {
-        this.subtaxon = subtaxon;
-    }
-
-    public GermplasmMCPD subtaxonAuthority(String subtaxonAuthority) {
-        this.subtaxonAuthority = subtaxonAuthority;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (SUBTAUTHOR) 9. Provide the subtaxon authority at the most detailed taxonomic level.
-     *
-     * @return subtaxonAuthority
-     **/
-    @Schema(example = "Smith, 1822", description = "MCPD (v2.1) (SUBTAUTHOR) 9. Provide the subtaxon authority at the most detailed taxonomic level.")
-    public String getSubtaxonAuthority() {
-        return subtaxonAuthority;
-    }
-
-    public void setSubtaxonAuthority(String subtaxonAuthority) {
-        this.subtaxonAuthority = subtaxonAuthority;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmMCPD germplasmMCPD = (GermplasmMCPD) o;
-        return Objects.equals(this.accessionNames, germplasmMCPD.accessionNames) &&
-                Objects.equals(this.accessionNumber, germplasmMCPD.accessionNumber) &&
-                Objects.equals(this.acquisitionDate, germplasmMCPD.acquisitionDate) &&
-                Objects.equals(this.acquisitionSourceCode, germplasmMCPD.acquisitionSourceCode) &&
-                Objects.equals(this.alternateIDs, germplasmMCPD.alternateIDs) &&
-                Objects.equals(this.ancestralData, germplasmMCPD.ancestralData) &&
-                Objects.equals(this.biologicalStatusOfAccessionCode, germplasmMCPD.biologicalStatusOfAccessionCode) &&
-                Objects.equals(this.breedingInstitutes, germplasmMCPD.breedingInstitutes) &&
-                Objects.equals(this.collectingInfo, germplasmMCPD.collectingInfo) &&
-                Objects.equals(this.commonCropName, germplasmMCPD.commonCropName) &&
-                Objects.equals(this.countryOfOrigin, germplasmMCPD.countryOfOrigin) &&
-                Objects.equals(this.donorInfo, germplasmMCPD.donorInfo) &&
-                Objects.equals(this.genus, germplasmMCPD.genus) &&
-                Objects.equals(this.germplasmDbId, germplasmMCPD.germplasmDbId) &&
-                Objects.equals(this.germplasmPUI, germplasmMCPD.germplasmPUI) &&
-                Objects.equals(this.instituteCode, germplasmMCPD.instituteCode) &&
-                Objects.equals(this.mlsStatus, germplasmMCPD.mlsStatus) &&
-                Objects.equals(this.remarks, germplasmMCPD.remarks) &&
-                Objects.equals(this.safetyDuplicateInstitutes, germplasmMCPD.safetyDuplicateInstitutes) &&
-                Objects.equals(this.species, germplasmMCPD.species) &&
-                Objects.equals(this.speciesAuthority, germplasmMCPD.speciesAuthority) &&
-                Objects.equals(this.storageTypeCodes, germplasmMCPD.storageTypeCodes) &&
-                Objects.equals(this.subtaxon, germplasmMCPD.subtaxon) &&
-                Objects.equals(this.subtaxonAuthority, germplasmMCPD.subtaxonAuthority);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(accessionNames, accessionNumber, acquisitionDate, acquisitionSourceCode, alternateIDs, ancestralData, biologicalStatusOfAccessionCode, breedingInstitutes, collectingInfo, commonCropName, countryOfOrigin, donorInfo, genus, germplasmDbId, germplasmPUI, instituteCode, mlsStatus, remarks, safetyDuplicateInstitutes, species, speciesAuthority, storageTypeCodes, subtaxon, subtaxonAuthority);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmMCPD {\n");
-
-        sb.append("    accessionNames: ").append(toIndentedString(accessionNames)).append("\n");
-        sb.append("    accessionNumber: ").append(toIndentedString(accessionNumber)).append("\n");
-        sb.append("    acquisitionDate: ").append(toIndentedString(acquisitionDate)).append("\n");
-        sb.append("    acquisitionSourceCode: ").append(toIndentedString(acquisitionSourceCode)).append("\n");
-        sb.append("    alternateIDs: ").append(toIndentedString(alternateIDs)).append("\n");
-        sb.append("    ancestralData: ").append(toIndentedString(ancestralData)).append("\n");
-        sb.append("    biologicalStatusOfAccessionCode: ").append(toIndentedString(biologicalStatusOfAccessionCode)).append("\n");
-        sb.append("    breedingInstitutes: ").append(toIndentedString(breedingInstitutes)).append("\n");
-        sb.append("    collectingInfo: ").append(toIndentedString(collectingInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    countryOfOrigin: ").append(toIndentedString(countryOfOrigin)).append("\n");
-        sb.append("    donorInfo: ").append(toIndentedString(donorInfo)).append("\n");
-        sb.append("    genus: ").append(toIndentedString(genus)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmPUI: ").append(toIndentedString(germplasmPUI)).append("\n");
-        sb.append("    instituteCode: ").append(toIndentedString(instituteCode)).append("\n");
-        sb.append("    mlsStatus: ").append(toIndentedString(mlsStatus)).append("\n");
-        sb.append("    remarks: ").append(toIndentedString(remarks)).append("\n");
-        sb.append("    safetyDuplicateInstitutes: ").append(toIndentedString(safetyDuplicateInstitutes)).append("\n");
-        sb.append("    species: ").append(toIndentedString(species)).append("\n");
-        sb.append("    speciesAuthority: ").append(toIndentedString(speciesAuthority)).append("\n");
-        sb.append("    storageTypeCodes: ").append(toIndentedString(storageTypeCodes)).append("\n");
-        sb.append("    subtaxon: ").append(toIndentedString(subtaxon)).append("\n");
-        sb.append("    subtaxonAuthority: ").append(toIndentedString(subtaxonAuthority)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDBreedingInstitutes.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDBreedingInstitutes.java
deleted file mode 100644
index 1795af83..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDBreedingInstitutes.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * GermplasmMCPDBreedingInstitutes
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmMCPDBreedingInstitutes {
-    @SerializedName("instituteCode")
-    private String instituteCode = null;
-
-    @SerializedName("instituteName")
-    private String instituteName = null;
-
-    public GermplasmMCPDBreedingInstitutes instituteCode(String instituteCode) {
-        this.instituteCode = instituteCode;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (BREDCODE) 18. FAO WIEWS code of the institute that has bred the material. If the holding institute has bred the material, the breeding institute code (BREDCODE) should be the same as the holding institute code (INSTCODE). Follows INSTCODE standard.
-     *
-     * @return instituteCode
-     **/
-    @Schema(example = "PER001", description = "MCPD (v2.1) (BREDCODE) 18. FAO WIEWS code of the institute that has bred the material. If the holding institute has bred the material, the breeding institute code (BREDCODE) should be the same as the holding institute code (INSTCODE). Follows INSTCODE standard.")
-    public String getInstituteCode() {
-        return instituteCode;
-    }
-
-    public void setInstituteCode(String instituteCode) {
-        this.instituteCode = instituteCode;
-    }
-
-    public GermplasmMCPDBreedingInstitutes instituteName(String instituteName) {
-        this.instituteName = instituteName;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (BREDNAME) 18.1  Name of the institute (or person) that bred the material. This descriptor should be used only if BREDCODE can not be filled because the FAO WIEWS code for this institute is not available.
-     *
-     * @return instituteName
-     **/
-    @Schema(example = "The BrAPI Institute", description = "MCPD (v2.1) (BREDNAME) 18.1  Name of the institute (or person) that bred the material. This descriptor should be used only if BREDCODE can not be filled because the FAO WIEWS code for this institute is not available.")
-    public String getInstituteName() {
-        return instituteName;
-    }
-
-    public void setInstituteName(String instituteName) {
-        this.instituteName = instituteName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmMCPDBreedingInstitutes germplasmMCPDBreedingInstitutes = (GermplasmMCPDBreedingInstitutes) o;
-        return Objects.equals(this.instituteCode, germplasmMCPDBreedingInstitutes.instituteCode) &&
-                Objects.equals(this.instituteName, germplasmMCPDBreedingInstitutes.instituteName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(instituteCode, instituteName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmMCPDBreedingInstitutes {\n");
-
-        sb.append("    instituteCode: ").append(toIndentedString(instituteCode)).append("\n");
-        sb.append("    instituteName: ").append(toIndentedString(instituteName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDCollectingInfo.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDCollectingInfo.java
deleted file mode 100644
index b30369db..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDCollectingInfo.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.LocalDate;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Information about the collection of a germplasm
- */
-@Schema(description = "Information about the collection of a germplasm")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmMCPDCollectingInfo {
-    @SerializedName("collectingDate")
-    private LocalDate collectingDate = null;
-
-    @SerializedName("collectingInstitutes")
-    private List<GermplasmMCPDCollectingInfoCollectingInstitutes> collectingInstitutes = null;
-
-    @SerializedName("collectingMissionIdentifier")
-    private String collectingMissionIdentifier = null;
-
-    @SerializedName("collectingNumber")
-    private String collectingNumber = null;
-
-    @SerializedName("collectingSite")
-    private GermplasmMCPDCollectingInfoCollectingSite collectingSite = null;
-
-    public GermplasmMCPDCollectingInfo collectingDate(LocalDate collectingDate) {
-        this.collectingDate = collectingDate;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (COLLDATE) 17. Collecting date of the sample [YYYYMMDD] where YYYY is the year, MM is the month and DD is the day. Missing data (MM or DD) should be indicated with hyphens or \&quot;00\&quot; [double zero].
-     *
-     * @return collectingDate
-     **/
-    @Schema(description = "MCPD (v2.1) (COLLDATE) 17. Collecting date of the sample [YYYYMMDD] where YYYY is the year, MM is the month and DD is the day. Missing data (MM or DD) should be indicated with hyphens or \"00\" [double zero].")
-    public LocalDate getCollectingDate() {
-        return collectingDate;
-    }
-
-    public void setCollectingDate(LocalDate collectingDate) {
-        this.collectingDate = collectingDate;
-    }
-
-    public GermplasmMCPDCollectingInfo collectingInstitutes(List<GermplasmMCPDCollectingInfoCollectingInstitutes> collectingInstitutes) {
-        this.collectingInstitutes = collectingInstitutes;
-        return this;
-    }
-
-    public GermplasmMCPDCollectingInfo addCollectingInstitutesItem(GermplasmMCPDCollectingInfoCollectingInstitutes collectingInstitutesItem) {
-        if (this.collectingInstitutes == null) {
-            this.collectingInstitutes = new ArrayList<GermplasmMCPDCollectingInfoCollectingInstitutes>();
-        }
-        this.collectingInstitutes.add(collectingInstitutesItem);
-        return this;
-    }
-
-    /**
-     * Institutes which collected the sample
-     *
-     * @return collectingInstitutes
-     **/
-    @Schema(description = "Institutes which collected the sample")
-    public List<GermplasmMCPDCollectingInfoCollectingInstitutes> getCollectingInstitutes() {
-        return collectingInstitutes;
-    }
-
-    public void setCollectingInstitutes(List<GermplasmMCPDCollectingInfoCollectingInstitutes> collectingInstitutes) {
-        this.collectingInstitutes = collectingInstitutes;
-    }
-
-    public GermplasmMCPDCollectingInfo collectingMissionIdentifier(String collectingMissionIdentifier) {
-        this.collectingMissionIdentifier = collectingMissionIdentifier;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (COLLMISSID) 4.2 Identifier of the collecting mission used by the Collecting Institute (4 or 4.1) (e.g. \&quot;CIATFOR_052\&quot;, \&quot;CN_426\&quot;).
-     *
-     * @return collectingMissionIdentifier
-     **/
-    @Schema(example = "CIATFOR_052", description = "MCPD (v2.1) (COLLMISSID) 4.2 Identifier of the collecting mission used by the Collecting Institute (4 or 4.1) (e.g. \"CIATFOR_052\", \"CN_426\").")
-    public String getCollectingMissionIdentifier() {
-        return collectingMissionIdentifier;
-    }
-
-    public void setCollectingMissionIdentifier(String collectingMissionIdentifier) {
-        this.collectingMissionIdentifier = collectingMissionIdentifier;
-    }
-
-    public GermplasmMCPDCollectingInfo collectingNumber(String collectingNumber) {
-        this.collectingNumber = collectingNumber;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (COLLNUMB) 3. Original identifier assigned by the collector(s) of the sample, normally composed of the name or initials of the collector(s) followed by a number (e.g. \&quot;ab109909\&quot;). This identifier is essential for identifying duplicates held in different collections.
-     *
-     * @return collectingNumber
-     **/
-    @Schema(example = "ab109909", description = "MCPD (v2.1) (COLLNUMB) 3. Original identifier assigned by the collector(s) of the sample, normally composed of the name or initials of the collector(s) followed by a number (e.g. \"ab109909\"). This identifier is essential for identifying duplicates held in different collections.")
-    public String getCollectingNumber() {
-        return collectingNumber;
-    }
-
-    public void setCollectingNumber(String collectingNumber) {
-        this.collectingNumber = collectingNumber;
-    }
-
-    public GermplasmMCPDCollectingInfo collectingSite(GermplasmMCPDCollectingInfoCollectingSite collectingSite) {
-        this.collectingSite = collectingSite;
-        return this;
-    }
-
-    /**
-     * Get collectingSite
-     *
-     * @return collectingSite
-     **/
-    @Schema(description = "")
-    public GermplasmMCPDCollectingInfoCollectingSite getCollectingSite() {
-        return collectingSite;
-    }
-
-    public void setCollectingSite(GermplasmMCPDCollectingInfoCollectingSite collectingSite) {
-        this.collectingSite = collectingSite;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmMCPDCollectingInfo germplasmMCPDCollectingInfo = (GermplasmMCPDCollectingInfo) o;
-        return Objects.equals(this.collectingDate, germplasmMCPDCollectingInfo.collectingDate) &&
-                Objects.equals(this.collectingInstitutes, germplasmMCPDCollectingInfo.collectingInstitutes) &&
-                Objects.equals(this.collectingMissionIdentifier, germplasmMCPDCollectingInfo.collectingMissionIdentifier) &&
-                Objects.equals(this.collectingNumber, germplasmMCPDCollectingInfo.collectingNumber) &&
-                Objects.equals(this.collectingSite, germplasmMCPDCollectingInfo.collectingSite);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(collectingDate, collectingInstitutes, collectingMissionIdentifier, collectingNumber, collectingSite);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmMCPDCollectingInfo {\n");
-
-        sb.append("    collectingDate: ").append(toIndentedString(collectingDate)).append("\n");
-        sb.append("    collectingInstitutes: ").append(toIndentedString(collectingInstitutes)).append("\n");
-        sb.append("    collectingMissionIdentifier: ").append(toIndentedString(collectingMissionIdentifier)).append("\n");
-        sb.append("    collectingNumber: ").append(toIndentedString(collectingNumber)).append("\n");
-        sb.append("    collectingSite: ").append(toIndentedString(collectingSite)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDCollectingInfoCollectingInstitutes.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDCollectingInfoCollectingInstitutes.java
deleted file mode 100644
index 99c8c054..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDCollectingInfoCollectingInstitutes.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * GermplasmMCPDCollectingInfoCollectingInstitutes
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmMCPDCollectingInfoCollectingInstitutes {
-    @SerializedName("instituteAddress")
-    private String instituteAddress = null;
-
-    @SerializedName("instituteCode")
-    private String instituteCode = null;
-
-    @SerializedName("instituteName")
-    private String instituteName = null;
-
-    public GermplasmMCPDCollectingInfoCollectingInstitutes instituteAddress(String instituteAddress) {
-        this.instituteAddress = instituteAddress;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (COLLINSTADDRESS) 4.1.1  Address of the institute collecting the sample. This descriptor should be used only if COLLCODE can not be filled since the FAO WIEWS code for this institute is not available. Multiple values are separated by a semicolon without space.
-     *
-     * @return instituteAddress
-     **/
-    @Schema(example = "123 Main Street, Lima, Peru, 5555", description = "MCPD (v2.1) (COLLINSTADDRESS) 4.1.1  Address of the institute collecting the sample. This descriptor should be used only if COLLCODE can not be filled since the FAO WIEWS code for this institute is not available. Multiple values are separated by a semicolon without space.")
-    public String getInstituteAddress() {
-        return instituteAddress;
-    }
-
-    public void setInstituteAddress(String instituteAddress) {
-        this.instituteAddress = instituteAddress;
-    }
-
-    public GermplasmMCPDCollectingInfoCollectingInstitutes instituteCode(String instituteCode) {
-        this.instituteCode = instituteCode;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (COLLCODE) 4.  FAO WIEWS code of the institute collecting the sample. If the holding institute has collected the material, the collecting institute code (COLLCODE) should be the same as the holding institute code (INSTCODE). Follows INSTCODE standard. Multiple values are separated by a semicolon without space.
-     *
-     * @return instituteCode
-     **/
-    @Schema(example = "PER001", description = "MCPD (v2.1) (COLLCODE) 4.  FAO WIEWS code of the institute collecting the sample. If the holding institute has collected the material, the collecting institute code (COLLCODE) should be the same as the holding institute code (INSTCODE). Follows INSTCODE standard. Multiple values are separated by a semicolon without space.")
-    public String getInstituteCode() {
-        return instituteCode;
-    }
-
-    public void setInstituteCode(String instituteCode) {
-        this.instituteCode = instituteCode;
-    }
-
-    public GermplasmMCPDCollectingInfoCollectingInstitutes instituteName(String instituteName) {
-        this.instituteName = instituteName;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (COLLNAME) 4.1  Name of the institute collecting the sample. This descriptor should be used only if COLLCODE can not be filled because the FAO WIEWS code for this institute is not available. Multiple values are separated by a semicolon without space.
-     *
-     * @return instituteName
-     **/
-    @Schema(example = "The BrAPI Institute", description = "MCPD (v2.1) (COLLNAME) 4.1  Name of the institute collecting the sample. This descriptor should be used only if COLLCODE can not be filled because the FAO WIEWS code for this institute is not available. Multiple values are separated by a semicolon without space.")
-    public String getInstituteName() {
-        return instituteName;
-    }
-
-    public void setInstituteName(String instituteName) {
-        this.instituteName = instituteName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmMCPDCollectingInfoCollectingInstitutes germplasmMCPDCollectingInfoCollectingInstitutes = (GermplasmMCPDCollectingInfoCollectingInstitutes) o;
-        return Objects.equals(this.instituteAddress, germplasmMCPDCollectingInfoCollectingInstitutes.instituteAddress) &&
-                Objects.equals(this.instituteCode, germplasmMCPDCollectingInfoCollectingInstitutes.instituteCode) &&
-                Objects.equals(this.instituteName, germplasmMCPDCollectingInfoCollectingInstitutes.instituteName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(instituteAddress, instituteCode, instituteName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmMCPDCollectingInfoCollectingInstitutes {\n");
-
-        sb.append("    instituteAddress: ").append(toIndentedString(instituteAddress)).append("\n");
-        sb.append("    instituteCode: ").append(toIndentedString(instituteCode)).append("\n");
-        sb.append("    instituteName: ").append(toIndentedString(instituteName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDCollectingInfoCollectingSite.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDCollectingInfoCollectingSite.java
deleted file mode 100644
index fa000e88..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDCollectingInfoCollectingSite.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Information about the location where the sample was collected
- */
-@Schema(description = "Information about the location where the sample was collected")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmMCPDCollectingInfoCollectingSite {
-    @SerializedName("coordinateUncertainty")
-    private String coordinateUncertainty = null;
-
-    @SerializedName("elevation")
-    private String elevation = null;
-
-    @SerializedName("georeferencingMethod")
-    private String georeferencingMethod = null;
-
-    @SerializedName("latitudeDecimal")
-    private String latitudeDecimal = null;
-
-    @SerializedName("latitudeDegrees")
-    private String latitudeDegrees = null;
-
-    @SerializedName("locationDescription")
-    private String locationDescription = null;
-
-    @SerializedName("longitudeDecimal")
-    private String longitudeDecimal = null;
-
-    @SerializedName("longitudeDegrees")
-    private String longitudeDegrees = null;
-
-    @SerializedName("spatialReferenceSystem")
-    private String spatialReferenceSystem = null;
-
-    public GermplasmMCPDCollectingInfoCollectingSite coordinateUncertainty(String coordinateUncertainty) {
-        this.coordinateUncertainty = coordinateUncertainty;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (COORDUNCERT) 15.5 Uncertainty associated with the coordinates in metres. Leave the value empty if the uncertainty is unknown.
-     *
-     * @return coordinateUncertainty
-     **/
-    @Schema(example = "20", description = "MCPD (v2.1) (COORDUNCERT) 15.5 Uncertainty associated with the coordinates in metres. Leave the value empty if the uncertainty is unknown.")
-    public String getCoordinateUncertainty() {
-        return coordinateUncertainty;
-    }
-
-    public void setCoordinateUncertainty(String coordinateUncertainty) {
-        this.coordinateUncertainty = coordinateUncertainty;
-    }
-
-    public GermplasmMCPDCollectingInfoCollectingSite elevation(String elevation) {
-        this.elevation = elevation;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (ELEVATION) 16. Elevation of collecting site expressed in metres above sea level. Negative values are allowed.
-     *
-     * @return elevation
-     **/
-    @Schema(example = "35", description = "MCPD (v2.1) (ELEVATION) 16. Elevation of collecting site expressed in metres above sea level. Negative values are allowed.")
-    public String getElevation() {
-        return elevation;
-    }
-
-    public void setElevation(String elevation) {
-        this.elevation = elevation;
-    }
-
-    public GermplasmMCPDCollectingInfoCollectingSite georeferencingMethod(String georeferencingMethod) {
-        this.georeferencingMethod = georeferencingMethod;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (GEOREFMETH) 15.7  The georeferencing method used (GPS, determined from map, gazetteer, or estimated using software). Leave the value empty if georeferencing method is not known.
-     *
-     * @return georeferencingMethod
-     **/
-    @Schema(example = "WGS84", description = "MCPD (v2.1) (GEOREFMETH) 15.7  The georeferencing method used (GPS, determined from map, gazetteer, or estimated using software). Leave the value empty if georeferencing method is not known.")
-    public String getGeoreferencingMethod() {
-        return georeferencingMethod;
-    }
-
-    public void setGeoreferencingMethod(String georeferencingMethod) {
-        this.georeferencingMethod = georeferencingMethod;
-    }
-
-    public GermplasmMCPDCollectingInfoCollectingSite latitudeDecimal(String latitudeDecimal) {
-        this.latitudeDecimal = latitudeDecimal;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (DECLATITUDE) 15.1 Latitude expressed in decimal degrees. Positive values are North of the Equator; negative values are South of the Equator (e.g. -44.6975).
-     *
-     * @return latitudeDecimal
-     **/
-    @Schema(example = "+42.445295", description = "MCPD (v2.1) (DECLATITUDE) 15.1 Latitude expressed in decimal degrees. Positive values are North of the Equator; negative values are South of the Equator (e.g. -44.6975).")
-    public String getLatitudeDecimal() {
-        return latitudeDecimal;
-    }
-
-    public void setLatitudeDecimal(String latitudeDecimal) {
-        this.latitudeDecimal = latitudeDecimal;
-    }
-
-    public GermplasmMCPDCollectingInfoCollectingSite latitudeDegrees(String latitudeDegrees) {
-        this.latitudeDegrees = latitudeDegrees;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (LATITUDE) 15.2 Degrees (2 digits) minutes (2 digits), and seconds (2 digits) followed by N (North) or S (South) (e.g. 103020S). Every missing digit (minutes or seconds) should be indicated with a hyphen. Leading zeros are required (e.g. 10
-     *
-     * @return latitudeDegrees
-     **/
-    @Schema(example = "42 26 43.1 N", description = "MCPD (v2.1) (LATITUDE) 15.2 Degrees (2 digits) minutes (2 digits), and seconds (2 digits) followed by N (North) or S (South) (e.g. 103020S). Every missing digit (minutes or seconds) should be indicated with a hyphen. Leading zeros are required (e.g. 10")
-    public String getLatitudeDegrees() {
-        return latitudeDegrees;
-    }
-
-    public void setLatitudeDegrees(String latitudeDegrees) {
-        this.latitudeDegrees = latitudeDegrees;
-    }
-
-    public GermplasmMCPDCollectingInfoCollectingSite locationDescription(String locationDescription) {
-        this.locationDescription = locationDescription;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (COLLSITE) 14. Location information below the country level that describes where the accession was collected, preferable in English. This might include the distance in kilometres and direction from the nearest town, village or map grid reference point, (e.g. 7 km south of Townsville).
-     *
-     * @return locationDescription
-     **/
-    @Schema(example = "South east hill near institute buildings", description = "MCPD (v2.1) (COLLSITE) 14. Location information below the country level that describes where the accession was collected, preferable in English. This might include the distance in kilometres and direction from the nearest town, village or map grid reference point, (e.g. 7 km south of Townsville).")
-    public String getLocationDescription() {
-        return locationDescription;
-    }
-
-    public void setLocationDescription(String locationDescription) {
-        this.locationDescription = locationDescription;
-    }
-
-    public GermplasmMCPDCollectingInfoCollectingSite longitudeDecimal(String longitudeDecimal) {
-        this.longitudeDecimal = longitudeDecimal;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (DECLONGITUDE) 15.3 Longitude expressed in decimal degrees. Positive values are East of the Greenwich Meridian; negative values are West of the Greenwich Meridian (e.g. +120.9123).
-     *
-     * @return longitudeDecimal
-     **/
-    @Schema(example = "-076.471934", description = "MCPD (v2.1) (DECLONGITUDE) 15.3 Longitude expressed in decimal degrees. Positive values are East of the Greenwich Meridian; negative values are West of the Greenwich Meridian (e.g. +120.9123).")
-    public String getLongitudeDecimal() {
-        return longitudeDecimal;
-    }
-
-    public void setLongitudeDecimal(String longitudeDecimal) {
-        this.longitudeDecimal = longitudeDecimal;
-    }
-
-    public GermplasmMCPDCollectingInfoCollectingSite longitudeDegrees(String longitudeDegrees) {
-        this.longitudeDegrees = longitudeDegrees;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (LONGITUDE) 15.4 Degrees (3 digits), minutes (2 digits), and seconds (2 digits) followed by E (East) or W (West) (e.g. 0762510W). Every missing digit (minutes or seconds) should be indicated with a hyphen. Leading zeros are required (e.g. 076
-     *
-     * @return longitudeDegrees
-     **/
-    @Schema(example = "76 28 19.0 W", description = "MCPD (v2.1) (LONGITUDE) 15.4 Degrees (3 digits), minutes (2 digits), and seconds (2 digits) followed by E (East) or W (West) (e.g. 0762510W). Every missing digit (minutes or seconds) should be indicated with a hyphen. Leading zeros are required (e.g. 076")
-    public String getLongitudeDegrees() {
-        return longitudeDegrees;
-    }
-
-    public void setLongitudeDegrees(String longitudeDegrees) {
-        this.longitudeDegrees = longitudeDegrees;
-    }
-
-    public GermplasmMCPDCollectingInfoCollectingSite spatialReferenceSystem(String spatialReferenceSystem) {
-        this.spatialReferenceSystem = spatialReferenceSystem;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (COORDDATUM) 15.6 The geodetic datum or spatial reference system upon which the coordinates given in decimal latitude and decimal longitude are based (e.g. WGS84). The GPS uses the WGS84 datum.
-     *
-     * @return spatialReferenceSystem
-     **/
-    @Schema(example = "WGS84", description = "MCPD (v2.1) (COORDDATUM) 15.6 The geodetic datum or spatial reference system upon which the coordinates given in decimal latitude and decimal longitude are based (e.g. WGS84). The GPS uses the WGS84 datum.")
-    public String getSpatialReferenceSystem() {
-        return spatialReferenceSystem;
-    }
-
-    public void setSpatialReferenceSystem(String spatialReferenceSystem) {
-        this.spatialReferenceSystem = spatialReferenceSystem;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmMCPDCollectingInfoCollectingSite germplasmMCPDCollectingInfoCollectingSite = (GermplasmMCPDCollectingInfoCollectingSite) o;
-        return Objects.equals(this.coordinateUncertainty, germplasmMCPDCollectingInfoCollectingSite.coordinateUncertainty) &&
-                Objects.equals(this.elevation, germplasmMCPDCollectingInfoCollectingSite.elevation) &&
-                Objects.equals(this.georeferencingMethod, germplasmMCPDCollectingInfoCollectingSite.georeferencingMethod) &&
-                Objects.equals(this.latitudeDecimal, germplasmMCPDCollectingInfoCollectingSite.latitudeDecimal) &&
-                Objects.equals(this.latitudeDegrees, germplasmMCPDCollectingInfoCollectingSite.latitudeDegrees) &&
-                Objects.equals(this.locationDescription, germplasmMCPDCollectingInfoCollectingSite.locationDescription) &&
-                Objects.equals(this.longitudeDecimal, germplasmMCPDCollectingInfoCollectingSite.longitudeDecimal) &&
-                Objects.equals(this.longitudeDegrees, germplasmMCPDCollectingInfoCollectingSite.longitudeDegrees) &&
-                Objects.equals(this.spatialReferenceSystem, germplasmMCPDCollectingInfoCollectingSite.spatialReferenceSystem);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(coordinateUncertainty, elevation, georeferencingMethod, latitudeDecimal, latitudeDegrees, locationDescription, longitudeDecimal, longitudeDegrees, spatialReferenceSystem);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmMCPDCollectingInfoCollectingSite {\n");
-
-        sb.append("    coordinateUncertainty: ").append(toIndentedString(coordinateUncertainty)).append("\n");
-        sb.append("    elevation: ").append(toIndentedString(elevation)).append("\n");
-        sb.append("    georeferencingMethod: ").append(toIndentedString(georeferencingMethod)).append("\n");
-        sb.append("    latitudeDecimal: ").append(toIndentedString(latitudeDecimal)).append("\n");
-        sb.append("    latitudeDegrees: ").append(toIndentedString(latitudeDegrees)).append("\n");
-        sb.append("    locationDescription: ").append(toIndentedString(locationDescription)).append("\n");
-        sb.append("    longitudeDecimal: ").append(toIndentedString(longitudeDecimal)).append("\n");
-        sb.append("    longitudeDegrees: ").append(toIndentedString(longitudeDegrees)).append("\n");
-        sb.append("    spatialReferenceSystem: ").append(toIndentedString(spatialReferenceSystem)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDDonorInfo.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDDonorInfo.java
deleted file mode 100644
index f4216741..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDDonorInfo.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Information about an accession donor
- */
-@Schema(description = "Information about an accession donor")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmMCPDDonorInfo {
-    @SerializedName("donorAccessionNumber")
-    private String donorAccessionNumber = null;
-
-    @SerializedName("donorAccessionPui")
-    private String donorAccessionPui = null;
-
-    @SerializedName("donorInstitute")
-    private GermplasmMCPDDonorInfoDonorInstitute donorInstitute = null;
-
-    public GermplasmMCPDDonorInfo donorAccessionNumber(String donorAccessionNumber) {
-        this.donorAccessionNumber = donorAccessionNumber;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (DONORNUMB) 23. Identifier assigned to an accession by the donor. Follows ACCENUMB standard.
-     *
-     * @return donorAccessionNumber
-     **/
-    @Schema(example = "A0090204", description = "MCPD (v2.1) (DONORNUMB) 23. Identifier assigned to an accession by the donor. Follows ACCENUMB standard.")
-    public String getDonorAccessionNumber() {
-        return donorAccessionNumber;
-    }
-
-    public void setDonorAccessionNumber(String donorAccessionNumber) {
-        this.donorAccessionNumber = donorAccessionNumber;
-    }
-
-    public GermplasmMCPDDonorInfo donorAccessionPui(String donorAccessionPui) {
-        this.donorAccessionPui = donorAccessionPui;
-        return this;
-    }
-
-    /**
-     * PUI (DOI mostly) of the accession in the donor system.
-     *
-     * @return donorAccessionPui
-     **/
-    @Schema(example = "http://pui.per/accession/A0010025", description = "PUI (DOI mostly) of the accession in the donor system.")
-    public String getDonorAccessionPui() {
-        return donorAccessionPui;
-    }
-
-    public void setDonorAccessionPui(String donorAccessionPui) {
-        this.donorAccessionPui = donorAccessionPui;
-    }
-
-    public GermplasmMCPDDonorInfo donorInstitute(GermplasmMCPDDonorInfoDonorInstitute donorInstitute) {
-        this.donorInstitute = donorInstitute;
-        return this;
-    }
-
-    /**
-     * Get donorInstitute
-     *
-     * @return donorInstitute
-     **/
-    @Schema(description = "")
-    public GermplasmMCPDDonorInfoDonorInstitute getDonorInstitute() {
-        return donorInstitute;
-    }
-
-    public void setDonorInstitute(GermplasmMCPDDonorInfoDonorInstitute donorInstitute) {
-        this.donorInstitute = donorInstitute;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmMCPDDonorInfo germplasmMCPDDonorInfo = (GermplasmMCPDDonorInfo) o;
-        return Objects.equals(this.donorAccessionNumber, germplasmMCPDDonorInfo.donorAccessionNumber) &&
-                Objects.equals(this.donorAccessionPui, germplasmMCPDDonorInfo.donorAccessionPui) &&
-                Objects.equals(this.donorInstitute, germplasmMCPDDonorInfo.donorInstitute);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(donorAccessionNumber, donorAccessionPui, donorInstitute);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmMCPDDonorInfo {\n");
-
-        sb.append("    donorAccessionNumber: ").append(toIndentedString(donorAccessionNumber)).append("\n");
-        sb.append("    donorAccessionPui: ").append(toIndentedString(donorAccessionPui)).append("\n");
-        sb.append("    donorInstitute: ").append(toIndentedString(donorInstitute)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDDonorInfoDonorInstitute.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDDonorInfoDonorInstitute.java
deleted file mode 100644
index 344597ba..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDDonorInfoDonorInstitute.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * The identifying information for the entity acting as an accession donor &lt;br&gt; MCPD (v2.1) (DONORCODE) 22. FAO WIEWS code of the donor institute. Follows INSTCODE standard. &lt;br&gt; MCPD (v2.1) (DONORNAME) 22.1  Name of the donor institute (or person). This descriptor should be used only if DONORCODE can not be filled because the FAO WIEWS code for this institute is not available.
- */
-@Schema(description = "The identifying information for the entity acting as an accession donor <br> MCPD (v2.1) (DONORCODE) 22. FAO WIEWS code of the donor institute. Follows INSTCODE standard. <br> MCPD (v2.1) (DONORNAME) 22.1  Name of the donor institute (or person). This descriptor should be used only if DONORCODE can not be filled because the FAO WIEWS code for this institute is not available.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmMCPDDonorInfoDonorInstitute {
-    @SerializedName("instituteCode")
-    private String instituteCode = null;
-
-    @SerializedName("instituteName")
-    private String instituteName = null;
-
-    public GermplasmMCPDDonorInfoDonorInstitute instituteCode(String instituteCode) {
-        this.instituteCode = instituteCode;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (DONORCODE) 22. FAO WIEWS code of the donor institute. Follows INSTCODE standard.
-     *
-     * @return instituteCode
-     **/
-    @Schema(example = "PER001", description = "MCPD (v2.1) (DONORCODE) 22. FAO WIEWS code of the donor institute. Follows INSTCODE standard.")
-    public String getInstituteCode() {
-        return instituteCode;
-    }
-
-    public void setInstituteCode(String instituteCode) {
-        this.instituteCode = instituteCode;
-    }
-
-    public GermplasmMCPDDonorInfoDonorInstitute instituteName(String instituteName) {
-        this.instituteName = instituteName;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (DONORNAME) 22.1  Name of the donor institute (or person). This descriptor should be used only if DONORCODE can not be filled because the FAO WIEWS code for this institute is not available.
-     *
-     * @return instituteName
-     **/
-    @Schema(example = "The BrAPI Institute", description = "MCPD (v2.1) (DONORNAME) 22.1  Name of the donor institute (or person). This descriptor should be used only if DONORCODE can not be filled because the FAO WIEWS code for this institute is not available.")
-    public String getInstituteName() {
-        return instituteName;
-    }
-
-    public void setInstituteName(String instituteName) {
-        this.instituteName = instituteName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmMCPDDonorInfoDonorInstitute germplasmMCPDDonorInfoDonorInstitute = (GermplasmMCPDDonorInfoDonorInstitute) o;
-        return Objects.equals(this.instituteCode, germplasmMCPDDonorInfoDonorInstitute.instituteCode) &&
-                Objects.equals(this.instituteName, germplasmMCPDDonorInfoDonorInstitute.instituteName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(instituteCode, instituteName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmMCPDDonorInfoDonorInstitute {\n");
-
-        sb.append("    instituteCode: ").append(toIndentedString(instituteCode)).append("\n");
-        sb.append("    instituteName: ").append(toIndentedString(instituteName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDResponse.java
deleted file mode 100644
index 27e138ed..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * GermplasmMCPDResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmMCPDResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private GermplasmMCPD result = null;
-
-    public GermplasmMCPDResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public GermplasmMCPDResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public GermplasmMCPDResponse result(GermplasmMCPD result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public GermplasmMCPD getResult() {
-        return result;
-    }
-
-    public void setResult(GermplasmMCPD result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmMCPDResponse germplasmMCPDResponse = (GermplasmMCPDResponse) o;
-        return Objects.equals(this._atContext, germplasmMCPDResponse._atContext) &&
-                Objects.equals(this.metadata, germplasmMCPDResponse.metadata) &&
-                Objects.equals(this.result, germplasmMCPDResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmMCPDResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDSafetyDuplicateInstitutes.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDSafetyDuplicateInstitutes.java
deleted file mode 100644
index fee51277..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmMCPDSafetyDuplicateInstitutes.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * GermplasmMCPDSafetyDuplicateInstitutes
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmMCPDSafetyDuplicateInstitutes {
-    @SerializedName("instituteCode")
-    private String instituteCode = null;
-
-    @SerializedName("instituteName")
-    private String instituteName = null;
-
-    public GermplasmMCPDSafetyDuplicateInstitutes instituteCode(String instituteCode) {
-        this.instituteCode = instituteCode;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (DUPLSITE) 25. FAO WIEWS code of the institute(s) where a safety duplicate of the accession is maintained. Follows INSTCODE standard.
-     *
-     * @return instituteCode
-     **/
-    @Schema(example = "PER001", description = "MCPD (v2.1) (DUPLSITE) 25. FAO WIEWS code of the institute(s) where a safety duplicate of the accession is maintained. Follows INSTCODE standard.")
-    public String getInstituteCode() {
-        return instituteCode;
-    }
-
-    public void setInstituteCode(String instituteCode) {
-        this.instituteCode = instituteCode;
-    }
-
-    public GermplasmMCPDSafetyDuplicateInstitutes instituteName(String instituteName) {
-        this.instituteName = instituteName;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (DUPLINSTNAME) 25.1  Name of the institute where a safety duplicate of the accession is maintained.
-     *
-     * @return instituteName
-     **/
-    @Schema(example = "The BrAPI Institute", description = "MCPD (v2.1) (DUPLINSTNAME) 25.1  Name of the institute where a safety duplicate of the accession is maintained.")
-    public String getInstituteName() {
-        return instituteName;
-    }
-
-    public void setInstituteName(String instituteName) {
-        this.instituteName = instituteName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmMCPDSafetyDuplicateInstitutes germplasmMCPDSafetyDuplicateInstitutes = (GermplasmMCPDSafetyDuplicateInstitutes) o;
-        return Objects.equals(this.instituteCode, germplasmMCPDSafetyDuplicateInstitutes.instituteCode) &&
-                Objects.equals(this.instituteName, germplasmMCPDSafetyDuplicateInstitutes.instituteName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(instituteCode, instituteName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmMCPDSafetyDuplicateInstitutes {\n");
-
-        sb.append("    instituteCode: ").append(toIndentedString(instituteCode)).append("\n");
-        sb.append("    instituteName: ").append(toIndentedString(instituteName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmNewRequest.java
deleted file mode 100644
index e0c7527c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmNewRequest.java
+++ /dev/null
@@ -1,935 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.LocalDate;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * GermplasmNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmNewRequest {
-    @SerializedName("accessionNumber")
-    private String accessionNumber = null;
-
-    @SerializedName("acquisitionDate")
-    private LocalDate acquisitionDate = null;
-
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    /**
-     * MCPD (v2.1) (SAMPSTAT) 19. The coding scheme proposed can be used at 3 different levels of detail: either by using the general codes such as 100, 200, 300, 400, or by using the more specific codes such as 110, 120, etc.   100) Wild  110) Natural  120) Semi-natural/wild  130) Semi-natural/sown  200) Weedy  300) Traditional cultivar/landrace  400) Breeding/research material  410) Breeders line  411) Synthetic population  412) Hybrid  413) Founder stock/base population  414) Inbred line (parent of hybrid cultivar)  415) Segregating population  416) Clonal selection  420) Genetic stock  421) Mutant (e.g. induced/insertion mutants, tilling populations)  422) Cytogenetic stocks (e.g. chromosome addition/substitution, aneuploids,  amphiploids)  423) Other genetic stocks (e.g. mapping populations)  500) Advanced or improved cultivar (conventional breeding methods)  600) GMO (by genetic engineering)  999) Other (Elaborate in REMARKS field)
-     */
-    @JsonAdapter(BiologicalStatusOfAccessionCodeEnum.Adapter.class)
-    public enum BiologicalStatusOfAccessionCodeEnum {
-        _100("100"),
-        _110("110"),
-        _120("120"),
-        _130("130"),
-        _200("200"),
-        _300("300"),
-        _400("400"),
-        _410("410"),
-        _411("411"),
-        _412("412"),
-        _413("413"),
-        _414("414"),
-        _415("415"),
-        _416("416"),
-        _420("420"),
-        _421("421"),
-        _422("422"),
-        _423("423"),
-        _500("500"),
-        _600("600"),
-        _999("999");
-
-        private String value;
-
-        BiologicalStatusOfAccessionCodeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static BiologicalStatusOfAccessionCodeEnum fromValue(String input) {
-            for (BiologicalStatusOfAccessionCodeEnum b : BiologicalStatusOfAccessionCodeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<BiologicalStatusOfAccessionCodeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final BiologicalStatusOfAccessionCodeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public BiologicalStatusOfAccessionCodeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return BiologicalStatusOfAccessionCodeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("biologicalStatusOfAccessionCode")
-    private BiologicalStatusOfAccessionCodeEnum biologicalStatusOfAccessionCode = null;
-
-    @SerializedName("biologicalStatusOfAccessionDescription")
-    private String biologicalStatusOfAccessionDescription = null;
-
-    @SerializedName("breedingMethodDbId")
-    private String breedingMethodDbId = null;
-
-    @SerializedName("breedingMethodName")
-    private String breedingMethodName = null;
-
-    @SerializedName("collection")
-    private String collection = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("countryOfOriginCode")
-    private String countryOfOriginCode = null;
-
-    @SerializedName("defaultDisplayName")
-    private String defaultDisplayName = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("donors")
-    private List<GermplasmDonors> donors = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("genus")
-    private String genus = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("germplasmOrigin")
-    private List<GermplasmGermplasmOrigin> germplasmOrigin = null;
-
-    @SerializedName("germplasmPUI")
-    private String germplasmPUI = null;
-
-    @SerializedName("germplasmPreprocessing")
-    private String germplasmPreprocessing = null;
-
-    @SerializedName("instituteCode")
-    private String instituteCode = null;
-
-    @SerializedName("instituteName")
-    private String instituteName = null;
-
-    @SerializedName("pedigree")
-    private String pedigree = null;
-
-    @SerializedName("seedSource")
-    private String seedSource = null;
-
-    @SerializedName("seedSourceDescription")
-    private String seedSourceDescription = null;
-
-    @SerializedName("species")
-    private String species = null;
-
-    @SerializedName("speciesAuthority")
-    private String speciesAuthority = null;
-
-    @SerializedName("storageTypes")
-    private List<GermplasmStorageTypes> storageTypes = null;
-
-    @SerializedName("subtaxa")
-    private String subtaxa = null;
-
-    @SerializedName("subtaxaAuthority")
-    private String subtaxaAuthority = null;
-
-    @SerializedName("synonyms")
-    private List<GermplasmSynonyms> synonyms = null;
-
-    @SerializedName("taxonIds")
-    private List<GermplasmTaxonIds> taxonIds = null;
-
-    public GermplasmNewRequest accessionNumber(String accessionNumber) {
-        this.accessionNumber = accessionNumber;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a material or germplasm within a genebank  MCPD (v2.1) (ACCENUMB) 2. This is the unique identifier for accessions within a genebank, and is assigned when a sample is entered into the genebank collection (e.g. \&quot;PI 113869\&quot;).
-     *
-     * @return accessionNumber
-     **/
-    @Schema(example = "A0000003", description = "The unique identifier for a material or germplasm within a genebank  MCPD (v2.1) (ACCENUMB) 2. This is the unique identifier for accessions within a genebank, and is assigned when a sample is entered into the genebank collection (e.g. \"PI 113869\").")
-    public String getAccessionNumber() {
-        return accessionNumber;
-    }
-
-    public void setAccessionNumber(String accessionNumber) {
-        this.accessionNumber = accessionNumber;
-    }
-
-    public GermplasmNewRequest acquisitionDate(LocalDate acquisitionDate) {
-        this.acquisitionDate = acquisitionDate;
-        return this;
-    }
-
-    /**
-     * The date a material or germplasm was acquired by the genebank   MCPD (v2.1) (ACQDATE) 12. Date on which the accession entered the collection [YYYYMMDD] where YYYY is the year, MM is the month and DD is the day. Missing data (MM or DD) should be indicated with hyphens or \&quot;00\&quot; [double zero].
-     *
-     * @return acquisitionDate
-     **/
-    @Schema(description = "The date a material or germplasm was acquired by the genebank   MCPD (v2.1) (ACQDATE) 12. Date on which the accession entered the collection [YYYYMMDD] where YYYY is the year, MM is the month and DD is the day. Missing data (MM or DD) should be indicated with hyphens or \"00\" [double zero].")
-    public LocalDate getAcquisitionDate() {
-        return acquisitionDate;
-    }
-
-    public void setAcquisitionDate(LocalDate acquisitionDate) {
-        this.acquisitionDate = acquisitionDate;
-    }
-
-    public GermplasmNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public GermplasmNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public GermplasmNewRequest biologicalStatusOfAccessionCode(BiologicalStatusOfAccessionCodeEnum biologicalStatusOfAccessionCode) {
-        this.biologicalStatusOfAccessionCode = biologicalStatusOfAccessionCode;
-        return this;
-    }
-
-    /**
-     * MCPD (v2.1) (SAMPSTAT) 19. The coding scheme proposed can be used at 3 different levels of detail: either by using the general codes such as 100, 200, 300, 400, or by using the more specific codes such as 110, 120, etc.   100) Wild  110) Natural  120) Semi-natural/wild  130) Semi-natural/sown  200) Weedy  300) Traditional cultivar/landrace  400) Breeding/research material  410) Breeders line  411) Synthetic population  412) Hybrid  413) Founder stock/base population  414) Inbred line (parent of hybrid cultivar)  415) Segregating population  416) Clonal selection  420) Genetic stock  421) Mutant (e.g. induced/insertion mutants, tilling populations)  422) Cytogenetic stocks (e.g. chromosome addition/substitution, aneuploids,  amphiploids)  423) Other genetic stocks (e.g. mapping populations)  500) Advanced or improved cultivar (conventional breeding methods)  600) GMO (by genetic engineering)  999) Other (Elaborate in REMARKS field)
-     *
-     * @return biologicalStatusOfAccessionCode
-     **/
-    @Schema(example = "420", description = "MCPD (v2.1) (SAMPSTAT) 19. The coding scheme proposed can be used at 3 different levels of detail: either by using the general codes such as 100, 200, 300, 400, or by using the more specific codes such as 110, 120, etc.   100) Wild  110) Natural  120) Semi-natural/wild  130) Semi-natural/sown  200) Weedy  300) Traditional cultivar/landrace  400) Breeding/research material  410) Breeders line  411) Synthetic population  412) Hybrid  413) Founder stock/base population  414) Inbred line (parent of hybrid cultivar)  415) Segregating population  416) Clonal selection  420) Genetic stock  421) Mutant (e.g. induced/insertion mutants, tilling populations)  422) Cytogenetic stocks (e.g. chromosome addition/substitution, aneuploids,  amphiploids)  423) Other genetic stocks (e.g. mapping populations)  500) Advanced or improved cultivar (conventional breeding methods)  600) GMO (by genetic engineering)  999) Other (Elaborate in REMARKS field)")
-    public BiologicalStatusOfAccessionCodeEnum getBiologicalStatusOfAccessionCode() {
-        return biologicalStatusOfAccessionCode;
-    }
-
-    public void setBiologicalStatusOfAccessionCode(BiologicalStatusOfAccessionCodeEnum biologicalStatusOfAccessionCode) {
-        this.biologicalStatusOfAccessionCode = biologicalStatusOfAccessionCode;
-    }
-
-    public GermplasmNewRequest biologicalStatusOfAccessionDescription(String biologicalStatusOfAccessionDescription) {
-        this.biologicalStatusOfAccessionDescription = biologicalStatusOfAccessionDescription;
-        return this;
-    }
-
-    /**
-     * Supplemental text description for &#x27;biologicalStatusOfAccessionCode&#x27;
-     *
-     * @return biologicalStatusOfAccessionDescription
-     **/
-    @Schema(example = "Genetic stock", description = "Supplemental text description for 'biologicalStatusOfAccessionCode'")
-    public String getBiologicalStatusOfAccessionDescription() {
-        return biologicalStatusOfAccessionDescription;
-    }
-
-    public void setBiologicalStatusOfAccessionDescription(String biologicalStatusOfAccessionDescription) {
-        this.biologicalStatusOfAccessionDescription = biologicalStatusOfAccessionDescription;
-    }
-
-    public GermplasmNewRequest breedingMethodDbId(String breedingMethodDbId) {
-        this.breedingMethodDbId = breedingMethodDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for the breeding method used to create this germplasm
-     *
-     * @return breedingMethodDbId
-     **/
-    @Schema(example = "ffcce7ef", description = "The unique identifier for the breeding method used to create this germplasm")
-    public String getBreedingMethodDbId() {
-        return breedingMethodDbId;
-    }
-
-    public void setBreedingMethodDbId(String breedingMethodDbId) {
-        this.breedingMethodDbId = breedingMethodDbId;
-    }
-
-    public GermplasmNewRequest breedingMethodName(String breedingMethodName) {
-        this.breedingMethodName = breedingMethodName;
-        return this;
-    }
-
-    /**
-     * human readable name of the breeding method
-     *
-     * @return breedingMethodName
-     **/
-    @Schema(example = "Male Backcross", description = "human readable name of the breeding method")
-    public String getBreedingMethodName() {
-        return breedingMethodName;
-    }
-
-    public void setBreedingMethodName(String breedingMethodName) {
-        this.breedingMethodName = breedingMethodName;
-    }
-
-    public GermplasmNewRequest collection(String collection) {
-        this.collection = collection;
-        return this;
-    }
-
-    /**
-     * A specific panel/collection/population name this germplasm belongs to.
-     *
-     * @return collection
-     **/
-    @Schema(example = "Rice Diversity Panel 1 (RDP1)", description = "A specific panel/collection/population name this germplasm belongs to.")
-    public String getCollection() {
-        return collection;
-    }
-
-    public void setCollection(String collection) {
-        this.collection = collection;
-    }
-
-    public GermplasmNewRequest commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Common name for the crop   MCPD (v2.1) (CROPNAME) 10. Common name of the crop. Example: \&quot;malting barley\&quot;, \&quot;mas\&quot;.
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Maize", required = true, description = "Common name for the crop   MCPD (v2.1) (CROPNAME) 10. Common name of the crop. Example: \"malting barley\", \"mas\".")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public GermplasmNewRequest countryOfOriginCode(String countryOfOriginCode) {
-        this.countryOfOriginCode = countryOfOriginCode;
-        return this;
-    }
-
-    /**
-     * 3-letter ISO 3166-1 code of the country in which the sample was originally collected   MCPD (v2.1) (ORIGCTY) 13. 3-letter ISO 3166-1 code of the country in which the sample was originally collected (e.g. landrace, crop wild relative, farmers variety), bred or selected (breeding lines, GMOs, segregating populations, hybrids, modern cultivars, etc.). Note- Descriptors 14 to 16 below should be completed accordingly only if it was \&quot;collected\&quot;.
-     *
-     * @return countryOfOriginCode
-     **/
-    @Schema(example = "BES", description = "3-letter ISO 3166-1 code of the country in which the sample was originally collected   MCPD (v2.1) (ORIGCTY) 13. 3-letter ISO 3166-1 code of the country in which the sample was originally collected (e.g. landrace, crop wild relative, farmers variety), bred or selected (breeding lines, GMOs, segregating populations, hybrids, modern cultivars, etc.). Note- Descriptors 14 to 16 below should be completed accordingly only if it was \"collected\".")
-    public String getCountryOfOriginCode() {
-        return countryOfOriginCode;
-    }
-
-    public void setCountryOfOriginCode(String countryOfOriginCode) {
-        this.countryOfOriginCode = countryOfOriginCode;
-    }
-
-    public GermplasmNewRequest defaultDisplayName(String defaultDisplayName) {
-        this.defaultDisplayName = defaultDisplayName;
-        return this;
-    }
-
-    /**
-     * Human readable name used for display purposes
-     *
-     * @return defaultDisplayName
-     **/
-    @Schema(example = "A0000003", description = "Human readable name used for display purposes")
-    public String getDefaultDisplayName() {
-        return defaultDisplayName;
-    }
-
-    public void setDefaultDisplayName(String defaultDisplayName) {
-        this.defaultDisplayName = defaultDisplayName;
-    }
-
-    public GermplasmNewRequest documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public GermplasmNewRequest donors(List<GermplasmDonors> donors) {
-        this.donors = donors;
-        return this;
-    }
-
-    public GermplasmNewRequest addDonorsItem(GermplasmDonors donorsItem) {
-        if (this.donors == null) {
-            this.donors = new ArrayList<GermplasmDonors>();
-        }
-        this.donors.add(donorsItem);
-        return this;
-    }
-
-    /**
-     * List of donor institutes
-     *
-     * @return donors
-     **/
-    @Schema(description = "List of donor institutes")
-    public List<GermplasmDonors> getDonors() {
-        return donors;
-    }
-
-    public void setDonors(List<GermplasmDonors> donors) {
-        this.donors = donors;
-    }
-
-    public GermplasmNewRequest externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public GermplasmNewRequest addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public GermplasmNewRequest genus(String genus) {
-        this.genus = genus;
-        return this;
-    }
-
-    /**
-     * Genus name for taxon. Initial uppercase letter required.  MCPD (v2.1) (GENUS) 5. Genus name for taxon. Initial uppercase letter required.  MIAPPE V1.1 (DM-43) Genus - Genus name for the organism under study, according to standard scientific nomenclature.
-     *
-     * @return genus
-     **/
-    @Schema(example = "Aspergillus", description = "Genus name for taxon. Initial uppercase letter required.  MCPD (v2.1) (GENUS) 5. Genus name for taxon. Initial uppercase letter required.  MIAPPE V1.1 (DM-43) Genus - Genus name for the organism under study, according to standard scientific nomenclature.")
-    public String getGenus() {
-        return genus;
-    }
-
-    public void setGenus(String genus) {
-        this.genus = genus;
-    }
-
-    public GermplasmNewRequest germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * Name of the germplasm. It can be the preferred name and does not have to be unique.  MCPD (v2.1) (ACCENAME) 11. Either a registered or other designation given to the material received, other than the donors accession number (23) or collecting number (3). First letter uppercase. Multiple names are separated by a semicolon without space.
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000003", required = true, description = "Name of the germplasm. It can be the preferred name and does not have to be unique.  MCPD (v2.1) (ACCENAME) 11. Either a registered or other designation given to the material received, other than the donors accession number (23) or collecting number (3). First letter uppercase. Multiple names are separated by a semicolon without space.")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public GermplasmNewRequest germplasmOrigin(List<GermplasmGermplasmOrigin> germplasmOrigin) {
-        this.germplasmOrigin = germplasmOrigin;
-        return this;
-    }
-
-    public GermplasmNewRequest addGermplasmOriginItem(GermplasmGermplasmOrigin germplasmOriginItem) {
-        if (this.germplasmOrigin == null) {
-            this.germplasmOrigin = new ArrayList<GermplasmGermplasmOrigin>();
-        }
-        this.germplasmOrigin.add(germplasmOriginItem);
-        return this;
-    }
-
-    /**
-     * Information for material (orchard, natural sites, ...). Geographic identification of the plants from which seeds or cutting have been taken to produce that germplasm.
-     *
-     * @return germplasmOrigin
-     **/
-    @Schema(description = "Information for material (orchard, natural sites, ...). Geographic identification of the plants from which seeds or cutting have been taken to produce that germplasm.")
-    public List<GermplasmGermplasmOrigin> getGermplasmOrigin() {
-        return germplasmOrigin;
-    }
-
-    public void setGermplasmOrigin(List<GermplasmGermplasmOrigin> germplasmOrigin) {
-        this.germplasmOrigin = germplasmOrigin;
-    }
-
-    public GermplasmNewRequest germplasmPUI(String germplasmPUI) {
-        this.germplasmPUI = germplasmPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier which represents a germplasm  MIAPPE V1.1 (DM-41) Biological material ID - Code used to identify the biological material in the data file. Should be unique within the Investigation. Can correspond to experimental plant ID, seed lot ID, etc This material identification is different from a BiosampleID which corresponds to Observation Unit or Samples sections below.  MIAPPE V1.1 (DM-51) Material source DOI - Digital Object Identifier (DOI) of the material source  MCPD (v2.1) (PUID) 0. Any persistent, unique identifier assigned to the accession so it can be unambiguously referenced at the global level and the information associated with it harvested through automated means. Report one PUID for each accession. The Secretariat of the International Treaty on Plant Genetic Resources for Food and Agriculture (PGRFA) is facilitating the assignment of a persistent unique identifier (PUID), in the form of a DOI, to PGRFA at the accession level. Genebanks not applying a true PUID to their accessions should use, and request recipients to use, the concatenation of INSTCODE, ACCENUMB, and GENUS as a globally unique identifier similar in most respects to the PUID whenever they exchange information on accessions with third parties.
-     *
-     * @return germplasmPUI
-     **/
-    @Schema(example = "http://pui.per/accession/A0000003", required = true, description = "The Permanent Unique Identifier which represents a germplasm  MIAPPE V1.1 (DM-41) Biological material ID - Code used to identify the biological material in the data file. Should be unique within the Investigation. Can correspond to experimental plant ID, seed lot ID, etc This material identification is different from a BiosampleID which corresponds to Observation Unit or Samples sections below.  MIAPPE V1.1 (DM-51) Material source DOI - Digital Object Identifier (DOI) of the material source  MCPD (v2.1) (PUID) 0. Any persistent, unique identifier assigned to the accession so it can be unambiguously referenced at the global level and the information associated with it harvested through automated means. Report one PUID for each accession. The Secretariat of the International Treaty on Plant Genetic Resources for Food and Agriculture (PGRFA) is facilitating the assignment of a persistent unique identifier (PUID), in the form of a DOI, to PGRFA at the accession level. Genebanks not applying a true PUID to their accessions should use, and request recipients to use, the concatenation of INSTCODE, ACCENUMB, and GENUS as a globally unique identifier similar in most respects to the PUID whenever they exchange information on accessions with third parties.")
-    public String getGermplasmPUI() {
-        return germplasmPUI;
-    }
-
-    public void setGermplasmPUI(String germplasmPUI) {
-        this.germplasmPUI = germplasmPUI;
-    }
-
-    public GermplasmNewRequest germplasmPreprocessing(String germplasmPreprocessing) {
-        this.germplasmPreprocessing = germplasmPreprocessing;
-        return this;
-    }
-
-    /**
-     * Description of any process or treatment applied uniformly to the germplasm, prior to the study itself. Can be provided as free text or as an accession number from a suitable controlled vocabulary.
-     *
-     * @return germplasmPreprocessing
-     **/
-    @Schema(example = "EO:0007210; transplanted from study 2351 observation unit ID: pot:894", description = "Description of any process or treatment applied uniformly to the germplasm, prior to the study itself. Can be provided as free text or as an accession number from a suitable controlled vocabulary.")
-    public String getGermplasmPreprocessing() {
-        return germplasmPreprocessing;
-    }
-
-    public void setGermplasmPreprocessing(String germplasmPreprocessing) {
-        this.germplasmPreprocessing = germplasmPreprocessing;
-    }
-
-    public GermplasmNewRequest instituteCode(String instituteCode) {
-        this.instituteCode = instituteCode;
-        return this;
-    }
-
-    /**
-     * The code for the institute that maintains the material.   MCPD (v2.1) (INSTCODE) 1. FAO WIEWS code of the institute where the accession is maintained. The codes consist of the 3-letter ISO 3166 country code of the country where the institute is located plus a number (e.g. PER001). The current set of institute codes is available from http://www.fao.org/wiews. For those institutes not yet having an FAO Code, or for those with \&quot;obsolete\&quot; codes, see \&quot;Common formatting rules (v)\&quot;.
-     *
-     * @return instituteCode
-     **/
-    @Schema(example = "PER001", description = "The code for the institute that maintains the material.   MCPD (v2.1) (INSTCODE) 1. FAO WIEWS code of the institute where the accession is maintained. The codes consist of the 3-letter ISO 3166 country code of the country where the institute is located plus a number (e.g. PER001). The current set of institute codes is available from http://www.fao.org/wiews. For those institutes not yet having an FAO Code, or for those with \"obsolete\" codes, see \"Common formatting rules (v)\".")
-    public String getInstituteCode() {
-        return instituteCode;
-    }
-
-    public void setInstituteCode(String instituteCode) {
-        this.instituteCode = instituteCode;
-    }
-
-    public GermplasmNewRequest instituteName(String instituteName) {
-        this.instituteName = instituteName;
-        return this;
-    }
-
-    /**
-     * The name of the institute that maintains the material
-     *
-     * @return instituteName
-     **/
-    @Schema(example = "The BrAPI Institute", description = "The name of the institute that maintains the material")
-    public String getInstituteName() {
-        return instituteName;
-    }
-
-    public void setInstituteName(String instituteName) {
-        this.instituteName = instituteName;
-    }
-
-    public GermplasmNewRequest pedigree(String pedigree) {
-        this.pedigree = pedigree;
-        return this;
-    }
-
-    /**
-     * The cross name and optional selection history.  MCPD (v2.1) (ANCEST) 20. Information about either pedigree or other description of ancestral information (e.g. parent variety in case of mutant or selection). For example a pedigree &#x27;Hanna/7*Atlas//Turk/8*Atlas&#x27; or a description &#x27;mutation found in Hanna&#x27;, &#x27;selection from Irene&#x27; or &#x27;cross involving amongst others Hanna and Irene&#x27;.
-     *
-     * @return pedigree
-     **/
-    @Schema(example = "A0000001/A0000002", description = "The cross name and optional selection history.  MCPD (v2.1) (ANCEST) 20. Information about either pedigree or other description of ancestral information (e.g. parent variety in case of mutant or selection). For example a pedigree 'Hanna/7*Atlas//Turk/8*Atlas' or a description 'mutation found in Hanna', 'selection from Irene' or 'cross involving amongst others Hanna and Irene'.")
-    public String getPedigree() {
-        return pedigree;
-    }
-
-    public void setPedigree(String pedigree) {
-        this.pedigree = pedigree;
-    }
-
-    public GermplasmNewRequest seedSource(String seedSource) {
-        this.seedSource = seedSource;
-        return this;
-    }
-
-    /**
-     * An identifier for the source of the biological material &lt;br/&gt;MIAPPE V1.1 (DM-50) Material source ID (Holding institute/stock centre, accession) - An identifier for the source of the biological material, in the form of a key-value pair comprising the name/identifier of the repository from which the material was sourced plus the accession number of the repository for that material. Where an accession number has not been assigned, but the material has been derived from the crossing of known accessions, the material can be defined as follows: \&quot;mother_accession X father_accession\&quot;, or, if father is unknown, as \&quot;mother_accession X UNKNOWN\&quot;. For in situ material, the region of provenance may be used when an accession is not available.
-     *
-     * @return seedSource
-     **/
-    @Schema(example = "INRA:095115_inra", description = "An identifier for the source of the biological material <br/>MIAPPE V1.1 (DM-50) Material source ID (Holding institute/stock centre, accession) - An identifier for the source of the biological material, in the form of a key-value pair comprising the name/identifier of the repository from which the material was sourced plus the accession number of the repository for that material. Where an accession number has not been assigned, but the material has been derived from the crossing of known accessions, the material can be defined as follows: \"mother_accession X father_accession\", or, if father is unknown, as \"mother_accession X UNKNOWN\". For in situ material, the region of provenance may be used when an accession is not available.")
-    public String getSeedSource() {
-        return seedSource;
-    }
-
-    public void setSeedSource(String seedSource) {
-        this.seedSource = seedSource;
-    }
-
-    public GermplasmNewRequest seedSourceDescription(String seedSourceDescription) {
-        this.seedSourceDescription = seedSourceDescription;
-        return this;
-    }
-
-    /**
-     * Description of the material source  MIAPPE V1.1 (DM-56) Material source description - Description of the material source
-     *
-     * @return seedSourceDescription
-     **/
-    @Schema(example = "Branches were collected from a 10-year-old tree growing in a progeny trial established in a loamy brown earth soil.", description = "Description of the material source  MIAPPE V1.1 (DM-56) Material source description - Description of the material source")
-    public String getSeedSourceDescription() {
-        return seedSourceDescription;
-    }
-
-    public void setSeedSourceDescription(String seedSourceDescription) {
-        this.seedSourceDescription = seedSourceDescription;
-    }
-
-    public GermplasmNewRequest species(String species) {
-        this.species = species;
-        return this;
-    }
-
-    /**
-     * Specific epithet portion of the scientific name in lowercase letters.  MCPD (v2.1) (SPECIES) 6. Specific epithet portion of the scientific name in lowercase letters. Only the following abbreviation is allowed: \&quot;sp.\&quot;   MIAPPE V1.1 (DM-44) Species - Species name (formally: specific epithet) for the organism under study, according to standard scientific nomenclature.
-     *
-     * @return species
-     **/
-    @Schema(example = "fructus", description = "Specific epithet portion of the scientific name in lowercase letters.  MCPD (v2.1) (SPECIES) 6. Specific epithet portion of the scientific name in lowercase letters. Only the following abbreviation is allowed: \"sp.\"   MIAPPE V1.1 (DM-44) Species - Species name (formally: specific epithet) for the organism under study, according to standard scientific nomenclature.")
-    public String getSpecies() {
-        return species;
-    }
-
-    public void setSpecies(String species) {
-        this.species = species;
-    }
-
-    public GermplasmNewRequest speciesAuthority(String speciesAuthority) {
-        this.speciesAuthority = speciesAuthority;
-        return this;
-    }
-
-    /**
-     * The authority organization responsible for tracking and maintaining the species name   MCPD (v2.1) (SPAUTHOR) 7. Provide the authority for the species name.
-     *
-     * @return speciesAuthority
-     **/
-    @Schema(example = "Smith, 1822", description = "The authority organization responsible for tracking and maintaining the species name   MCPD (v2.1) (SPAUTHOR) 7. Provide the authority for the species name.")
-    public String getSpeciesAuthority() {
-        return speciesAuthority;
-    }
-
-    public void setSpeciesAuthority(String speciesAuthority) {
-        this.speciesAuthority = speciesAuthority;
-    }
-
-    public GermplasmNewRequest storageTypes(List<GermplasmStorageTypes> storageTypes) {
-        this.storageTypes = storageTypes;
-        return this;
-    }
-
-    public GermplasmNewRequest addStorageTypesItem(GermplasmStorageTypes storageTypesItem) {
-        if (this.storageTypes == null) {
-            this.storageTypes = new ArrayList<GermplasmStorageTypes>();
-        }
-        this.storageTypes.add(storageTypesItem);
-        return this;
-    }
-
-    /**
-     * The type of storage this germplasm is kept in at a genebank.
-     *
-     * @return storageTypes
-     **/
-    @Schema(example = "[{\"code\":\"20\",\"description\":\"Field collection\"},{\"code\":\"11\",\"description\":\"Short term\"}]", description = "The type of storage this germplasm is kept in at a genebank.")
-    public List<GermplasmStorageTypes> getStorageTypes() {
-        return storageTypes;
-    }
-
-    public void setStorageTypes(List<GermplasmStorageTypes> storageTypes) {
-        this.storageTypes = storageTypes;
-    }
-
-    public GermplasmNewRequest subtaxa(String subtaxa) {
-        this.subtaxa = subtaxa;
-        return this;
-    }
-
-    /**
-     * Subtaxon can be used to store any additional taxonomic identifier.  MCPD (v2.1) (SUBTAXA) 8. Subtaxon can be used to store any additional taxonomic identifier. The following abbreviations are allowed: \&quot;subsp.\&quot; (for subspecies); \&quot;convar.\&quot; (for convariety); \&quot;var.\&quot; (for variety); \&quot;f.\&quot; (for form); \&quot;Group\&quot; (for \&quot;cultivar group\&quot;).  MIAPPE V1.1 (DM-44) Infraspecific name - Name of any subtaxa level, including variety, crossing name, etc. It can be used to store any additional taxonomic identifier. Either free text description or key-value pair list format (the key is the name of the rank and the value is the value of  the rank). Ranks can be among the following terms: subspecies, cultivar, variety, subvariety, convariety, group, subgroup, hybrid, line, form, subform. For MCPD compliance, the following abbreviations are allowed: subsp. (subspecies); convar. (convariety); var. (variety); f. (form); Group (cultivar group).
-     *
-     * @return subtaxa
-     **/
-    @Schema(example = "Aspergillus fructus A", description = "Subtaxon can be used to store any additional taxonomic identifier.  MCPD (v2.1) (SUBTAXA) 8. Subtaxon can be used to store any additional taxonomic identifier. The following abbreviations are allowed: \"subsp.\" (for subspecies); \"convar.\" (for convariety); \"var.\" (for variety); \"f.\" (for form); \"Group\" (for \"cultivar group\").  MIAPPE V1.1 (DM-44) Infraspecific name - Name of any subtaxa level, including variety, crossing name, etc. It can be used to store any additional taxonomic identifier. Either free text description or key-value pair list format (the key is the name of the rank and the value is the value of  the rank). Ranks can be among the following terms: subspecies, cultivar, variety, subvariety, convariety, group, subgroup, hybrid, line, form, subform. For MCPD compliance, the following abbreviations are allowed: subsp. (subspecies); convar. (convariety); var. (variety); f. (form); Group (cultivar group).")
-    public String getSubtaxa() {
-        return subtaxa;
-    }
-
-    public void setSubtaxa(String subtaxa) {
-        this.subtaxa = subtaxa;
-    }
-
-    public GermplasmNewRequest subtaxaAuthority(String subtaxaAuthority) {
-        this.subtaxaAuthority = subtaxaAuthority;
-        return this;
-    }
-
-    /**
-     * The authority organization responsible for tracking and maintaining the subtaxon information  MCPD (v2.1) (SUBTAUTHOR) 9. Provide the subtaxon authority at the most detailed taxonomic level.
-     *
-     * @return subtaxaAuthority
-     **/
-    @Schema(example = "Smith, 1822", description = "The authority organization responsible for tracking and maintaining the subtaxon information  MCPD (v2.1) (SUBTAUTHOR) 9. Provide the subtaxon authority at the most detailed taxonomic level.")
-    public String getSubtaxaAuthority() {
-        return subtaxaAuthority;
-    }
-
-    public void setSubtaxaAuthority(String subtaxaAuthority) {
-        this.subtaxaAuthority = subtaxaAuthority;
-    }
-
-    public GermplasmNewRequest synonyms(List<GermplasmSynonyms> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public GermplasmNewRequest addSynonymsItem(GermplasmSynonyms synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<GermplasmSynonyms>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * List of alternative names or IDs used to reference this germplasm  MCPD (v2.1) (OTHERNUMB) 24. Any other identifiers known to exist in other collections for this accession. Use the following format: INSTCODE:ACCENUMB;INSTCODE:identifier;INSTCODE and identifier are separated by a colon without space. Pairs of INSTCODE and identifier are separated by a semicolon without space. When the institute is not known, the identifier should be preceded by a colon.
-     *
-     * @return synonyms
-     **/
-    @Schema(description = "List of alternative names or IDs used to reference this germplasm  MCPD (v2.1) (OTHERNUMB) 24. Any other identifiers known to exist in other collections for this accession. Use the following format: INSTCODE:ACCENUMB;INSTCODE:identifier;INSTCODE and identifier are separated by a colon without space. Pairs of INSTCODE and identifier are separated by a semicolon without space. When the institute is not known, the identifier should be preceded by a colon.")
-    public List<GermplasmSynonyms> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<GermplasmSynonyms> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public GermplasmNewRequest taxonIds(List<GermplasmTaxonIds> taxonIds) {
-        this.taxonIds = taxonIds;
-        return this;
-    }
-
-    public GermplasmNewRequest addTaxonIdsItem(GermplasmTaxonIds taxonIdsItem) {
-        if (this.taxonIds == null) {
-            this.taxonIds = new ArrayList<GermplasmTaxonIds>();
-        }
-        this.taxonIds.add(taxonIdsItem);
-        return this;
-    }
-
-    /**
-     * The list of IDs for this SPECIES from different sources. If present, NCBI Taxon should be always listed as \&quot;ncbiTaxon\&quot; preferably with a purl. The rank of this ID should be species.  MIAPPE V1.1 (DM-42) Organism - An identifier for the organism at the species level. Use of the NCBI taxon ID is recommended.
-     *
-     * @return taxonIds
-     **/
-    @Schema(description = "The list of IDs for this SPECIES from different sources. If present, NCBI Taxon should be always listed as \"ncbiTaxon\" preferably with a purl. The rank of this ID should be species.  MIAPPE V1.1 (DM-42) Organism - An identifier for the organism at the species level. Use of the NCBI taxon ID is recommended.")
-    public List<GermplasmTaxonIds> getTaxonIds() {
-        return taxonIds;
-    }
-
-    public void setTaxonIds(List<GermplasmTaxonIds> taxonIds) {
-        this.taxonIds = taxonIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmNewRequest germplasmNewRequest = (GermplasmNewRequest) o;
-        return Objects.equals(this.accessionNumber, germplasmNewRequest.accessionNumber) &&
-                Objects.equals(this.acquisitionDate, germplasmNewRequest.acquisitionDate) &&
-                Objects.equals(this.additionalInfo, germplasmNewRequest.additionalInfo) &&
-                Objects.equals(this.biologicalStatusOfAccessionCode, germplasmNewRequest.biologicalStatusOfAccessionCode) &&
-                Objects.equals(this.biologicalStatusOfAccessionDescription, germplasmNewRequest.biologicalStatusOfAccessionDescription) &&
-                Objects.equals(this.breedingMethodDbId, germplasmNewRequest.breedingMethodDbId) &&
-                Objects.equals(this.breedingMethodName, germplasmNewRequest.breedingMethodName) &&
-                Objects.equals(this.collection, germplasmNewRequest.collection) &&
-                Objects.equals(this.commonCropName, germplasmNewRequest.commonCropName) &&
-                Objects.equals(this.countryOfOriginCode, germplasmNewRequest.countryOfOriginCode) &&
-                Objects.equals(this.defaultDisplayName, germplasmNewRequest.defaultDisplayName) &&
-                Objects.equals(this.documentationURL, germplasmNewRequest.documentationURL) &&
-                Objects.equals(this.donors, germplasmNewRequest.donors) &&
-                Objects.equals(this.externalReferences, germplasmNewRequest.externalReferences) &&
-                Objects.equals(this.genus, germplasmNewRequest.genus) &&
-                Objects.equals(this.germplasmName, germplasmNewRequest.germplasmName) &&
-                Objects.equals(this.germplasmOrigin, germplasmNewRequest.germplasmOrigin) &&
-                Objects.equals(this.germplasmPUI, germplasmNewRequest.germplasmPUI) &&
-                Objects.equals(this.germplasmPreprocessing, germplasmNewRequest.germplasmPreprocessing) &&
-                Objects.equals(this.instituteCode, germplasmNewRequest.instituteCode) &&
-                Objects.equals(this.instituteName, germplasmNewRequest.instituteName) &&
-                Objects.equals(this.pedigree, germplasmNewRequest.pedigree) &&
-                Objects.equals(this.seedSource, germplasmNewRequest.seedSource) &&
-                Objects.equals(this.seedSourceDescription, germplasmNewRequest.seedSourceDescription) &&
-                Objects.equals(this.species, germplasmNewRequest.species) &&
-                Objects.equals(this.speciesAuthority, germplasmNewRequest.speciesAuthority) &&
-                Objects.equals(this.storageTypes, germplasmNewRequest.storageTypes) &&
-                Objects.equals(this.subtaxa, germplasmNewRequest.subtaxa) &&
-                Objects.equals(this.subtaxaAuthority, germplasmNewRequest.subtaxaAuthority) &&
-                Objects.equals(this.synonyms, germplasmNewRequest.synonyms) &&
-                Objects.equals(this.taxonIds, germplasmNewRequest.taxonIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(accessionNumber, acquisitionDate, additionalInfo, biologicalStatusOfAccessionCode, biologicalStatusOfAccessionDescription, breedingMethodDbId, breedingMethodName, collection, commonCropName, countryOfOriginCode, defaultDisplayName, documentationURL, donors, externalReferences, genus, germplasmName, germplasmOrigin, germplasmPUI, germplasmPreprocessing, instituteCode, instituteName, pedigree, seedSource, seedSourceDescription, species, speciesAuthority, storageTypes, subtaxa, subtaxaAuthority, synonyms, taxonIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmNewRequest {\n");
-
-        sb.append("    accessionNumber: ").append(toIndentedString(accessionNumber)).append("\n");
-        sb.append("    acquisitionDate: ").append(toIndentedString(acquisitionDate)).append("\n");
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    biologicalStatusOfAccessionCode: ").append(toIndentedString(biologicalStatusOfAccessionCode)).append("\n");
-        sb.append("    biologicalStatusOfAccessionDescription: ").append(toIndentedString(biologicalStatusOfAccessionDescription)).append("\n");
-        sb.append("    breedingMethodDbId: ").append(toIndentedString(breedingMethodDbId)).append("\n");
-        sb.append("    breedingMethodName: ").append(toIndentedString(breedingMethodName)).append("\n");
-        sb.append("    collection: ").append(toIndentedString(collection)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    countryOfOriginCode: ").append(toIndentedString(countryOfOriginCode)).append("\n");
-        sb.append("    defaultDisplayName: ").append(toIndentedString(defaultDisplayName)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    donors: ").append(toIndentedString(donors)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    genus: ").append(toIndentedString(genus)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    germplasmOrigin: ").append(toIndentedString(germplasmOrigin)).append("\n");
-        sb.append("    germplasmPUI: ").append(toIndentedString(germplasmPUI)).append("\n");
-        sb.append("    germplasmPreprocessing: ").append(toIndentedString(germplasmPreprocessing)).append("\n");
-        sb.append("    instituteCode: ").append(toIndentedString(instituteCode)).append("\n");
-        sb.append("    instituteName: ").append(toIndentedString(instituteName)).append("\n");
-        sb.append("    pedigree: ").append(toIndentedString(pedigree)).append("\n");
-        sb.append("    seedSource: ").append(toIndentedString(seedSource)).append("\n");
-        sb.append("    seedSourceDescription: ").append(toIndentedString(seedSourceDescription)).append("\n");
-        sb.append("    species: ").append(toIndentedString(species)).append("\n");
-        sb.append("    speciesAuthority: ").append(toIndentedString(speciesAuthority)).append("\n");
-        sb.append("    storageTypes: ").append(toIndentedString(storageTypes)).append("\n");
-        sb.append("    subtaxa: ").append(toIndentedString(subtaxa)).append("\n");
-        sb.append("    subtaxaAuthority: ").append(toIndentedString(subtaxaAuthority)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    taxonIds: ").append(toIndentedString(taxonIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmOrigin.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmOrigin.java
deleted file mode 100644
index 6c6a7f2e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmOrigin.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * MIAPPE V1.1 (DM-52)   MIAPPE V1.1 (DM-53)   MIAPPE V1.1 (DM-54)   MIAPPE V1.1 (DM-55)  MCPD (v2.1) (COORDUNCERT) 15.5   MCPD (v2.1) (ELEVATION) 16.   MCPD (v2.1) (GEOREFMETH) 15.7   MCPD (v2.1) (DECLATITUDE) 15.1   MCPD (v2.1) (DECLONGITUDE) 15.3
- */
-@Schema(description = "MIAPPE V1.1 (DM-52)   MIAPPE V1.1 (DM-53)   MIAPPE V1.1 (DM-54)   MIAPPE V1.1 (DM-55)  MCPD (v2.1) (COORDUNCERT) 15.5   MCPD (v2.1) (ELEVATION) 16.   MCPD (v2.1) (GEOREFMETH) 15.7   MCPD (v2.1) (DECLATITUDE) 15.1   MCPD (v2.1) (DECLONGITUDE) 15.3 ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmOrigin {
-    @SerializedName("coordinateUncertainty")
-    private String coordinateUncertainty = null;
-
-    @SerializedName("coordinates")
-    private GeoJSON coordinates = null;
-
-    public GermplasmOrigin coordinateUncertainty(String coordinateUncertainty) {
-        this.coordinateUncertainty = coordinateUncertainty;
-        return this;
-    }
-
-    /**
-     * Uncertainty associated with the coordinates in meters. Leave the value empty if the uncertainty is unknown.
-     *
-     * @return coordinateUncertainty
-     **/
-    @Schema(example = "20", description = "Uncertainty associated with the coordinates in meters. Leave the value empty if the uncertainty is unknown.")
-    public String getCoordinateUncertainty() {
-        return coordinateUncertainty;
-    }
-
-    public void setCoordinateUncertainty(String coordinateUncertainty) {
-        this.coordinateUncertainty = coordinateUncertainty;
-    }
-
-    public GermplasmOrigin coordinates(GeoJSON coordinates) {
-        this.coordinates = coordinates;
-        return this;
-    }
-
-    /**
-     * Get coordinates
-     *
-     * @return coordinates
-     **/
-    @Schema(description = "")
-    public GeoJSON getCoordinates() {
-        return coordinates;
-    }
-
-    public void setCoordinates(GeoJSON coordinates) {
-        this.coordinates = coordinates;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmOrigin germplasmOrigin = (GermplasmOrigin) o;
-        return Objects.equals(this.coordinateUncertainty, germplasmOrigin.coordinateUncertainty) &&
-                Objects.equals(this.coordinates, germplasmOrigin.coordinates);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(coordinateUncertainty, coordinates);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmOrigin {\n");
-
-        sb.append("    coordinateUncertainty: ").append(toIndentedString(coordinateUncertainty)).append("\n");
-        sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmPedigreeResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmPedigreeResponse.java
deleted file mode 100644
index 36187ae6..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmPedigreeResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * GermplasmPedigreeResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmPedigreeResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private PedigreeNodeDEP result = null;
-
-    public GermplasmPedigreeResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public GermplasmPedigreeResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public GermplasmPedigreeResponse result(PedigreeNodeDEP result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public PedigreeNodeDEP getResult() {
-        return result;
-    }
-
-    public void setResult(PedigreeNodeDEP result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmPedigreeResponse germplasmPedigreeResponse = (GermplasmPedigreeResponse) o;
-        return Objects.equals(this._atContext, germplasmPedigreeResponse._atContext) &&
-                Objects.equals(this.metadata, germplasmPedigreeResponse.metadata) &&
-                Objects.equals(this.result, germplasmPedigreeResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmPedigreeResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmProgenyResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmProgenyResponse.java
deleted file mode 100644
index c5c2188f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmProgenyResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * GermplasmProgenyResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmProgenyResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ProgenyNodeDEP result = null;
-
-    public GermplasmProgenyResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public GermplasmProgenyResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public GermplasmProgenyResponse result(ProgenyNodeDEP result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ProgenyNodeDEP getResult() {
-        return result;
-    }
-
-    public void setResult(ProgenyNodeDEP result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmProgenyResponse germplasmProgenyResponse = (GermplasmProgenyResponse) o;
-        return Objects.equals(this._atContext, germplasmProgenyResponse._atContext) &&
-                Objects.equals(this.metadata, germplasmProgenyResponse.metadata) &&
-                Objects.equals(this.result, germplasmProgenyResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmProgenyResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmSearchRequest.java
deleted file mode 100644
index 04a903b4..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmSearchRequest.java
+++ /dev/null
@@ -1,850 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * GermplasmSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmSearchRequest {
-    @SerializedName("accessionNumbers")
-    private List<String> accessionNumbers = null;
-
-    @SerializedName("binomialNames")
-    private List<String> binomialNames = null;
-
-    @SerializedName("collections")
-    private List<String> collections = null;
-
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("familyCodes")
-    private List<String> familyCodes = null;
-
-    @SerializedName("genus")
-    private List<String> genus = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("germplasmPUIs")
-    private List<String> germplasmPUIs = null;
-
-    @SerializedName("instituteCodes")
-    private List<String> instituteCodes = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("parentDbIds")
-    private List<String> parentDbIds = null;
-
-    @SerializedName("progenyDbIds")
-    private List<String> progenyDbIds = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("species")
-    private List<String> species = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public GermplasmSearchRequest accessionNumbers(List<String> accessionNumbers) {
-        this.accessionNumbers = accessionNumbers;
-        return this;
-    }
-
-    public GermplasmSearchRequest addAccessionNumbersItem(String accessionNumbersItem) {
-        if (this.accessionNumbers == null) {
-            this.accessionNumbers = new ArrayList<String>();
-        }
-        this.accessionNumbers.add(accessionNumbersItem);
-        return this;
-    }
-
-    /**
-     * A collection of unique identifiers for materials or germplasm within a genebank  MCPD (v2.1) (ACCENUMB) 2. This is the unique identifier for accessions within a genebank, and is assigned when a sample is entered into the genebank collection (e.g. \&quot;PI 113869\&quot;).
-     *
-     * @return accessionNumbers
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "A collection of unique identifiers for materials or germplasm within a genebank  MCPD (v2.1) (ACCENUMB) 2. This is the unique identifier for accessions within a genebank, and is assigned when a sample is entered into the genebank collection (e.g. \"PI 113869\").")
-    public List<String> getAccessionNumbers() {
-        return accessionNumbers;
-    }
-
-    public void setAccessionNumbers(List<String> accessionNumbers) {
-        this.accessionNumbers = accessionNumbers;
-    }
-
-    public GermplasmSearchRequest binomialNames(List<String> binomialNames) {
-        this.binomialNames = binomialNames;
-        return this;
-    }
-
-    public GermplasmSearchRequest addBinomialNamesItem(String binomialNamesItem) {
-        if (this.binomialNames == null) {
-            this.binomialNames = new ArrayList<String>();
-        }
-        this.binomialNames.add(binomialNamesItem);
-        return this;
-    }
-
-    /**
-     * List of the full binomial name (scientific name) to identify a germplasm
-     *
-     * @return binomialNames
-     **/
-    @Schema(example = "[\"Aspergillus fructus\",\"Zea mays\"]", description = "List of the full binomial name (scientific name) to identify a germplasm")
-    public List<String> getBinomialNames() {
-        return binomialNames;
-    }
-
-    public void setBinomialNames(List<String> binomialNames) {
-        this.binomialNames = binomialNames;
-    }
-
-    public GermplasmSearchRequest collections(List<String> collections) {
-        this.collections = collections;
-        return this;
-    }
-
-    public GermplasmSearchRequest addCollectionsItem(String collectionsItem) {
-        if (this.collections == null) {
-            this.collections = new ArrayList<String>();
-        }
-        this.collections.add(collectionsItem);
-        return this;
-    }
-
-    /**
-     * A specific panel/collection/population name this germplasm belongs to.
-     *
-     * @return collections
-     **/
-    @Schema(example = "[\"RDP1\",\"MDP1\"]", description = "A specific panel/collection/population name this germplasm belongs to.")
-    public List<String> getCollections() {
-        return collections;
-    }
-
-    public void setCollections(List<String> collections) {
-        this.collections = collections;
-    }
-
-    public GermplasmSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public GermplasmSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public GermplasmSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public GermplasmSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public GermplasmSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public GermplasmSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public GermplasmSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public GermplasmSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public GermplasmSearchRequest familyCodes(List<String> familyCodes) {
-        this.familyCodes = familyCodes;
-        return this;
-    }
-
-    public GermplasmSearchRequest addFamilyCodesItem(String familyCodesItem) {
-        if (this.familyCodes == null) {
-            this.familyCodes = new ArrayList<String>();
-        }
-        this.familyCodes.add(familyCodesItem);
-        return this;
-    }
-
-    /**
-     * A familyCode representing the family this germplasm belongs to.
-     *
-     * @return familyCodes
-     **/
-    @Schema(example = "[\"fa000203\",\"fa009965\"]", description = "A familyCode representing the family this germplasm belongs to.")
-    public List<String> getFamilyCodes() {
-        return familyCodes;
-    }
-
-    public void setFamilyCodes(List<String> familyCodes) {
-        this.familyCodes = familyCodes;
-    }
-
-    public GermplasmSearchRequest genus(List<String> genus) {
-        this.genus = genus;
-        return this;
-    }
-
-    public GermplasmSearchRequest addGenusItem(String genusItem) {
-        if (this.genus == null) {
-            this.genus = new ArrayList<String>();
-        }
-        this.genus.add(genusItem);
-        return this;
-    }
-
-    /**
-     * List of Genus names to identify germplasm
-     *
-     * @return genus
-     **/
-    @Schema(example = "[\"Aspergillus\",\"Zea\"]", description = "List of Genus names to identify germplasm")
-    public List<String> getGenus() {
-        return genus;
-    }
-
-    public void setGenus(List<String> genus) {
-        this.genus = genus;
-    }
-
-    public GermplasmSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public GermplasmSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public GermplasmSearchRequest germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public GermplasmSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public GermplasmSearchRequest germplasmPUIs(List<String> germplasmPUIs) {
-        this.germplasmPUIs = germplasmPUIs;
-        return this;
-    }
-
-    public GermplasmSearchRequest addGermplasmPUIsItem(String germplasmPUIsItem) {
-        if (this.germplasmPUIs == null) {
-            this.germplasmPUIs = new ArrayList<String>();
-        }
-        this.germplasmPUIs.add(germplasmPUIsItem);
-        return this;
-    }
-
-    /**
-     * List of Permanent Unique Identifiers to identify germplasm
-     *
-     * @return germplasmPUIs
-     **/
-    @Schema(example = "[\"http://pui.per/accession/A0000003\",\"http://pui.per/accession/A0000477\"]", description = "List of Permanent Unique Identifiers to identify germplasm")
-    public List<String> getGermplasmPUIs() {
-        return germplasmPUIs;
-    }
-
-    public void setGermplasmPUIs(List<String> germplasmPUIs) {
-        this.germplasmPUIs = germplasmPUIs;
-    }
-
-    public GermplasmSearchRequest instituteCodes(List<String> instituteCodes) {
-        this.instituteCodes = instituteCodes;
-        return this;
-    }
-
-    public GermplasmSearchRequest addInstituteCodesItem(String instituteCodesItem) {
-        if (this.instituteCodes == null) {
-            this.instituteCodes = new ArrayList<String>();
-        }
-        this.instituteCodes.add(instituteCodesItem);
-        return this;
-    }
-
-    /**
-     * The code for the institute that maintains the material.  &lt;br/&gt; MCPD (v2.1) (INSTCODE) 1. FAO WIEWS code of the institute where the accession is maintained. The codes consist of the 3-letter ISO 3166 country code of the country where the institute is located plus a number (e.g. PER001). The current set of institute codes is available from http://www.fao.org/wiews. For those institutes not yet having an FAO Code, or for those with \&quot;obsolete\&quot; codes, see \&quot;Common formatting rules (v)\&quot;.
-     *
-     * @return instituteCodes
-     **/
-    @Schema(example = "[\"PER001\",\"NOR001\"]", description = "The code for the institute that maintains the material.  <br/> MCPD (v2.1) (INSTCODE) 1. FAO WIEWS code of the institute where the accession is maintained. The codes consist of the 3-letter ISO 3166 country code of the country where the institute is located plus a number (e.g. PER001). The current set of institute codes is available from http://www.fao.org/wiews. For those institutes not yet having an FAO Code, or for those with \"obsolete\" codes, see \"Common formatting rules (v)\".")
-    public List<String> getInstituteCodes() {
-        return instituteCodes;
-    }
-
-    public void setInstituteCodes(List<String> instituteCodes) {
-        this.instituteCodes = instituteCodes;
-    }
-
-    public GermplasmSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public GermplasmSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public GermplasmSearchRequest parentDbIds(List<String> parentDbIds) {
-        this.parentDbIds = parentDbIds;
-        return this;
-    }
-
-    public GermplasmSearchRequest addParentDbIdsItem(String parentDbIdsItem) {
-        if (this.parentDbIds == null) {
-            this.parentDbIds = new ArrayList<String>();
-        }
-        this.parentDbIds.add(parentDbIdsItem);
-        return this;
-    }
-
-    /**
-     * Search for Germplasm with these parents
-     *
-     * @return parentDbIds
-     **/
-    @Schema(example = "[\"72c1001f\",\"7346c553\"]", description = "Search for Germplasm with these parents")
-    public List<String> getParentDbIds() {
-        return parentDbIds;
-    }
-
-    public void setParentDbIds(List<String> parentDbIds) {
-        this.parentDbIds = parentDbIds;
-    }
-
-    public GermplasmSearchRequest progenyDbIds(List<String> progenyDbIds) {
-        this.progenyDbIds = progenyDbIds;
-        return this;
-    }
-
-    public GermplasmSearchRequest addProgenyDbIdsItem(String progenyDbIdsItem) {
-        if (this.progenyDbIds == null) {
-            this.progenyDbIds = new ArrayList<String>();
-        }
-        this.progenyDbIds.add(progenyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * Search for Germplasm with these children
-     *
-     * @return progenyDbIds
-     **/
-    @Schema(example = "[\"16e16a7e\",\"ce06cf9e\"]", description = "Search for Germplasm with these children")
-    public List<String> getProgenyDbIds() {
-        return progenyDbIds;
-    }
-
-    public void setProgenyDbIds(List<String> progenyDbIds) {
-        this.progenyDbIds = progenyDbIds;
-    }
-
-    public GermplasmSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public GermplasmSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public GermplasmSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public GermplasmSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public GermplasmSearchRequest species(List<String> species) {
-        this.species = species;
-        return this;
-    }
-
-    public GermplasmSearchRequest addSpeciesItem(String speciesItem) {
-        if (this.species == null) {
-            this.species = new ArrayList<String>();
-        }
-        this.species.add(speciesItem);
-        return this;
-    }
-
-    /**
-     * List of Species names to identify germplasm
-     *
-     * @return species
-     **/
-    @Schema(example = "[\"fructus\",\"mays\"]", description = "List of Species names to identify germplasm")
-    public List<String> getSpecies() {
-        return species;
-    }
-
-    public void setSpecies(List<String> species) {
-        this.species = species;
-    }
-
-    public GermplasmSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public GermplasmSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public GermplasmSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public GermplasmSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public GermplasmSearchRequest synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public GermplasmSearchRequest addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * List of alternative names or IDs used to reference this germplasm
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"variety_1\",\"2c38f9b6\"]", description = "List of alternative names or IDs used to reference this germplasm")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public GermplasmSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public GermplasmSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public GermplasmSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public GermplasmSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmSearchRequest germplasmSearchRequest = (GermplasmSearchRequest) o;
-        return Objects.equals(this.accessionNumbers, germplasmSearchRequest.accessionNumbers) &&
-                Objects.equals(this.binomialNames, germplasmSearchRequest.binomialNames) &&
-                Objects.equals(this.collections, germplasmSearchRequest.collections) &&
-                Objects.equals(this.commonCropNames, germplasmSearchRequest.commonCropNames) &&
-                Objects.equals(this.externalReferenceIDs, germplasmSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, germplasmSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, germplasmSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.familyCodes, germplasmSearchRequest.familyCodes) &&
-                Objects.equals(this.genus, germplasmSearchRequest.genus) &&
-                Objects.equals(this.germplasmDbIds, germplasmSearchRequest.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, germplasmSearchRequest.germplasmNames) &&
-                Objects.equals(this.germplasmPUIs, germplasmSearchRequest.germplasmPUIs) &&
-                Objects.equals(this.instituteCodes, germplasmSearchRequest.instituteCodes) &&
-                Objects.equals(this.page, germplasmSearchRequest.page) &&
-                Objects.equals(this.pageSize, germplasmSearchRequest.pageSize) &&
-                Objects.equals(this.parentDbIds, germplasmSearchRequest.parentDbIds) &&
-                Objects.equals(this.progenyDbIds, germplasmSearchRequest.progenyDbIds) &&
-                Objects.equals(this.programDbIds, germplasmSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, germplasmSearchRequest.programNames) &&
-                Objects.equals(this.species, germplasmSearchRequest.species) &&
-                Objects.equals(this.studyDbIds, germplasmSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, germplasmSearchRequest.studyNames) &&
-                Objects.equals(this.synonyms, germplasmSearchRequest.synonyms) &&
-                Objects.equals(this.trialDbIds, germplasmSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, germplasmSearchRequest.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(accessionNumbers, binomialNames, collections, commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, familyCodes, genus, germplasmDbIds, germplasmNames, germplasmPUIs, instituteCodes, page, pageSize, parentDbIds, progenyDbIds, programDbIds, programNames, species, studyDbIds, studyNames, synonyms, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmSearchRequest {\n");
-
-        sb.append("    accessionNumbers: ").append(toIndentedString(accessionNumbers)).append("\n");
-        sb.append("    binomialNames: ").append(toIndentedString(binomialNames)).append("\n");
-        sb.append("    collections: ").append(toIndentedString(collections)).append("\n");
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    familyCodes: ").append(toIndentedString(familyCodes)).append("\n");
-        sb.append("    genus: ").append(toIndentedString(genus)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    germplasmPUIs: ").append(toIndentedString(germplasmPUIs)).append("\n");
-        sb.append("    instituteCodes: ").append(toIndentedString(instituteCodes)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    parentDbIds: ").append(toIndentedString(parentDbIds)).append("\n");
-        sb.append("    progenyDbIds: ").append(toIndentedString(progenyDbIds)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    species: ").append(toIndentedString(species)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmSingleResponse.java
deleted file mode 100644
index b1adfc94..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * GermplasmSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Germplasm result = null;
-
-    public GermplasmSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public GermplasmSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public GermplasmSingleResponse result(Germplasm result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Germplasm getResult() {
-        return result;
-    }
-
-    public void setResult(Germplasm result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmSingleResponse germplasmSingleResponse = (GermplasmSingleResponse) o;
-        return Objects.equals(this._atContext, germplasmSingleResponse._atContext) &&
-                Objects.equals(this.metadata, germplasmSingleResponse.metadata) &&
-                Objects.equals(this.result, germplasmSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmStorageTypes.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmStorageTypes.java
deleted file mode 100644
index 49b29916..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmStorageTypes.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * GermplasmStorageTypes
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmStorageTypes {
-    /**
-     * The 2 digit code representing the type of storage this germplasm is kept in at a genebank.   MCPD (v2.1) (STORAGE) 26. If germplasm is maintained under different types of storage, multiple choices are allowed, separated by a semicolon (e.g. 20;30). (Refer to FAO/IPGRI Genebank Standards 1994 for details on storage type.)   10) Seed collection  11) Short term  12) Medium term  13) Long term  20) Field collection  30) In vitro collection  40) Cryo-preserved collection  50) DNA collection  99) Other (elaborate in REMARKS field)
-     */
-    @JsonAdapter(CodeEnum.Adapter.class)
-    public enum CodeEnum {
-        _10("10"),
-        _11("11"),
-        _12("12"),
-        _13("13"),
-        _20("20"),
-        _30("30"),
-        _40("40"),
-        _50("50"),
-        _99("99");
-
-        private String value;
-
-        CodeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static CodeEnum fromValue(String input) {
-            for (CodeEnum b : CodeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<CodeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final CodeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public CodeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return CodeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("code")
-    private CodeEnum code = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    public GermplasmStorageTypes code(CodeEnum code) {
-        this.code = code;
-        return this;
-    }
-
-    /**
-     * The 2 digit code representing the type of storage this germplasm is kept in at a genebank.   MCPD (v2.1) (STORAGE) 26. If germplasm is maintained under different types of storage, multiple choices are allowed, separated by a semicolon (e.g. 20;30). (Refer to FAO/IPGRI Genebank Standards 1994 for details on storage type.)   10) Seed collection  11) Short term  12) Medium term  13) Long term  20) Field collection  30) In vitro collection  40) Cryo-preserved collection  50) DNA collection  99) Other (elaborate in REMARKS field)
-     *
-     * @return code
-     **/
-    @Schema(example = "11", description = "The 2 digit code representing the type of storage this germplasm is kept in at a genebank.   MCPD (v2.1) (STORAGE) 26. If germplasm is maintained under different types of storage, multiple choices are allowed, separated by a semicolon (e.g. 20;30). (Refer to FAO/IPGRI Genebank Standards 1994 for details on storage type.)   10) Seed collection  11) Short term  12) Medium term  13) Long term  20) Field collection  30) In vitro collection  40) Cryo-preserved collection  50) DNA collection  99) Other (elaborate in REMARKS field)")
-    public CodeEnum getCode() {
-        return code;
-    }
-
-    public void setCode(CodeEnum code) {
-        this.code = code;
-    }
-
-    public GermplasmStorageTypes description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * A supplemental text description of the storage type
-     *
-     * @return description
-     **/
-    @Schema(example = "Short term", description = "A supplemental text description of the storage type")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmStorageTypes germplasmStorageTypes = (GermplasmStorageTypes) o;
-        return Objects.equals(this.code, germplasmStorageTypes.code) &&
-                Objects.equals(this.description, germplasmStorageTypes.description);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(code, description);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmStorageTypes {\n");
-
-        sb.append("    code: ").append(toIndentedString(code)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmSynonyms.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmSynonyms.java
deleted file mode 100644
index 5217e405..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmSynonyms.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * GermplasmSynonyms
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmSynonyms {
-    @SerializedName("synonym")
-    private String synonym = null;
-
-    @SerializedName("type")
-    private String type = null;
-
-    public GermplasmSynonyms synonym(String synonym) {
-        this.synonym = synonym;
-        return this;
-    }
-
-    /**
-     * Alternative name or ID used to reference this germplasm
-     *
-     * @return synonym
-     **/
-    @Schema(example = "variety_1", description = "Alternative name or ID used to reference this germplasm")
-    public String getSynonym() {
-        return synonym;
-    }
-
-    public void setSynonym(String synonym) {
-        this.synonym = synonym;
-    }
-
-    public GermplasmSynonyms type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * A descriptive classification for this synonym
-     *
-     * @return type
-     **/
-    @Schema(example = "Pre-Code", description = "A descriptive classification for this synonym")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmSynonyms germplasmSynonyms = (GermplasmSynonyms) o;
-        return Objects.equals(this.synonym, germplasmSynonyms.synonym) &&
-                Objects.equals(this.type, germplasmSynonyms.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(synonym, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmSynonyms {\n");
-
-        sb.append("    synonym: ").append(toIndentedString(synonym)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmTaxonIds.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmTaxonIds.java
deleted file mode 100644
index 27ebba0b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/GermplasmTaxonIds.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * GermplasmTaxonIds
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class GermplasmTaxonIds {
-    @SerializedName("sourceName")
-    private String sourceName = null;
-
-    @SerializedName("taxonId")
-    private String taxonId = null;
-
-    public GermplasmTaxonIds sourceName(String sourceName) {
-        this.sourceName = sourceName;
-        return this;
-    }
-
-    /**
-     * The human readable name of the taxonomy provider
-     *
-     * @return sourceName
-     **/
-    @Schema(example = "NCBI", required = true, description = "The human readable name of the taxonomy provider")
-    public String getSourceName() {
-        return sourceName;
-    }
-
-    public void setSourceName(String sourceName) {
-        this.sourceName = sourceName;
-    }
-
-    public GermplasmTaxonIds taxonId(String taxonId) {
-        this.taxonId = taxonId;
-        return this;
-    }
-
-    /**
-     * The identifier (name, ID, URI) of a particular taxonomy within the source provider
-     *
-     * @return taxonId
-     **/
-    @Schema(example = "2026747", required = true, description = "The identifier (name, ID, URI) of a particular taxonomy within the source provider")
-    public String getTaxonId() {
-        return taxonId;
-    }
-
-    public void setTaxonId(String taxonId) {
-        this.taxonId = taxonId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GermplasmTaxonIds germplasmTaxonIds = (GermplasmTaxonIds) o;
-        return Objects.equals(this.sourceName, germplasmTaxonIds.sourceName) &&
-                Objects.equals(this.taxonId, germplasmTaxonIds.taxonId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(sourceName, taxonId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GermplasmTaxonIds {\n");
-
-        sb.append("    sourceName: ").append(toIndentedString(sourceName)).append("\n");
-        sb.append("    taxonId: ").append(toIndentedString(taxonId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/LinearRing.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/LinearRing.java
deleted file mode 100644
index 15823a8e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/LinearRing.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An array of at least four positions where the first equals the last
- */
-@Schema(description = "An array of at least four positions where the first equals the last")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class LinearRing extends ArrayList<List> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class LinearRing {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Method.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Method.java
deleted file mode 100644
index 601d8e8e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Method.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A description of the way an Observation should be collected.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Method \&quot;estimation\&quot; or \&quot;drone image processing\&quot;.
- */
-@Schema(description = "A description of the way an Observation should be collected.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Method \"estimation\" or \"drone image processing\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class Method {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("bibliographicalReference")
-    private String bibliographicalReference = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("formula")
-    private String formula = null;
-
-    @SerializedName("methodClass")
-    private String methodClass = null;
-
-    @SerializedName("methodDbId")
-    private String methodDbId = null;
-
-    @SerializedName("methodName")
-    private String methodName = null;
-
-    @SerializedName("methodPUI")
-    private String methodPUI = null;
-
-    @SerializedName("ontologyReference")
-    private GermplasmAttributeMethodOntologyReference ontologyReference = null;
-
-    public Method additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Method putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Method bibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-        return this;
-    }
-
-    /**
-     * Bibliographical reference describing the method. &lt;br/&gt;MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.
-     *
-     * @return bibliographicalReference
-     **/
-    @Schema(example = "Smith, 1893, Really Cool Paper, Popular Journal", description = "Bibliographical reference describing the method. <br/>MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.")
-    public String getBibliographicalReference() {
-        return bibliographicalReference;
-    }
-
-    public void setBibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-    }
-
-    public Method description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Method description &lt;br/&gt;MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)
-     *
-     * @return description
-     **/
-    @Schema(example = "A measuring tape was used", description = "Method description <br/>MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Method externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Method addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Method formula(String formula) {
-        this.formula = formula;
-        return this;
-    }
-
-    /**
-     * For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation
-     *
-     * @return formula
-     **/
-    @Schema(example = "a^2 + b^2 = c^2", description = "For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation")
-    public String getFormula() {
-        return formula;
-    }
-
-    public void setFormula(String formula) {
-        this.formula = formula;
-    }
-
-    public Method methodClass(String methodClass) {
-        this.methodClass = methodClass;
-        return this;
-    }
-
-    /**
-     * Method class (examples: \&quot;Measurement\&quot;, \&quot;Counting\&quot;, \&quot;Estimation\&quot;, \&quot;Computation\&quot;, etc.)
-     *
-     * @return methodClass
-     **/
-    @Schema(example = "Measurement", description = "Method class (examples: \"Measurement\", \"Counting\", \"Estimation\", \"Computation\", etc.)")
-    public String getMethodClass() {
-        return methodClass;
-    }
-
-    public void setMethodClass(String methodClass) {
-        this.methodClass = methodClass;
-    }
-
-    public Method methodDbId(String methodDbId) {
-        this.methodDbId = methodDbId;
-        return this;
-    }
-
-    /**
-     * Method unique identifier
-     *
-     * @return methodDbId
-     **/
-    @Schema(example = "0adb2764", description = "Method unique identifier")
-    public String getMethodDbId() {
-        return methodDbId;
-    }
-
-    public void setMethodDbId(String methodDbId) {
-        this.methodDbId = methodDbId;
-    }
-
-    public Method methodName(String methodName) {
-        this.methodName = methodName;
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodName
-     **/
-    @Schema(example = "Measuring Tape", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public String getMethodName() {
-        return methodName;
-    }
-
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
-    public Method methodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000212", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public String getMethodPUI() {
-        return methodPUI;
-    }
-
-    public void setMethodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-    }
-
-    public Method ontologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeMethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Method method = (Method) o;
-        return Objects.equals(this.additionalInfo, method.additionalInfo) &&
-                Objects.equals(this.bibliographicalReference, method.bibliographicalReference) &&
-                Objects.equals(this.description, method.description) &&
-                Objects.equals(this.externalReferences, method.externalReferences) &&
-                Objects.equals(this.formula, method.formula) &&
-                Objects.equals(this.methodClass, method.methodClass) &&
-                Objects.equals(this.methodDbId, method.methodDbId) &&
-                Objects.equals(this.methodName, method.methodName) &&
-                Objects.equals(this.methodPUI, method.methodPUI) &&
-                Objects.equals(this.ontologyReference, method.ontologyReference);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, bibliographicalReference, description, externalReferences, formula, methodClass, methodDbId, methodName, methodPUI, ontologyReference);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Method {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    bibliographicalReference: ").append(toIndentedString(bibliographicalReference)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    formula: ").append(toIndentedString(formula)).append("\n");
-        sb.append("    methodClass: ").append(toIndentedString(methodClass)).append("\n");
-        sb.append("    methodDbId: ").append(toIndentedString(methodDbId)).append("\n");
-        sb.append("    methodName: ").append(toIndentedString(methodName)).append("\n");
-        sb.append("    methodPUI: ").append(toIndentedString(methodPUI)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/MethodBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/MethodBaseClass.java
deleted file mode 100644
index 4630736d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/MethodBaseClass.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A description of the way an Observation should be collected.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Method \&quot;estimation\&quot; or \&quot;drone image processing\&quot;.
- */
-@Schema(description = "A description of the way an Observation should be collected.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Method \"estimation\" or \"drone image processing\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class MethodBaseClass {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("bibliographicalReference")
-    private String bibliographicalReference = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("formula")
-    private String formula = null;
-
-    @SerializedName("methodClass")
-    private String methodClass = null;
-
-    @SerializedName("methodName")
-    private String methodName = null;
-
-    @SerializedName("methodPUI")
-    private String methodPUI = null;
-
-    @SerializedName("ontologyReference")
-    private GermplasmAttributeMethodOntologyReference ontologyReference = null;
-
-    public MethodBaseClass additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public MethodBaseClass putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public MethodBaseClass bibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-        return this;
-    }
-
-    /**
-     * Bibliographical reference describing the method. &lt;br/&gt;MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.
-     *
-     * @return bibliographicalReference
-     **/
-    @Schema(example = "Smith, 1893, Really Cool Paper, Popular Journal", description = "Bibliographical reference describing the method. <br/>MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.")
-    public String getBibliographicalReference() {
-        return bibliographicalReference;
-    }
-
-    public void setBibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-    }
-
-    public MethodBaseClass description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Method description &lt;br/&gt;MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)
-     *
-     * @return description
-     **/
-    @Schema(example = "A measuring tape was used", description = "Method description <br/>MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public MethodBaseClass externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public MethodBaseClass addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public MethodBaseClass formula(String formula) {
-        this.formula = formula;
-        return this;
-    }
-
-    /**
-     * For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation
-     *
-     * @return formula
-     **/
-    @Schema(example = "a^2 + b^2 = c^2", description = "For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation")
-    public String getFormula() {
-        return formula;
-    }
-
-    public void setFormula(String formula) {
-        this.formula = formula;
-    }
-
-    public MethodBaseClass methodClass(String methodClass) {
-        this.methodClass = methodClass;
-        return this;
-    }
-
-    /**
-     * Method class (examples: \&quot;Measurement\&quot;, \&quot;Counting\&quot;, \&quot;Estimation\&quot;, \&quot;Computation\&quot;, etc.)
-     *
-     * @return methodClass
-     **/
-    @Schema(example = "Measurement", description = "Method class (examples: \"Measurement\", \"Counting\", \"Estimation\", \"Computation\", etc.)")
-    public String getMethodClass() {
-        return methodClass;
-    }
-
-    public void setMethodClass(String methodClass) {
-        this.methodClass = methodClass;
-    }
-
-    public MethodBaseClass methodName(String methodName) {
-        this.methodName = methodName;
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodName
-     **/
-    @Schema(example = "Measuring Tape", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public String getMethodName() {
-        return methodName;
-    }
-
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
-    public MethodBaseClass methodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000212", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public String getMethodPUI() {
-        return methodPUI;
-    }
-
-    public void setMethodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-    }
-
-    public MethodBaseClass ontologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeMethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodBaseClass methodBaseClass = (MethodBaseClass) o;
-        return Objects.equals(this.additionalInfo, methodBaseClass.additionalInfo) &&
-                Objects.equals(this.bibliographicalReference, methodBaseClass.bibliographicalReference) &&
-                Objects.equals(this.description, methodBaseClass.description) &&
-                Objects.equals(this.externalReferences, methodBaseClass.externalReferences) &&
-                Objects.equals(this.formula, methodBaseClass.formula) &&
-                Objects.equals(this.methodClass, methodBaseClass.methodClass) &&
-                Objects.equals(this.methodName, methodBaseClass.methodName) &&
-                Objects.equals(this.methodPUI, methodBaseClass.methodPUI) &&
-                Objects.equals(this.ontologyReference, methodBaseClass.ontologyReference);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, bibliographicalReference, description, externalReferences, formula, methodClass, methodName, methodPUI, ontologyReference);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodBaseClass {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    bibliographicalReference: ").append(toIndentedString(bibliographicalReference)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    formula: ").append(toIndentedString(formula)).append("\n");
-        sb.append("    methodClass: ").append(toIndentedString(methodClass)).append("\n");
-        sb.append("    methodName: ").append(toIndentedString(methodName)).append("\n");
-        sb.append("    methodPUI: ").append(toIndentedString(methodPUI)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Model202AcceptedSearchResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Model202AcceptedSearchResponse.java
deleted file mode 100644
index 012b0b75..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Model202AcceptedSearchResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * Model202AcceptedSearchResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class Model202AcceptedSearchResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Model202AcceptedSearchResponseResult result = null;
-
-    public Model202AcceptedSearchResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public Model202AcceptedSearchResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public Model202AcceptedSearchResponse result(Model202AcceptedSearchResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(description = "")
-    public Model202AcceptedSearchResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(Model202AcceptedSearchResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Model202AcceptedSearchResponse _202AcceptedSearchResponse = (Model202AcceptedSearchResponse) o;
-        return Objects.equals(this._atContext, _202AcceptedSearchResponse._atContext) &&
-                Objects.equals(this.metadata, _202AcceptedSearchResponse.metadata) &&
-                Objects.equals(this.result, _202AcceptedSearchResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Model202AcceptedSearchResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Model202AcceptedSearchResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Model202AcceptedSearchResponseResult.java
deleted file mode 100644
index 29050f6f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Model202AcceptedSearchResponseResult.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Model202AcceptedSearchResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class Model202AcceptedSearchResponseResult {
-    @SerializedName("searchResultsDbId")
-    private String searchResultsDbId = null;
-
-    public Model202AcceptedSearchResponseResult searchResultsDbId(String searchResultsDbId) {
-        this.searchResultsDbId = searchResultsDbId;
-        return this;
-    }
-
-    /**
-     * Get searchResultsDbId
-     *
-     * @return searchResultsDbId
-     **/
-    @Schema(example = "551ae08c", description = "")
-    public String getSearchResultsDbId() {
-        return searchResultsDbId;
-    }
-
-    public void setSearchResultsDbId(String searchResultsDbId) {
-        this.searchResultsDbId = searchResultsDbId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Model202AcceptedSearchResponseResult _202AcceptedSearchResponseResult = (Model202AcceptedSearchResponseResult) o;
-        return Objects.equals(this.searchResultsDbId, _202AcceptedSearchResponseResult.searchResultsDbId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(searchResultsDbId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Model202AcceptedSearchResponseResult {\n");
-
-        sb.append("    searchResultsDbId: ").append(toIndentedString(searchResultsDbId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ObservationUnitHierarchyLevel.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ObservationUnitHierarchyLevel.java
deleted file mode 100644
index 65d5136f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ObservationUnitHierarchyLevel.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6).   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
- */
-@Schema(description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6).   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class ObservationUnitHierarchyLevel {
-    @SerializedName("levelName")
-    private String levelName = null;
-
-    @SerializedName("levelOrder")
-    private Integer levelOrder = null;
-
-    public ObservationUnitHierarchyLevel levelName(String levelName) {
-        this.levelName = levelName;
-        return this;
-    }
-
-    /**
-     * A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelName
-     **/
-    @Schema(example = "plot", description = "A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public ObservationUnitHierarchyLevel levelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-        return this;
-    }
-
-    /**
-     * &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;&#x27;s lower numbers  are at the top of the hierarchy (ie field -&gt; 1) and higher numbers are at the bottom of the hierarchy (ie plant -&gt; 9).   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelOrder
-     **/
-    @Schema(example = "2", description = "`levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`'s lower numbers  are at the top of the hierarchy (ie field -> 1) and higher numbers are at the bottom of the hierarchy (ie plant -> 9).   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public Integer getLevelOrder() {
-        return levelOrder;
-    }
-
-    public void setLevelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitHierarchyLevel observationUnitHierarchyLevel = (ObservationUnitHierarchyLevel) o;
-        return Objects.equals(this.levelName, observationUnitHierarchyLevel.levelName) &&
-                Objects.equals(this.levelOrder, observationUnitHierarchyLevel.levelOrder);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(levelName, levelOrder);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitHierarchyLevel {\n");
-
-        sb.append("    levelName: ").append(toIndentedString(levelName)).append("\n");
-        sb.append("    levelOrder: ").append(toIndentedString(levelOrder)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/OneOfGeoJSONGeometry.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/OneOfGeoJSONGeometry.java
deleted file mode 100644
index b64f1384..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/OneOfGeoJSONGeometry.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-/**
- * OneOfGeoJSONGeometry
- */
-public interface OneOfGeoJSONGeometry {
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/OneOfgeoJSONSearchAreaGeometry.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/OneOfgeoJSONSearchAreaGeometry.java
deleted file mode 100644
index c922c93c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/OneOfgeoJSONSearchAreaGeometry.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-/**
- * OneOfgeoJSONSearchAreaGeometry
- */
-public interface OneOfgeoJSONSearchAreaGeometry {
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/OntologyReference.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/OntologyReference.java
deleted file mode 100644
index c5ec87a4..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/OntologyReference.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).
- */
-@Schema(description = "MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class OntologyReference {
-    @SerializedName("documentationLinks")
-    private List<GermplasmAttributeMethodOntologyReferenceDocumentationLinks> documentationLinks = null;
-
-    @SerializedName("ontologyDbId")
-    private String ontologyDbId = null;
-
-    @SerializedName("ontologyName")
-    private String ontologyName = null;
-
-    @SerializedName("version")
-    private String version = null;
-
-    public OntologyReference documentationLinks(List<GermplasmAttributeMethodOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-        return this;
-    }
-
-    public OntologyReference addDocumentationLinksItem(GermplasmAttributeMethodOntologyReferenceDocumentationLinks documentationLinksItem) {
-        if (this.documentationLinks == null) {
-            this.documentationLinks = new ArrayList<GermplasmAttributeMethodOntologyReferenceDocumentationLinks>();
-        }
-        this.documentationLinks.add(documentationLinksItem);
-        return this;
-    }
-
-    /**
-     * links to various ontology documentation
-     *
-     * @return documentationLinks
-     **/
-    @Schema(description = "links to various ontology documentation")
-    public List<GermplasmAttributeMethodOntologyReferenceDocumentationLinks> getDocumentationLinks() {
-        return documentationLinks;
-    }
-
-    public void setDocumentationLinks(List<GermplasmAttributeMethodOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-    }
-
-    public OntologyReference ontologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-        return this;
-    }
-
-    /**
-     * Ontology database unique identifier
-     *
-     * @return ontologyDbId
-     **/
-    @Schema(example = "6b071868", required = true, description = "Ontology database unique identifier")
-    public String getOntologyDbId() {
-        return ontologyDbId;
-    }
-
-    public void setOntologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-    }
-
-    public OntologyReference ontologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-        return this;
-    }
-
-    /**
-     * Ontology name
-     *
-     * @return ontologyName
-     **/
-    @Schema(example = "The Crop Ontology", required = true, description = "Ontology name")
-    public String getOntologyName() {
-        return ontologyName;
-    }
-
-    public void setOntologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-    }
-
-    public OntologyReference version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    /**
-     * Ontology version (no specific format)
-     *
-     * @return version
-     **/
-    @Schema(example = "7.2.3", description = "Ontology version (no specific format)")
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OntologyReference ontologyReference = (OntologyReference) o;
-        return Objects.equals(this.documentationLinks, ontologyReference.documentationLinks) &&
-                Objects.equals(this.ontologyDbId, ontologyReference.ontologyDbId) &&
-                Objects.equals(this.ontologyName, ontologyReference.ontologyName) &&
-                Objects.equals(this.version, ontologyReference.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(documentationLinks, ontologyDbId, ontologyName, version);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class OntologyReference {\n");
-
-        sb.append("    documentationLinks: ").append(toIndentedString(documentationLinks)).append("\n");
-        sb.append("    ontologyDbId: ").append(toIndentedString(ontologyDbId)).append("\n");
-        sb.append("    ontologyName: ").append(toIndentedString(ontologyName)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ParentType.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ParentType.java
deleted file mode 100644
index 1c4e9b29..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ParentType.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-/**
- * The type of parent used during crossing. Accepted values for this field are &#x27;MALE&#x27;, &#x27;FEMALE&#x27;, &#x27;SELF&#x27;, &#x27;POPULATION&#x27;, and &#x27;CLONAL&#x27;.   In a pedigree record, the &#x27;parentType&#x27; describes each parent of a particular germplasm.   In a progeny record, the &#x27;parentType&#x27; is used to describe how this germplasm was crossed to generate a particular progeny.  For example, given a record for germplasm A, having a progeny B and C. The &#x27;parentType&#x27; field for progeny B item refers  to the &#x27;parentType&#x27; of A toward B. The &#x27;parentType&#x27; field for progeny C item refers to the &#x27;parentType&#x27; of A toward C. In this way, A could be a male parent to B, but a female parent to C.
- */
-@JsonAdapter(ParentType.Adapter.class)
-public enum ParentType {
-    MALE("MALE"),
-    FEMALE("FEMALE"),
-    SELF("SELF"),
-    POPULATION("POPULATION"),
-    CLONAL("CLONAL");
-
-    private final String value;
-
-    ParentType(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    public static ParentType fromValue(String input) {
-        for (ParentType b : ParentType.values()) {
-            if (b.value.equals(input)) {
-                return b;
-            }
-        }
-        return null;
-    }
-
-    public static class Adapter extends TypeAdapter<ParentType> {
-        @Override
-        public void write(final JsonWriter jsonWriter, final ParentType enumeration) throws IOException {
-            jsonWriter.value(String.valueOf(enumeration.getValue()));
-        }
-
-        @Override
-        public ParentType read(final JsonReader jsonReader) throws IOException {
-            Object value = jsonReader.nextString();
-            return ParentType.fromValue((String) (value));
-        }
-    }
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ParentTypeDEP.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ParentTypeDEP.java
deleted file mode 100644
index 4d77b782..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ParentTypeDEP.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-/**
- * The type of parent used during crossing. Accepted values for this field are &#x27;MALE&#x27;, &#x27;FEMALE&#x27;, &#x27;SELF&#x27;, &#x27;POPULATION&#x27;, and &#x27;CLONAL&#x27;.   In a pedigree record, the &#x27;parentType&#x27; describes each parent of a particular germplasm.   In a progeny record, the &#x27;parentType&#x27; is used to describe how this germplasm was crossed to generate a particular progeny.  For example, given a record for germplasm A, having a progeny B and C. The &#x27;parentType&#x27; field for progeny B item refers  to the &#x27;parentType&#x27; of A toward B. The &#x27;parentType&#x27; field for progeny C item refers to the &#x27;parentType&#x27; of A toward C. In this way, A could be a male parent to B, but a female parent to C.
- */
-@JsonAdapter(ParentTypeDEP.Adapter.class)
-public enum ParentTypeDEP {
-    MALE("MALE"),
-    FEMALE("FEMALE"),
-    SELF("SELF"),
-    POPULATION("POPULATION"),
-    CLONAL("CLONAL");
-
-    private final String value;
-
-    ParentTypeDEP(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    public static ParentTypeDEP fromValue(String input) {
-        for (ParentTypeDEP b : ParentTypeDEP.values()) {
-            if (b.value.equals(input)) {
-                return b;
-            }
-        }
-        return null;
-    }
-
-    public static class Adapter extends TypeAdapter<ParentTypeDEP> {
-        @Override
-        public void write(final JsonWriter jsonWriter, final ParentTypeDEP enumeration) throws IOException {
-            jsonWriter.value(String.valueOf(enumeration.getValue()));
-        }
-
-        @Override
-        public ParentTypeDEP read(final JsonReader jsonReader) throws IOException {
-            Object value = jsonReader.nextString();
-            return ParentTypeDEP.fromValue((String) (value));
-        }
-    }
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeListResponse.java
deleted file mode 100644
index 5c5ffec5..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * PedigreeListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class PedigreeListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private PedigreeListResponseResult result = null;
-
-    public PedigreeListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public PedigreeListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public PedigreeListResponse result(PedigreeListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public PedigreeListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(PedigreeListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PedigreeListResponse pedigreeListResponse = (PedigreeListResponse) o;
-        return Objects.equals(this._atContext, pedigreeListResponse._atContext) &&
-                Objects.equals(this.metadata, pedigreeListResponse.metadata) &&
-                Objects.equals(this.result, pedigreeListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PedigreeListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeListResponseResult.java
deleted file mode 100644
index f182cb83..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * PedigreeListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class PedigreeListResponseResult {
-    @SerializedName("data")
-    private List<PedigreeNode> data = new ArrayList<PedigreeNode>();
-
-    public PedigreeListResponseResult data(List<PedigreeNode> data) {
-        this.data = data;
-        return this;
-    }
-
-    public PedigreeListResponseResult addDataItem(PedigreeNode dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<PedigreeNode> getData() {
-        return data;
-    }
-
-    public void setData(List<PedigreeNode> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PedigreeListResponseResult pedigreeListResponseResult = (PedigreeListResponseResult) o;
-        return Objects.equals(this.data, pedigreeListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PedigreeListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNode.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNode.java
deleted file mode 100644
index b6acf353..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNode.java
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * PedigreeNode
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class PedigreeNode {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("breedingMethodDbId")
-    private String breedingMethodDbId = null;
-
-    @SerializedName("breedingMethodName")
-    private String breedingMethodName = null;
-
-    @SerializedName("crossingProjectDbId")
-    private String crossingProjectDbId = null;
-
-    @SerializedName("crossingYear")
-    private Integer crossingYear = null;
-
-    @SerializedName("defaultDisplayName")
-    private String defaultDisplayName = null;
-
-    @SerializedName("externalReferences")
-    private ExternalReferences externalReferences = null;
-
-    @SerializedName("familyCode")
-    private String familyCode = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("germplasmPUI")
-    private String germplasmPUI = null;
-
-    @SerializedName("parents")
-    private List<PedigreeNodeParents> parents = null;
-
-    @SerializedName("pedigreeString")
-    private String pedigreeString = null;
-
-    @SerializedName("progeny")
-    private List<PedigreeNodeParents> progeny = null;
-
-    @SerializedName("siblings")
-    private List<PedigreeNodeSiblings> siblings = null;
-
-    public PedigreeNode additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public PedigreeNode putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public PedigreeNode breedingMethodDbId(String breedingMethodDbId) {
-        this.breedingMethodDbId = breedingMethodDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for the breeding method used to create this germplasm
-     *
-     * @return breedingMethodDbId
-     **/
-    @Schema(example = "ffcce7ef", description = "The unique identifier for the breeding method used to create this germplasm")
-    public String getBreedingMethodDbId() {
-        return breedingMethodDbId;
-    }
-
-    public void setBreedingMethodDbId(String breedingMethodDbId) {
-        this.breedingMethodDbId = breedingMethodDbId;
-    }
-
-    public PedigreeNode breedingMethodName(String breedingMethodName) {
-        this.breedingMethodName = breedingMethodName;
-        return this;
-    }
-
-    /**
-     * The human readable name of the breeding method used to create this germplasm
-     *
-     * @return breedingMethodName
-     **/
-    @Schema(example = "Male Backcross", description = "The human readable name of the breeding method used to create this germplasm")
-    public String getBreedingMethodName() {
-        return breedingMethodName;
-    }
-
-    public void setBreedingMethodName(String breedingMethodName) {
-        this.breedingMethodName = breedingMethodName;
-    }
-
-    public PedigreeNode crossingProjectDbId(String crossingProjectDbId) {
-        this.crossingProjectDbId = crossingProjectDbId;
-        return this;
-    }
-
-    /**
-     * The crossing project used to generate this germplasm
-     *
-     * @return crossingProjectDbId
-     **/
-    @Schema(example = "625e745a", description = "The crossing project used to generate this germplasm")
-    public String getCrossingProjectDbId() {
-        return crossingProjectDbId;
-    }
-
-    public void setCrossingProjectDbId(String crossingProjectDbId) {
-        this.crossingProjectDbId = crossingProjectDbId;
-    }
-
-    public PedigreeNode crossingYear(Integer crossingYear) {
-        this.crossingYear = crossingYear;
-        return this;
-    }
-
-    /**
-     * The year the parents were originally crossed
-     *
-     * @return crossingYear
-     **/
-    @Schema(example = "2005", description = "The year the parents were originally crossed")
-    public Integer getCrossingYear() {
-        return crossingYear;
-    }
-
-    public void setCrossingYear(Integer crossingYear) {
-        this.crossingYear = crossingYear;
-    }
-
-    public PedigreeNode defaultDisplayName(String defaultDisplayName) {
-        this.defaultDisplayName = defaultDisplayName;
-        return this;
-    }
-
-    /**
-     * Human readable name used for display purposes
-     *
-     * @return defaultDisplayName
-     **/
-    @Schema(example = "A0000003", description = "Human readable name used for display purposes")
-    public String getDefaultDisplayName() {
-        return defaultDisplayName;
-    }
-
-    public void setDefaultDisplayName(String defaultDisplayName) {
-        this.defaultDisplayName = defaultDisplayName;
-    }
-
-    public PedigreeNode externalReferences(ExternalReferences externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    /**
-     * Get externalReferences
-     *
-     * @return externalReferences
-     **/
-    @Schema(description = "")
-    public ExternalReferences getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(ExternalReferences externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public PedigreeNode familyCode(String familyCode) {
-        this.familyCode = familyCode;
-        return this;
-    }
-
-    /**
-     * The code representing the family of this germplasm
-     *
-     * @return familyCode
-     **/
-    @Schema(example = "F0000203", description = "The code representing the family of this germplasm")
-    public String getFamilyCode() {
-        return familyCode;
-    }
-
-    public void setFamilyCode(String familyCode) {
-        this.familyCode = familyCode;
-    }
-
-    public PedigreeNode germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "1098ebaf", description = "The ID which uniquely identifies a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public PedigreeNode germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * A human readable name for a germplasm
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0021004", description = "A human readable name for a germplasm")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public PedigreeNode germplasmPUI(String germplasmPUI) {
-        this.germplasmPUI = germplasmPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier which represents a germplasm  MIAPPE V1.1 (DM-41) Biological material ID - Code used to identify the biological material in the data file. Should be unique within the Investigation. Can correspond to experimental plant ID, seed lot ID, etc This material identification is different from a BiosampleID which corresponds to Observation Unit or Samples sections below.  MIAPPE V1.1 (DM-51) Material source DOI - Digital Object Identifier (DOI) of the material source  MCPD (v2.1) (PUID) 0. Any persistent, unique identifier assigned to the accession so it can be unambiguously referenced at the global level and the information associated with it harvested through automated means. Report one PUID for each accession. The Secretariat of the International Treaty on Plant Genetic Resources for Food and Agriculture (PGRFA) is facilitating the assignment of a persistent unique identifier (PUID), in the form of a DOI, to PGRFA at the accession level. Genebanks not applying a true PUID to their accessions should use, and request recipients to use, the concatenation of INSTCODE, ACCENUMB, and GENUS as a globally unique identifier similar in most respects to the PUID whenever they exchange information on accessions with third parties.
-     *
-     * @return germplasmPUI
-     **/
-    @Schema(example = "http://pui.per/accession/A0000003", description = "The Permanent Unique Identifier which represents a germplasm  MIAPPE V1.1 (DM-41) Biological material ID - Code used to identify the biological material in the data file. Should be unique within the Investigation. Can correspond to experimental plant ID, seed lot ID, etc This material identification is different from a BiosampleID which corresponds to Observation Unit or Samples sections below.  MIAPPE V1.1 (DM-51) Material source DOI - Digital Object Identifier (DOI) of the material source  MCPD (v2.1) (PUID) 0. Any persistent, unique identifier assigned to the accession so it can be unambiguously referenced at the global level and the information associated with it harvested through automated means. Report one PUID for each accession. The Secretariat of the International Treaty on Plant Genetic Resources for Food and Agriculture (PGRFA) is facilitating the assignment of a persistent unique identifier (PUID), in the form of a DOI, to PGRFA at the accession level. Genebanks not applying a true PUID to their accessions should use, and request recipients to use, the concatenation of INSTCODE, ACCENUMB, and GENUS as a globally unique identifier similar in most respects to the PUID whenever they exchange information on accessions with third parties.")
-    public String getGermplasmPUI() {
-        return germplasmPUI;
-    }
-
-    public void setGermplasmPUI(String germplasmPUI) {
-        this.germplasmPUI = germplasmPUI;
-    }
-
-    public PedigreeNode parents(List<PedigreeNodeParents> parents) {
-        this.parents = parents;
-        return this;
-    }
-
-    public PedigreeNode addParentsItem(PedigreeNodeParents parentsItem) {
-        if (this.parents == null) {
-            this.parents = new ArrayList<PedigreeNodeParents>();
-        }
-        this.parents.add(parentsItem);
-        return this;
-    }
-
-    /**
-     * A list of parent germplasm references in the pedigree tree for this germplasm. These represent edges in the tree, connecting to other nodes. &lt;br/&gt; Typically, this array should only have one parent (clonal or self) or two parents (cross). In some special cases, there may be more parents, usually when the exact parent is not known.  &lt;br/&gt; If the parameter &#x27;includeParents&#x27; is set to false, then this array should be empty, null, or not present in the response.
-     *
-     * @return parents
-     **/
-    @Schema(example = "[{\"germplasmDbId\":\"b66958de\",\"germplasmName\":\"A0000592\",\"parentType\":\"MALE\"},{\"germplasmDbId\":\"a55847ed\",\"germplasmName\":\"A0000592\",\"parentType\":\"FEMALE\"}]", description = "A list of parent germplasm references in the pedigree tree for this germplasm. These represent edges in the tree, connecting to other nodes. <br/> Typically, this array should only have one parent (clonal or self) or two parents (cross). In some special cases, there may be more parents, usually when the exact parent is not known.  <br/> If the parameter 'includeParents' is set to false, then this array should be empty, null, or not present in the response.")
-    public List<PedigreeNodeParents> getParents() {
-        return parents;
-    }
-
-    public void setParents(List<PedigreeNodeParents> parents) {
-        this.parents = parents;
-    }
-
-    public PedigreeNode pedigreeString(String pedigreeString) {
-        this.pedigreeString = pedigreeString;
-        return this;
-    }
-
-    /**
-     * The string representation of the pedigree for this germplasm in PURDY notation
-     *
-     * @return pedigreeString
-     **/
-    @Schema(example = "A0000001/A0000002", description = "The string representation of the pedigree for this germplasm in PURDY notation")
-    public String getPedigreeString() {
-        return pedigreeString;
-    }
-
-    public void setPedigreeString(String pedigreeString) {
-        this.pedigreeString = pedigreeString;
-    }
-
-    public PedigreeNode progeny(List<PedigreeNodeParents> progeny) {
-        this.progeny = progeny;
-        return this;
-    }
-
-    public PedigreeNode addProgenyItem(PedigreeNodeParents progenyItem) {
-        if (this.progeny == null) {
-            this.progeny = new ArrayList<PedigreeNodeParents>();
-        }
-        this.progeny.add(progenyItem);
-        return this;
-    }
-
-    /**
-     * A list of germplasm references that are direct children of this germplasm. These represent edges in the tree, connecting to other nodes. &lt;br/&gt; The given germplasm could have a large number of progeny, across a number of different breeding methods. The &#x27;parentType&#x27; shows        the type of parent this germplasm is to each of the child germplasm references. &lt;br/&gt; If the parameter &#x27;includeProgeny&#x27; is set to false, then this array should be empty, null, or not present in the response.
-     *
-     * @return progeny
-     **/
-    @Schema(example = "[{\"germplasmDbId\":\"e8d5dad7\",\"germplasmName\":\"A0021011\",\"parentType\":\"FEMALE\"},{\"germplasmDbId\":\"ac07fbd8\",\"germplasmName\":\"A0021012\",\"parentType\":\"FEMALE\"},{\"germplasmDbId\":\"07f45f67\",\"germplasmName\":\"A0021013\",\"parentType\":\"FEMALE\"}]", description = "A list of germplasm references that are direct children of this germplasm. These represent edges in the tree, connecting to other nodes. <br/> The given germplasm could have a large number of progeny, across a number of different breeding methods. The 'parentType' shows        the type of parent this germplasm is to each of the child germplasm references. <br/> If the parameter 'includeProgeny' is set to false, then this array should be empty, null, or not present in the response.")
-    public List<PedigreeNodeParents> getProgeny() {
-        return progeny;
-    }
-
-    public void setProgeny(List<PedigreeNodeParents> progeny) {
-        this.progeny = progeny;
-    }
-
-    public PedigreeNode siblings(List<PedigreeNodeSiblings> siblings) {
-        this.siblings = siblings;
-        return this;
-    }
-
-    public PedigreeNode addSiblingsItem(PedigreeNodeSiblings siblingsItem) {
-        if (this.siblings == null) {
-            this.siblings = new ArrayList<PedigreeNodeSiblings>();
-        }
-        this.siblings.add(siblingsItem);
-        return this;
-    }
-
-    /**
-     * A list of sibling germplasm references in the pedigree tree for this germplasm. These represent edges in the tree, connecting to other nodes. &lt;br/&gt; Siblings share at least one parent with the given germplasm.  &lt;br/&gt; If the parameter &#x27;includeSiblings&#x27; is set to false, then this array should be empty, null, or not present in the response.
-     *
-     * @return siblings
-     **/
-    @Schema(example = "[{\"germplasmDbId\":\"334f53a3\",\"germplasmName\":\"A0021005\"},{\"germplasmDbId\":\"7bbbda8c\",\"germplasmName\":\"A0021006\"},{\"germplasmDbId\":\"ab1d9b26\",\"germplasmName\":\"A0021007\"}]", description = "A list of sibling germplasm references in the pedigree tree for this germplasm. These represent edges in the tree, connecting to other nodes. <br/> Siblings share at least one parent with the given germplasm.  <br/> If the parameter 'includeSiblings' is set to false, then this array should be empty, null, or not present in the response.")
-    public List<PedigreeNodeSiblings> getSiblings() {
-        return siblings;
-    }
-
-    public void setSiblings(List<PedigreeNodeSiblings> siblings) {
-        this.siblings = siblings;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PedigreeNode pedigreeNode = (PedigreeNode) o;
-        return Objects.equals(this.additionalInfo, pedigreeNode.additionalInfo) &&
-                Objects.equals(this.breedingMethodDbId, pedigreeNode.breedingMethodDbId) &&
-                Objects.equals(this.breedingMethodName, pedigreeNode.breedingMethodName) &&
-                Objects.equals(this.crossingProjectDbId, pedigreeNode.crossingProjectDbId) &&
-                Objects.equals(this.crossingYear, pedigreeNode.crossingYear) &&
-                Objects.equals(this.defaultDisplayName, pedigreeNode.defaultDisplayName) &&
-                Objects.equals(this.externalReferences, pedigreeNode.externalReferences) &&
-                Objects.equals(this.familyCode, pedigreeNode.familyCode) &&
-                Objects.equals(this.germplasmDbId, pedigreeNode.germplasmDbId) &&
-                Objects.equals(this.germplasmName, pedigreeNode.germplasmName) &&
-                Objects.equals(this.germplasmPUI, pedigreeNode.germplasmPUI) &&
-                Objects.equals(this.parents, pedigreeNode.parents) &&
-                Objects.equals(this.pedigreeString, pedigreeNode.pedigreeString) &&
-                Objects.equals(this.progeny, pedigreeNode.progeny) &&
-                Objects.equals(this.siblings, pedigreeNode.siblings);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, breedingMethodDbId, breedingMethodName, crossingProjectDbId, crossingYear, defaultDisplayName, externalReferences, familyCode, germplasmDbId, germplasmName, germplasmPUI, parents, pedigreeString, progeny, siblings);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PedigreeNode {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    breedingMethodDbId: ").append(toIndentedString(breedingMethodDbId)).append("\n");
-        sb.append("    breedingMethodName: ").append(toIndentedString(breedingMethodName)).append("\n");
-        sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
-        sb.append("    crossingYear: ").append(toIndentedString(crossingYear)).append("\n");
-        sb.append("    defaultDisplayName: ").append(toIndentedString(defaultDisplayName)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    familyCode: ").append(toIndentedString(familyCode)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    germplasmPUI: ").append(toIndentedString(germplasmPUI)).append("\n");
-        sb.append("    parents: ").append(toIndentedString(parents)).append("\n");
-        sb.append("    pedigreeString: ").append(toIndentedString(pedigreeString)).append("\n");
-        sb.append("    progeny: ").append(toIndentedString(progeny)).append("\n");
-        sb.append("    siblings: ").append(toIndentedString(siblings)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeDEP.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeDEP.java
deleted file mode 100644
index c9bda7eb..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeDEP.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * PedigreeNodeDEP
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class PedigreeNodeDEP {
-    @SerializedName("crossingProjectDbId")
-    private String crossingProjectDbId = null;
-
-    @SerializedName("crossingYear")
-    private Integer crossingYear = null;
-
-    @SerializedName("familyCode")
-    private String familyCode = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("parents")
-    private List<PedigreeNodeDEPParents> parents = null;
-
-    @SerializedName("pedigree")
-    private String pedigree = null;
-
-    @SerializedName("siblings")
-    private List<PedigreeNodeDEPSiblings> siblings = null;
-
-    public PedigreeNodeDEP crossingProjectDbId(String crossingProjectDbId) {
-        this.crossingProjectDbId = crossingProjectDbId;
-        return this;
-    }
-
-    /**
-     * The crossing project used to generate this germplasm
-     *
-     * @return crossingProjectDbId
-     **/
-    @Schema(example = "625e745a", description = "The crossing project used to generate this germplasm")
-    public String getCrossingProjectDbId() {
-        return crossingProjectDbId;
-    }
-
-    public void setCrossingProjectDbId(String crossingProjectDbId) {
-        this.crossingProjectDbId = crossingProjectDbId;
-    }
-
-    public PedigreeNodeDEP crossingYear(Integer crossingYear) {
-        this.crossingYear = crossingYear;
-        return this;
-    }
-
-    /**
-     * The year the parents were originally crossed
-     *
-     * @return crossingYear
-     **/
-    @Schema(example = "2005", description = "The year the parents were originally crossed")
-    public Integer getCrossingYear() {
-        return crossingYear;
-    }
-
-    public void setCrossingYear(Integer crossingYear) {
-        this.crossingYear = crossingYear;
-    }
-
-    public PedigreeNodeDEP familyCode(String familyCode) {
-        this.familyCode = familyCode;
-        return this;
-    }
-
-    /**
-     * The code representing the family
-     *
-     * @return familyCode
-     **/
-    @Schema(example = "F0000203", description = "The code representing the family")
-    public String getFamilyCode() {
-        return familyCode;
-    }
-
-    public void setFamilyCode(String familyCode) {
-        this.familyCode = familyCode;
-    }
-
-    public PedigreeNodeDEP germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "1098ebaf", required = true, description = "The ID which uniquely identifies a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public PedigreeNodeDEP germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * A human readable name for a germplasm
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0021004", description = "A human readable name for a germplasm")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public PedigreeNodeDEP parents(List<PedigreeNodeDEPParents> parents) {
-        this.parents = parents;
-        return this;
-    }
-
-    public PedigreeNodeDEP addParentsItem(PedigreeNodeDEPParents parentsItem) {
-        if (this.parents == null) {
-            this.parents = new ArrayList<PedigreeNodeDEPParents>();
-        }
-        this.parents.add(parentsItem);
-        return this;
-    }
-
-    /**
-     * List of parent nodes in the pedigree tree.
-     *
-     * @return parents
-     **/
-    @Schema(example = "[{\"germplasmDbId\":\"b66958de\",\"germplasmName\":\"A0000592\",\"parentType\":\"MALE\"},{\"germplasmDbId\":\"a55847ed\",\"germplasmName\":\"A0000592\",\"parentType\":\"FEMALE\"}]", description = "List of parent nodes in the pedigree tree.")
-    public List<PedigreeNodeDEPParents> getParents() {
-        return parents;
-    }
-
-    public void setParents(List<PedigreeNodeDEPParents> parents) {
-        this.parents = parents;
-    }
-
-    public PedigreeNodeDEP pedigree(String pedigree) {
-        this.pedigree = pedigree;
-        return this;
-    }
-
-    /**
-     * The string representation of the pedigree in PURDY notation.
-     *
-     * @return pedigree
-     **/
-    @Schema(example = "A0000001/A0000002", description = "The string representation of the pedigree in PURDY notation.")
-    public String getPedigree() {
-        return pedigree;
-    }
-
-    public void setPedigree(String pedigree) {
-        this.pedigree = pedigree;
-    }
-
-    public PedigreeNodeDEP siblings(List<PedigreeNodeDEPSiblings> siblings) {
-        this.siblings = siblings;
-        return this;
-    }
-
-    public PedigreeNodeDEP addSiblingsItem(PedigreeNodeDEPSiblings siblingsItem) {
-        if (this.siblings == null) {
-            this.siblings = new ArrayList<PedigreeNodeDEPSiblings>();
-        }
-        this.siblings.add(siblingsItem);
-        return this;
-    }
-
-    /**
-     * List of sibling germplasm
-     *
-     * @return siblings
-     **/
-    @Schema(example = "[{\"germplasmDbId\":\"334f53a3\",\"germplasmName\":\"A0021005\"},{\"germplasmDbId\":\"7bbbda8c\",\"germplasmName\":\"A0021006\"},{\"germplasmDbId\":\"ab1d9b26\",\"germplasmName\":\"A0021007\"}]", description = "List of sibling germplasm")
-    public List<PedigreeNodeDEPSiblings> getSiblings() {
-        return siblings;
-    }
-
-    public void setSiblings(List<PedigreeNodeDEPSiblings> siblings) {
-        this.siblings = siblings;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PedigreeNodeDEP pedigreeNodeDEP = (PedigreeNodeDEP) o;
-        return Objects.equals(this.crossingProjectDbId, pedigreeNodeDEP.crossingProjectDbId) &&
-                Objects.equals(this.crossingYear, pedigreeNodeDEP.crossingYear) &&
-                Objects.equals(this.familyCode, pedigreeNodeDEP.familyCode) &&
-                Objects.equals(this.germplasmDbId, pedigreeNodeDEP.germplasmDbId) &&
-                Objects.equals(this.germplasmName, pedigreeNodeDEP.germplasmName) &&
-                Objects.equals(this.parents, pedigreeNodeDEP.parents) &&
-                Objects.equals(this.pedigree, pedigreeNodeDEP.pedigree) &&
-                Objects.equals(this.siblings, pedigreeNodeDEP.siblings);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(crossingProjectDbId, crossingYear, familyCode, germplasmDbId, germplasmName, parents, pedigree, siblings);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PedigreeNodeDEP {\n");
-
-        sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
-        sb.append("    crossingYear: ").append(toIndentedString(crossingYear)).append("\n");
-        sb.append("    familyCode: ").append(toIndentedString(familyCode)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    parents: ").append(toIndentedString(parents)).append("\n");
-        sb.append("    pedigree: ").append(toIndentedString(pedigree)).append("\n");
-        sb.append("    siblings: ").append(toIndentedString(siblings)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeDEPParents.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeDEPParents.java
deleted file mode 100644
index b07c9713..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeDEPParents.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * PedigreeNodeDEPParents
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class PedigreeNodeDEPParents {
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("parentType")
-    private ParentTypeDEP parentType = null;
-
-    public PedigreeNodeDEPParents germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The germplasm DbId of the parent of this germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "a55847ed", description = "The germplasm DbId of the parent of this germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public PedigreeNodeDEPParents germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * the human readable name of the parent of this germplasm
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000592", description = "the human readable name of the parent of this germplasm")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public PedigreeNodeDEPParents parentType(ParentTypeDEP parentType) {
-        this.parentType = parentType;
-        return this;
-    }
-
-    /**
-     * Get parentType
-     *
-     * @return parentType
-     **/
-    @Schema(description = "")
-    public ParentTypeDEP getParentType() {
-        return parentType;
-    }
-
-    public void setParentType(ParentTypeDEP parentType) {
-        this.parentType = parentType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PedigreeNodeDEPParents pedigreeNodeDEPParents = (PedigreeNodeDEPParents) o;
-        return Objects.equals(this.germplasmDbId, pedigreeNodeDEPParents.germplasmDbId) &&
-                Objects.equals(this.germplasmName, pedigreeNodeDEPParents.germplasmName) &&
-                Objects.equals(this.parentType, pedigreeNodeDEPParents.parentType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(germplasmDbId, germplasmName, parentType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PedigreeNodeDEPParents {\n");
-
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    parentType: ").append(toIndentedString(parentType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeDEPSiblings.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeDEPSiblings.java
deleted file mode 100644
index 4f3ff301..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeDEPSiblings.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * PedigreeNodeDEPSiblings
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class PedigreeNodeDEPSiblings {
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    public PedigreeNodeDEPSiblings germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * the germplasm DbId of the sibling
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(description = "the germplasm DbId of the sibling")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public PedigreeNodeDEPSiblings germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * the germplasm name of the sibling
-     *
-     * @return germplasmName
-     **/
-    @Schema(description = "the germplasm name of the sibling")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PedigreeNodeDEPSiblings pedigreeNodeDEPSiblings = (PedigreeNodeDEPSiblings) o;
-        return Objects.equals(this.germplasmDbId, pedigreeNodeDEPSiblings.germplasmDbId) &&
-                Objects.equals(this.germplasmName, pedigreeNodeDEPSiblings.germplasmName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(germplasmDbId, germplasmName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PedigreeNodeDEPSiblings {\n");
-
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeParents.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeParents.java
deleted file mode 100644
index 1bde2c80..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeParents.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * PedigreeNodeParents
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class PedigreeNodeParents {
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("parentType")
-    private ParentType parentType = null;
-
-    public PedigreeNodeParents germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "a55847ed", required = true, description = "The ID which uniquely identifies a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public PedigreeNodeParents germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * A human readable name for a germplasm
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000592", description = "A human readable name for a germplasm")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public PedigreeNodeParents parentType(ParentType parentType) {
-        this.parentType = parentType;
-        return this;
-    }
-
-    /**
-     * Get parentType
-     *
-     * @return parentType
-     **/
-    @Schema(required = true, description = "")
-    public ParentType getParentType() {
-        return parentType;
-    }
-
-    public void setParentType(ParentType parentType) {
-        this.parentType = parentType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PedigreeNodeParents pedigreeNodeParents = (PedigreeNodeParents) o;
-        return Objects.equals(this.germplasmDbId, pedigreeNodeParents.germplasmDbId) &&
-                Objects.equals(this.germplasmName, pedigreeNodeParents.germplasmName) &&
-                Objects.equals(this.parentType, pedigreeNodeParents.parentType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(germplasmDbId, germplasmName, parentType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PedigreeNodeParents {\n");
-
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    parentType: ").append(toIndentedString(parentType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeSiblings.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeSiblings.java
deleted file mode 100644
index 8834b455..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeNodeSiblings.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * PedigreeNodeSiblings
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class PedigreeNodeSiblings {
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    public PedigreeNodeSiblings germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "a55847ed", required = true, description = "The ID which uniquely identifies a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public PedigreeNodeSiblings germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * A human readable name for a germplasm
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000592", description = "A human readable name for a germplasm")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PedigreeNodeSiblings pedigreeNodeSiblings = (PedigreeNodeSiblings) o;
-        return Objects.equals(this.germplasmDbId, pedigreeNodeSiblings.germplasmDbId) &&
-                Objects.equals(this.germplasmName, pedigreeNodeSiblings.germplasmName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(germplasmDbId, germplasmName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PedigreeNodeSiblings {\n");
-
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeSearchRequest.java
deleted file mode 100644
index 51349a22..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PedigreeSearchRequest.java
+++ /dev/null
@@ -1,930 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * PedigreeSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class PedigreeSearchRequest {
-    @SerializedName("accessionNumbers")
-    private List<String> accessionNumbers = null;
-
-    @SerializedName("binomialNames")
-    private List<String> binomialNames = null;
-
-    @SerializedName("collections")
-    private List<String> collections = null;
-
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("familyCodes")
-    private List<String> familyCodes = null;
-
-    @SerializedName("genus")
-    private List<String> genus = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("germplasmPUIs")
-    private List<String> germplasmPUIs = null;
-
-    @SerializedName("includeFullTree")
-    private Boolean includeFullTree = null;
-
-    @SerializedName("includeParents")
-    private Boolean includeParents = null;
-
-    @SerializedName("includeProgeny")
-    private Boolean includeProgeny = null;
-
-    @SerializedName("includeSiblings")
-    private Boolean includeSiblings = null;
-
-    @SerializedName("instituteCodes")
-    private List<String> instituteCodes = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("pedigreeDepth")
-    private Integer pedigreeDepth = null;
-
-    @SerializedName("progenyDepth")
-    private Integer progenyDepth = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("species")
-    private List<String> species = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public PedigreeSearchRequest accessionNumbers(List<String> accessionNumbers) {
-        this.accessionNumbers = accessionNumbers;
-        return this;
-    }
-
-    public PedigreeSearchRequest addAccessionNumbersItem(String accessionNumbersItem) {
-        if (this.accessionNumbers == null) {
-            this.accessionNumbers = new ArrayList<String>();
-        }
-        this.accessionNumbers.add(accessionNumbersItem);
-        return this;
-    }
-
-    /**
-     * A collection of unique identifiers for materials or germplasm within a genebank  MCPD (v2.1) (ACCENUMB) 2. This is the unique identifier for accessions within a genebank, and is assigned when a sample is entered into the genebank collection (e.g. \&quot;PI 113869\&quot;).
-     *
-     * @return accessionNumbers
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "A collection of unique identifiers for materials or germplasm within a genebank  MCPD (v2.1) (ACCENUMB) 2. This is the unique identifier for accessions within a genebank, and is assigned when a sample is entered into the genebank collection (e.g. \"PI 113869\").")
-    public List<String> getAccessionNumbers() {
-        return accessionNumbers;
-    }
-
-    public void setAccessionNumbers(List<String> accessionNumbers) {
-        this.accessionNumbers = accessionNumbers;
-    }
-
-    public PedigreeSearchRequest binomialNames(List<String> binomialNames) {
-        this.binomialNames = binomialNames;
-        return this;
-    }
-
-    public PedigreeSearchRequest addBinomialNamesItem(String binomialNamesItem) {
-        if (this.binomialNames == null) {
-            this.binomialNames = new ArrayList<String>();
-        }
-        this.binomialNames.add(binomialNamesItem);
-        return this;
-    }
-
-    /**
-     * List of the full binomial name (scientific name) to identify a germplasm
-     *
-     * @return binomialNames
-     **/
-    @Schema(example = "[\"Aspergillus fructus\",\"Zea mays\"]", description = "List of the full binomial name (scientific name) to identify a germplasm")
-    public List<String> getBinomialNames() {
-        return binomialNames;
-    }
-
-    public void setBinomialNames(List<String> binomialNames) {
-        this.binomialNames = binomialNames;
-    }
-
-    public PedigreeSearchRequest collections(List<String> collections) {
-        this.collections = collections;
-        return this;
-    }
-
-    public PedigreeSearchRequest addCollectionsItem(String collectionsItem) {
-        if (this.collections == null) {
-            this.collections = new ArrayList<String>();
-        }
-        this.collections.add(collectionsItem);
-        return this;
-    }
-
-    /**
-     * A specific panel/collection/population name this germplasm belongs to.
-     *
-     * @return collections
-     **/
-    @Schema(example = "[\"RDP1\",\"MDP1\"]", description = "A specific panel/collection/population name this germplasm belongs to.")
-    public List<String> getCollections() {
-        return collections;
-    }
-
-    public void setCollections(List<String> collections) {
-        this.collections = collections;
-    }
-
-    public PedigreeSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public PedigreeSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public PedigreeSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public PedigreeSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public PedigreeSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public PedigreeSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public PedigreeSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public PedigreeSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public PedigreeSearchRequest familyCodes(List<String> familyCodes) {
-        this.familyCodes = familyCodes;
-        return this;
-    }
-
-    public PedigreeSearchRequest addFamilyCodesItem(String familyCodesItem) {
-        if (this.familyCodes == null) {
-            this.familyCodes = new ArrayList<String>();
-        }
-        this.familyCodes.add(familyCodesItem);
-        return this;
-    }
-
-    /**
-     * A familyCode representing the family this germplasm belongs to.
-     *
-     * @return familyCodes
-     **/
-    @Schema(example = "[\"f0000203\",\"fa009965\"]", description = "A familyCode representing the family this germplasm belongs to.")
-    public List<String> getFamilyCodes() {
-        return familyCodes;
-    }
-
-    public void setFamilyCodes(List<String> familyCodes) {
-        this.familyCodes = familyCodes;
-    }
-
-    public PedigreeSearchRequest genus(List<String> genus) {
-        this.genus = genus;
-        return this;
-    }
-
-    public PedigreeSearchRequest addGenusItem(String genusItem) {
-        if (this.genus == null) {
-            this.genus = new ArrayList<String>();
-        }
-        this.genus.add(genusItem);
-        return this;
-    }
-
-    /**
-     * List of Genus names to identify germplasm
-     *
-     * @return genus
-     **/
-    @Schema(example = "[\"Aspergillus\",\"Zea\"]", description = "List of Genus names to identify germplasm")
-    public List<String> getGenus() {
-        return genus;
-    }
-
-    public void setGenus(List<String> genus) {
-        this.genus = genus;
-    }
-
-    public PedigreeSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public PedigreeSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public PedigreeSearchRequest germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public PedigreeSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public PedigreeSearchRequest germplasmPUIs(List<String> germplasmPUIs) {
-        this.germplasmPUIs = germplasmPUIs;
-        return this;
-    }
-
-    public PedigreeSearchRequest addGermplasmPUIsItem(String germplasmPUIsItem) {
-        if (this.germplasmPUIs == null) {
-            this.germplasmPUIs = new ArrayList<String>();
-        }
-        this.germplasmPUIs.add(germplasmPUIsItem);
-        return this;
-    }
-
-    /**
-     * List of Permanent Unique Identifiers to identify germplasm
-     *
-     * @return germplasmPUIs
-     **/
-    @Schema(example = "[\"http://pui.per/accession/A0000003\",\"http://pui.per/accession/A0000477\"]", description = "List of Permanent Unique Identifiers to identify germplasm")
-    public List<String> getGermplasmPUIs() {
-        return germplasmPUIs;
-    }
-
-    public void setGermplasmPUIs(List<String> germplasmPUIs) {
-        this.germplasmPUIs = germplasmPUIs;
-    }
-
-    public PedigreeSearchRequest includeFullTree(Boolean includeFullTree) {
-        this.includeFullTree = includeFullTree;
-        return this;
-    }
-
-    /**
-     * If this parameter is true, recursively include ALL of the nodes available in this pedigree tree
-     *
-     * @return includeFullTree
-     **/
-    @Schema(example = "true", description = "If this parameter is true, recursively include ALL of the nodes available in this pedigree tree")
-    public Boolean isIncludeFullTree() {
-        return includeFullTree;
-    }
-
-    public void setIncludeFullTree(Boolean includeFullTree) {
-        this.includeFullTree = includeFullTree;
-    }
-
-    public PedigreeSearchRequest includeParents(Boolean includeParents) {
-        this.includeParents = includeParents;
-        return this;
-    }
-
-    /**
-     * If this parameter is true, include the array of parents in the response
-     *
-     * @return includeParents
-     **/
-    @Schema(example = "true", description = "If this parameter is true, include the array of parents in the response")
-    public Boolean isIncludeParents() {
-        return includeParents;
-    }
-
-    public void setIncludeParents(Boolean includeParents) {
-        this.includeParents = includeParents;
-    }
-
-    public PedigreeSearchRequest includeProgeny(Boolean includeProgeny) {
-        this.includeProgeny = includeProgeny;
-        return this;
-    }
-
-    /**
-     * If this parameter is true, include the array of progeny in the response
-     *
-     * @return includeProgeny
-     **/
-    @Schema(example = "true", description = "If this parameter is true, include the array of progeny in the response")
-    public Boolean isIncludeProgeny() {
-        return includeProgeny;
-    }
-
-    public void setIncludeProgeny(Boolean includeProgeny) {
-        this.includeProgeny = includeProgeny;
-    }
-
-    public PedigreeSearchRequest includeSiblings(Boolean includeSiblings) {
-        this.includeSiblings = includeSiblings;
-        return this;
-    }
-
-    /**
-     * If this parameter is true, include the array of siblings in the response
-     *
-     * @return includeSiblings
-     **/
-    @Schema(example = "true", description = "If this parameter is true, include the array of siblings in the response")
-    public Boolean isIncludeSiblings() {
-        return includeSiblings;
-    }
-
-    public void setIncludeSiblings(Boolean includeSiblings) {
-        this.includeSiblings = includeSiblings;
-    }
-
-    public PedigreeSearchRequest instituteCodes(List<String> instituteCodes) {
-        this.instituteCodes = instituteCodes;
-        return this;
-    }
-
-    public PedigreeSearchRequest addInstituteCodesItem(String instituteCodesItem) {
-        if (this.instituteCodes == null) {
-            this.instituteCodes = new ArrayList<String>();
-        }
-        this.instituteCodes.add(instituteCodesItem);
-        return this;
-    }
-
-    /**
-     * The code for the institute that maintains the material.  &lt;br/&gt; MCPD (v2.1) (INSTCODE) 1. FAO WIEWS code of the institute where the accession is maintained. The codes consist of the 3-letter ISO 3166 country code of the country where the institute is located plus a number (e.g. PER001). The current set of institute codes is available from http://www.fao.org/wiews. For those institutes not yet having an FAO Code, or for those with \&quot;obsolete\&quot; codes, see \&quot;Common formatting rules (v)\&quot;.
-     *
-     * @return instituteCodes
-     **/
-    @Schema(example = "[\"PER001\",\"NOR001\"]", description = "The code for the institute that maintains the material.  <br/> MCPD (v2.1) (INSTCODE) 1. FAO WIEWS code of the institute where the accession is maintained. The codes consist of the 3-letter ISO 3166 country code of the country where the institute is located plus a number (e.g. PER001). The current set of institute codes is available from http://www.fao.org/wiews. For those institutes not yet having an FAO Code, or for those with \"obsolete\" codes, see \"Common formatting rules (v)\".")
-    public List<String> getInstituteCodes() {
-        return instituteCodes;
-    }
-
-    public void setInstituteCodes(List<String> instituteCodes) {
-        this.instituteCodes = instituteCodes;
-    }
-
-    public PedigreeSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public PedigreeSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public PedigreeSearchRequest pedigreeDepth(Integer pedigreeDepth) {
-        this.pedigreeDepth = pedigreeDepth;
-        return this;
-    }
-
-    /**
-     * Recursively include this number of levels up the tree in the response (parents, grand-parents, great-grand-parents, etc)
-     *
-     * @return pedigreeDepth
-     **/
-    @Schema(example = "3", description = "Recursively include this number of levels up the tree in the response (parents, grand-parents, great-grand-parents, etc)")
-    public Integer getPedigreeDepth() {
-        return pedigreeDepth;
-    }
-
-    public void setPedigreeDepth(Integer pedigreeDepth) {
-        this.pedigreeDepth = pedigreeDepth;
-    }
-
-    public PedigreeSearchRequest progenyDepth(Integer progenyDepth) {
-        this.progenyDepth = progenyDepth;
-        return this;
-    }
-
-    /**
-     * Recursively include this number of levels down the tree in the response (children, grand-children, great-grand-children, etc)
-     *
-     * @return progenyDepth
-     **/
-    @Schema(example = "3", description = "Recursively include this number of levels down the tree in the response (children, grand-children, great-grand-children, etc)")
-    public Integer getProgenyDepth() {
-        return progenyDepth;
-    }
-
-    public void setProgenyDepth(Integer progenyDepth) {
-        this.progenyDepth = progenyDepth;
-    }
-
-    public PedigreeSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public PedigreeSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public PedigreeSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public PedigreeSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public PedigreeSearchRequest species(List<String> species) {
-        this.species = species;
-        return this;
-    }
-
-    public PedigreeSearchRequest addSpeciesItem(String speciesItem) {
-        if (this.species == null) {
-            this.species = new ArrayList<String>();
-        }
-        this.species.add(speciesItem);
-        return this;
-    }
-
-    /**
-     * List of Species names to identify germplasm
-     *
-     * @return species
-     **/
-    @Schema(example = "[\"fructus\",\"mays\"]", description = "List of Species names to identify germplasm")
-    public List<String> getSpecies() {
-        return species;
-    }
-
-    public void setSpecies(List<String> species) {
-        this.species = species;
-    }
-
-    public PedigreeSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public PedigreeSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public PedigreeSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public PedigreeSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public PedigreeSearchRequest synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public PedigreeSearchRequest addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * List of alternative names or IDs used to reference this germplasm
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"variety_1\",\"2c38f9b6\"]", description = "List of alternative names or IDs used to reference this germplasm")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public PedigreeSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public PedigreeSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public PedigreeSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public PedigreeSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PedigreeSearchRequest pedigreeSearchRequest = (PedigreeSearchRequest) o;
-        return Objects.equals(this.accessionNumbers, pedigreeSearchRequest.accessionNumbers) &&
-                Objects.equals(this.binomialNames, pedigreeSearchRequest.binomialNames) &&
-                Objects.equals(this.collections, pedigreeSearchRequest.collections) &&
-                Objects.equals(this.commonCropNames, pedigreeSearchRequest.commonCropNames) &&
-                Objects.equals(this.externalReferenceIDs, pedigreeSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, pedigreeSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, pedigreeSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.familyCodes, pedigreeSearchRequest.familyCodes) &&
-                Objects.equals(this.genus, pedigreeSearchRequest.genus) &&
-                Objects.equals(this.germplasmDbIds, pedigreeSearchRequest.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, pedigreeSearchRequest.germplasmNames) &&
-                Objects.equals(this.germplasmPUIs, pedigreeSearchRequest.germplasmPUIs) &&
-                Objects.equals(this.includeFullTree, pedigreeSearchRequest.includeFullTree) &&
-                Objects.equals(this.includeParents, pedigreeSearchRequest.includeParents) &&
-                Objects.equals(this.includeProgeny, pedigreeSearchRequest.includeProgeny) &&
-                Objects.equals(this.includeSiblings, pedigreeSearchRequest.includeSiblings) &&
-                Objects.equals(this.instituteCodes, pedigreeSearchRequest.instituteCodes) &&
-                Objects.equals(this.page, pedigreeSearchRequest.page) &&
-                Objects.equals(this.pageSize, pedigreeSearchRequest.pageSize) &&
-                Objects.equals(this.pedigreeDepth, pedigreeSearchRequest.pedigreeDepth) &&
-                Objects.equals(this.progenyDepth, pedigreeSearchRequest.progenyDepth) &&
-                Objects.equals(this.programDbIds, pedigreeSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, pedigreeSearchRequest.programNames) &&
-                Objects.equals(this.species, pedigreeSearchRequest.species) &&
-                Objects.equals(this.studyDbIds, pedigreeSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, pedigreeSearchRequest.studyNames) &&
-                Objects.equals(this.synonyms, pedigreeSearchRequest.synonyms) &&
-                Objects.equals(this.trialDbIds, pedigreeSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, pedigreeSearchRequest.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(accessionNumbers, binomialNames, collections, commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, familyCodes, genus, germplasmDbIds, germplasmNames, germplasmPUIs, includeFullTree, includeParents, includeProgeny, includeSiblings, instituteCodes, page, pageSize, pedigreeDepth, progenyDepth, programDbIds, programNames, species, studyDbIds, studyNames, synonyms, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PedigreeSearchRequest {\n");
-
-        sb.append("    accessionNumbers: ").append(toIndentedString(accessionNumbers)).append("\n");
-        sb.append("    binomialNames: ").append(toIndentedString(binomialNames)).append("\n");
-        sb.append("    collections: ").append(toIndentedString(collections)).append("\n");
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    familyCodes: ").append(toIndentedString(familyCodes)).append("\n");
-        sb.append("    genus: ").append(toIndentedString(genus)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    germplasmPUIs: ").append(toIndentedString(germplasmPUIs)).append("\n");
-        sb.append("    includeFullTree: ").append(toIndentedString(includeFullTree)).append("\n");
-        sb.append("    includeParents: ").append(toIndentedString(includeParents)).append("\n");
-        sb.append("    includeProgeny: ").append(toIndentedString(includeProgeny)).append("\n");
-        sb.append("    includeSiblings: ").append(toIndentedString(includeSiblings)).append("\n");
-        sb.append("    instituteCodes: ").append(toIndentedString(instituteCodes)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    pedigreeDepth: ").append(toIndentedString(pedigreeDepth)).append("\n");
-        sb.append("    progenyDepth: ").append(toIndentedString(progenyDepth)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    species: ").append(toIndentedString(species)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PlannedCross.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PlannedCross.java
deleted file mode 100644
index 60909e33..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PlannedCross.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * PlannedCross
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class PlannedCross {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    /**
-     * the type of cross
-     */
-    @JsonAdapter(CrossTypeEnum.Adapter.class)
-    public enum CrossTypeEnum {
-        BIPARENTAL("BIPARENTAL"),
-        SELF("SELF"),
-        OPEN_POLLINATED("OPEN_POLLINATED"),
-        BULK("BULK"),
-        BULK_SELFED("BULK_SELFED"),
-        BULK_OPEN_POLLINATED("BULK_OPEN_POLLINATED"),
-        DOUBLE_HAPLOID("DOUBLE_HAPLOID");
-
-        private String value;
-
-        CrossTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static CrossTypeEnum fromValue(String input) {
-            for (CrossTypeEnum b : CrossTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<CrossTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final CrossTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public CrossTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return CrossTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("crossType")
-    private CrossTypeEnum crossType = null;
-
-    @SerializedName("crossingProjectDbId")
-    private String crossingProjectDbId = null;
-
-    @SerializedName("crossingProjectName")
-    private String crossingProjectName = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("parent1")
-    private CrossParent1 parent1 = null;
-
-    @SerializedName("parent2")
-    private CrossParent1 parent2 = null;
-
-    @SerializedName("plannedCrossDbId")
-    private String plannedCrossDbId = null;
-
-    @SerializedName("plannedCrossName")
-    private String plannedCrossName = null;
-
-    /**
-     * The status of this planned cross. Is it waiting to be performed (&#x27;TODO&#x27;), has it been completed successfully (&#x27;DONE&#x27;), or has it not been done on purpose (&#x27;SKIPPED&#x27;).
-     */
-    @JsonAdapter(StatusEnum.Adapter.class)
-    public enum StatusEnum {
-        TODO("TODO"),
-        DONE("DONE"),
-        SKIPPED("SKIPPED");
-
-        private String value;
-
-        StatusEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static StatusEnum fromValue(String input) {
-            for (StatusEnum b : StatusEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<StatusEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final StatusEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public StatusEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return StatusEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("status")
-    private StatusEnum status = null;
-
-    public PlannedCross additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public PlannedCross putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public PlannedCross crossType(CrossTypeEnum crossType) {
-        this.crossType = crossType;
-        return this;
-    }
-
-    /**
-     * the type of cross
-     *
-     * @return crossType
-     **/
-    @Schema(example = "BIPARENTAL", description = "the type of cross")
-    public CrossTypeEnum getCrossType() {
-        return crossType;
-    }
-
-    public void setCrossType(CrossTypeEnum crossType) {
-        this.crossType = crossType;
-    }
-
-    public PlannedCross crossingProjectDbId(String crossingProjectDbId) {
-        this.crossingProjectDbId = crossingProjectDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for a crossing project
-     *
-     * @return crossingProjectDbId
-     **/
-    @Schema(example = "696d7c92", description = "the unique identifier for a crossing project")
-    public String getCrossingProjectDbId() {
-        return crossingProjectDbId;
-    }
-
-    public void setCrossingProjectDbId(String crossingProjectDbId) {
-        this.crossingProjectDbId = crossingProjectDbId;
-    }
-
-    public PlannedCross crossingProjectName(String crossingProjectName) {
-        this.crossingProjectName = crossingProjectName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a crossing project
-     *
-     * @return crossingProjectName
-     **/
-    @Schema(example = "my_Crosses_2018", description = "the human readable name for a crossing project")
-    public String getCrossingProjectName() {
-        return crossingProjectName;
-    }
-
-    public void setCrossingProjectName(String crossingProjectName) {
-        this.crossingProjectName = crossingProjectName;
-    }
-
-    public PlannedCross externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public PlannedCross addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public PlannedCross parent1(CrossParent1 parent1) {
-        this.parent1 = parent1;
-        return this;
-    }
-
-    /**
-     * Get parent1
-     *
-     * @return parent1
-     **/
-    @Schema(description = "")
-    public CrossParent1 getParent1() {
-        return parent1;
-    }
-
-    public void setParent1(CrossParent1 parent1) {
-        this.parent1 = parent1;
-    }
-
-    public PlannedCross parent2(CrossParent1 parent2) {
-        this.parent2 = parent2;
-        return this;
-    }
-
-    /**
-     * Get parent2
-     *
-     * @return parent2
-     **/
-    @Schema(description = "")
-    public CrossParent1 getParent2() {
-        return parent2;
-    }
-
-    public void setParent2(CrossParent1 parent2) {
-        this.parent2 = parent2;
-    }
-
-    public PlannedCross plannedCrossDbId(String plannedCrossDbId) {
-        this.plannedCrossDbId = plannedCrossDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for a planned cross
-     *
-     * @return plannedCrossDbId
-     **/
-    @Schema(example = "c8905568", description = "the unique identifier for a planned cross")
-    public String getPlannedCrossDbId() {
-        return plannedCrossDbId;
-    }
-
-    public void setPlannedCrossDbId(String plannedCrossDbId) {
-        this.plannedCrossDbId = plannedCrossDbId;
-    }
-
-    public PlannedCross plannedCrossName(String plannedCrossName) {
-        this.plannedCrossName = plannedCrossName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a planned cross
-     *
-     * @return plannedCrossName
-     **/
-    @Schema(example = "my_Crosses_2018_01", description = "the human readable name for a planned cross")
-    public String getPlannedCrossName() {
-        return plannedCrossName;
-    }
-
-    public void setPlannedCrossName(String plannedCrossName) {
-        this.plannedCrossName = plannedCrossName;
-    }
-
-    public PlannedCross status(StatusEnum status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * The status of this planned cross. Is it waiting to be performed (&#x27;TODO&#x27;), has it been completed successfully (&#x27;DONE&#x27;), or has it not been done on purpose (&#x27;SKIPPED&#x27;).
-     *
-     * @return status
-     **/
-    @Schema(example = "TODO", description = "The status of this planned cross. Is it waiting to be performed ('TODO'), has it been completed successfully ('DONE'), or has it not been done on purpose ('SKIPPED').")
-    public StatusEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(StatusEnum status) {
-        this.status = status;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PlannedCross plannedCross = (PlannedCross) o;
-        return Objects.equals(this.additionalInfo, plannedCross.additionalInfo) &&
-                Objects.equals(this.crossType, plannedCross.crossType) &&
-                Objects.equals(this.crossingProjectDbId, plannedCross.crossingProjectDbId) &&
-                Objects.equals(this.crossingProjectName, plannedCross.crossingProjectName) &&
-                Objects.equals(this.externalReferences, plannedCross.externalReferences) &&
-                Objects.equals(this.parent1, plannedCross.parent1) &&
-                Objects.equals(this.parent2, plannedCross.parent2) &&
-                Objects.equals(this.plannedCrossDbId, plannedCross.plannedCrossDbId) &&
-                Objects.equals(this.plannedCrossName, plannedCross.plannedCrossName) &&
-                Objects.equals(this.status, plannedCross.status);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, crossType, crossingProjectDbId, crossingProjectName, externalReferences, parent1, parent2, plannedCrossDbId, plannedCrossName, status);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PlannedCross {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    crossType: ").append(toIndentedString(crossType)).append("\n");
-        sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
-        sb.append("    crossingProjectName: ").append(toIndentedString(crossingProjectName)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    parent1: ").append(toIndentedString(parent1)).append("\n");
-        sb.append("    parent2: ").append(toIndentedString(parent2)).append("\n");
-        sb.append("    plannedCrossDbId: ").append(toIndentedString(plannedCrossDbId)).append("\n");
-        sb.append("    plannedCrossName: ").append(toIndentedString(plannedCrossName)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PlannedCrossNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PlannedCrossNewRequest.java
deleted file mode 100644
index 75b1a489..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PlannedCrossNewRequest.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * PlannedCrossNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class PlannedCrossNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    /**
-     * the type of cross
-     */
-    @JsonAdapter(CrossTypeEnum.Adapter.class)
-    public enum CrossTypeEnum {
-        BIPARENTAL("BIPARENTAL"),
-        SELF("SELF"),
-        OPEN_POLLINATED("OPEN_POLLINATED"),
-        BULK("BULK"),
-        BULK_SELFED("BULK_SELFED"),
-        BULK_OPEN_POLLINATED("BULK_OPEN_POLLINATED"),
-        DOUBLE_HAPLOID("DOUBLE_HAPLOID");
-
-        private String value;
-
-        CrossTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static CrossTypeEnum fromValue(String input) {
-            for (CrossTypeEnum b : CrossTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<CrossTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final CrossTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public CrossTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return CrossTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("crossType")
-    private CrossTypeEnum crossType = null;
-
-    @SerializedName("crossingProjectDbId")
-    private String crossingProjectDbId = null;
-
-    @SerializedName("crossingProjectName")
-    private String crossingProjectName = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("parent1")
-    private CrossParent1 parent1 = null;
-
-    @SerializedName("parent2")
-    private CrossParent1 parent2 = null;
-
-    @SerializedName("plannedCrossName")
-    private String plannedCrossName = null;
-
-    /**
-     * The status of this planned cross. Is it waiting to be performed (&#x27;TODO&#x27;), has it been completed successfully (&#x27;DONE&#x27;), or has it not been done on purpose (&#x27;SKIPPED&#x27;).
-     */
-    @JsonAdapter(StatusEnum.Adapter.class)
-    public enum StatusEnum {
-        TODO("TODO"),
-        DONE("DONE"),
-        SKIPPED("SKIPPED");
-
-        private String value;
-
-        StatusEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static StatusEnum fromValue(String input) {
-            for (StatusEnum b : StatusEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<StatusEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final StatusEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public StatusEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return StatusEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("status")
-    private StatusEnum status = null;
-
-    public PlannedCrossNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public PlannedCrossNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public PlannedCrossNewRequest crossType(CrossTypeEnum crossType) {
-        this.crossType = crossType;
-        return this;
-    }
-
-    /**
-     * the type of cross
-     *
-     * @return crossType
-     **/
-    @Schema(example = "BIPARENTAL", description = "the type of cross")
-    public CrossTypeEnum getCrossType() {
-        return crossType;
-    }
-
-    public void setCrossType(CrossTypeEnum crossType) {
-        this.crossType = crossType;
-    }
-
-    public PlannedCrossNewRequest crossingProjectDbId(String crossingProjectDbId) {
-        this.crossingProjectDbId = crossingProjectDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for a crossing project
-     *
-     * @return crossingProjectDbId
-     **/
-    @Schema(example = "696d7c92", description = "the unique identifier for a crossing project")
-    public String getCrossingProjectDbId() {
-        return crossingProjectDbId;
-    }
-
-    public void setCrossingProjectDbId(String crossingProjectDbId) {
-        this.crossingProjectDbId = crossingProjectDbId;
-    }
-
-    public PlannedCrossNewRequest crossingProjectName(String crossingProjectName) {
-        this.crossingProjectName = crossingProjectName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a crossing project
-     *
-     * @return crossingProjectName
-     **/
-    @Schema(example = "my_Crosses_2018", description = "the human readable name for a crossing project")
-    public String getCrossingProjectName() {
-        return crossingProjectName;
-    }
-
-    public void setCrossingProjectName(String crossingProjectName) {
-        this.crossingProjectName = crossingProjectName;
-    }
-
-    public PlannedCrossNewRequest externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public PlannedCrossNewRequest addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public PlannedCrossNewRequest parent1(CrossParent1 parent1) {
-        this.parent1 = parent1;
-        return this;
-    }
-
-    /**
-     * Get parent1
-     *
-     * @return parent1
-     **/
-    @Schema(description = "")
-    public CrossParent1 getParent1() {
-        return parent1;
-    }
-
-    public void setParent1(CrossParent1 parent1) {
-        this.parent1 = parent1;
-    }
-
-    public PlannedCrossNewRequest parent2(CrossParent1 parent2) {
-        this.parent2 = parent2;
-        return this;
-    }
-
-    /**
-     * Get parent2
-     *
-     * @return parent2
-     **/
-    @Schema(description = "")
-    public CrossParent1 getParent2() {
-        return parent2;
-    }
-
-    public void setParent2(CrossParent1 parent2) {
-        this.parent2 = parent2;
-    }
-
-    public PlannedCrossNewRequest plannedCrossName(String plannedCrossName) {
-        this.plannedCrossName = plannedCrossName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a planned cross
-     *
-     * @return plannedCrossName
-     **/
-    @Schema(example = "my_Crosses_2018_01", description = "the human readable name for a planned cross")
-    public String getPlannedCrossName() {
-        return plannedCrossName;
-    }
-
-    public void setPlannedCrossName(String plannedCrossName) {
-        this.plannedCrossName = plannedCrossName;
-    }
-
-    public PlannedCrossNewRequest status(StatusEnum status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * The status of this planned cross. Is it waiting to be performed (&#x27;TODO&#x27;), has it been completed successfully (&#x27;DONE&#x27;), or has it not been done on purpose (&#x27;SKIPPED&#x27;).
-     *
-     * @return status
-     **/
-    @Schema(example = "TODO", description = "The status of this planned cross. Is it waiting to be performed ('TODO'), has it been completed successfully ('DONE'), or has it not been done on purpose ('SKIPPED').")
-    public StatusEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(StatusEnum status) {
-        this.status = status;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PlannedCrossNewRequest plannedCrossNewRequest = (PlannedCrossNewRequest) o;
-        return Objects.equals(this.additionalInfo, plannedCrossNewRequest.additionalInfo) &&
-                Objects.equals(this.crossType, plannedCrossNewRequest.crossType) &&
-                Objects.equals(this.crossingProjectDbId, plannedCrossNewRequest.crossingProjectDbId) &&
-                Objects.equals(this.crossingProjectName, plannedCrossNewRequest.crossingProjectName) &&
-                Objects.equals(this.externalReferences, plannedCrossNewRequest.externalReferences) &&
-                Objects.equals(this.parent1, plannedCrossNewRequest.parent1) &&
-                Objects.equals(this.parent2, plannedCrossNewRequest.parent2) &&
-                Objects.equals(this.plannedCrossName, plannedCrossNewRequest.plannedCrossName) &&
-                Objects.equals(this.status, plannedCrossNewRequest.status);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, crossType, crossingProjectDbId, crossingProjectName, externalReferences, parent1, parent2, plannedCrossName, status);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PlannedCrossNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    crossType: ").append(toIndentedString(crossType)).append("\n");
-        sb.append("    crossingProjectDbId: ").append(toIndentedString(crossingProjectDbId)).append("\n");
-        sb.append("    crossingProjectName: ").append(toIndentedString(crossingProjectName)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    parent1: ").append(toIndentedString(parent1)).append("\n");
-        sb.append("    parent2: ").append(toIndentedString(parent2)).append("\n");
-        sb.append("    plannedCrossName: ").append(toIndentedString(plannedCrossName)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PlannedCrossesListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PlannedCrossesListResponse.java
deleted file mode 100644
index 06820f12..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PlannedCrossesListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * PlannedCrossesListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class PlannedCrossesListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private PlannedCrossesListResponseResult result = null;
-
-    public PlannedCrossesListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public PlannedCrossesListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public PlannedCrossesListResponse result(PlannedCrossesListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public PlannedCrossesListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(PlannedCrossesListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PlannedCrossesListResponse plannedCrossesListResponse = (PlannedCrossesListResponse) o;
-        return Objects.equals(this._atContext, plannedCrossesListResponse._atContext) &&
-                Objects.equals(this.metadata, plannedCrossesListResponse.metadata) &&
-                Objects.equals(this.result, plannedCrossesListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PlannedCrossesListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PlannedCrossesListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PlannedCrossesListResponseResult.java
deleted file mode 100644
index 738a7945..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PlannedCrossesListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * PlannedCrossesListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class PlannedCrossesListResponseResult {
-    @SerializedName("data")
-    private List<PlannedCross> data = new ArrayList<PlannedCross>();
-
-    public PlannedCrossesListResponseResult data(List<PlannedCross> data) {
-        this.data = data;
-        return this;
-    }
-
-    public PlannedCrossesListResponseResult addDataItem(PlannedCross dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<PlannedCross> getData() {
-        return data;
-    }
-
-    public void setData(List<PlannedCross> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PlannedCrossesListResponseResult plannedCrossesListResponseResult = (PlannedCrossesListResponseResult) o;
-        return Objects.equals(this.data, plannedCrossesListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PlannedCrossesListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PointGeometry.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PointGeometry.java
deleted file mode 100644
index e9a3bd83..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PointGeometry.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Copied from RFC 7946 Section 3.1.1  A position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.
- */
-@Schema(description = "Copied from RFC 7946 Section 3.1.1  A position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class PointGeometry {
-    @SerializedName("coordinates")
-    private List<BigDecimal> coordinates = null;
-
-    @SerializedName("type")
-    private String type = "Point";
-
-    public PointGeometry coordinates(List<BigDecimal> coordinates) {
-        this.coordinates = coordinates;
-        return this;
-    }
-
-    public PointGeometry addCoordinatesItem(BigDecimal coordinatesItem) {
-        if (this.coordinates == null) {
-            this.coordinates = new ArrayList<BigDecimal>();
-        }
-        this.coordinates.add(coordinatesItem);
-        return this;
-    }
-
-    /**
-     * A single position
-     *
-     * @return coordinates
-     **/
-    @Schema(example = "[-76.506042,42.417373,123]", description = "A single position")
-    public List<BigDecimal> getCoordinates() {
-        return coordinates;
-    }
-
-    public void setCoordinates(List<BigDecimal> coordinates) {
-        this.coordinates = coordinates;
-    }
-
-    public PointGeometry type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The literal string \&quot;Point\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Point", description = "The literal string \"Point\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PointGeometry pointGeometry = (PointGeometry) o;
-        return Objects.equals(this.coordinates, pointGeometry.coordinates) &&
-                Objects.equals(this.type, pointGeometry.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(coordinates, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PointGeometry {\n");
-
-        sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Polygon.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Polygon.java
deleted file mode 100644
index 864deabd..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Polygon.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An array of linear rings
- */
-@Schema(description = "An array of linear rings")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class Polygon extends ArrayList<List> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Polygon {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PolygonGeometry.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PolygonGeometry.java
deleted file mode 100644
index 37a197a2..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/PolygonGeometry.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An array of Linear Rings. Each Linear Ring is an array of Points.   A Point is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.
- */
-@Schema(description = "An array of Linear Rings. Each Linear Ring is an array of Points.   A Point is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class PolygonGeometry {
-    @SerializedName("coordinates")
-    private List<List<List<BigDecimal>>> coordinates = null;
-
-    @SerializedName("type")
-    private String type = "Polygon";
-
-    public PolygonGeometry coordinates(List<List<List<BigDecimal>>> coordinates) {
-        this.coordinates = coordinates;
-        return this;
-    }
-
-    public PolygonGeometry addCoordinatesItem(List<List<BigDecimal>> coordinatesItem) {
-        if (this.coordinates == null) {
-            this.coordinates = new ArrayList<List<List<BigDecimal>>>();
-        }
-        this.coordinates.add(coordinatesItem);
-        return this;
-    }
-
-    /**
-     * An array of linear rings
-     *
-     * @return coordinates
-     **/
-    @Schema(example = "[[[-77.456654,42.241133,494],[-75.414133,41.508282,571],[-76.506042,42.417373,123],[-77.456654,42.241133,346]]]", description = "An array of linear rings")
-    public List<List<List<BigDecimal>>> getCoordinates() {
-        return coordinates;
-    }
-
-    public void setCoordinates(List<List<List<BigDecimal>>> coordinates) {
-        this.coordinates = coordinates;
-    }
-
-    public PolygonGeometry type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The literal string \&quot;Polygon\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Polygon", description = "The literal string \"Polygon\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PolygonGeometry polygonGeometry = (PolygonGeometry) o;
-        return Objects.equals(this.coordinates, polygonGeometry.coordinates) &&
-                Objects.equals(this.type, polygonGeometry.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(coordinates, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PolygonGeometry {\n");
-
-        sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Position.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Position.java
deleted file mode 100644
index 6d3fc5fc..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Position.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Objects;
-
-/**
- * A single position
- */
-@Schema(description = "A single position")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class Position extends ArrayList<BigDecimal> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Position {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ProgenyNodeDEP.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ProgenyNodeDEP.java
deleted file mode 100644
index a4cce22d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ProgenyNodeDEP.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ProgenyNodeDEP
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class ProgenyNodeDEP {
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("progeny")
-    private List<ProgenyNodeDEPProgeny> progeny = new ArrayList<ProgenyNodeDEPProgeny>();
-
-    public ProgenyNodeDEP germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "01b974dc", required = true, description = "The ID which uniquely identifies a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public ProgenyNodeDEP germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * A human readable name for a germplasm
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0021004", description = "A human readable name for a germplasm")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public ProgenyNodeDEP progeny(List<ProgenyNodeDEPProgeny> progeny) {
-        this.progeny = progeny;
-        return this;
-    }
-
-    public ProgenyNodeDEP addProgenyItem(ProgenyNodeDEPProgeny progenyItem) {
-        this.progeny.add(progenyItem);
-        return this;
-    }
-
-    /**
-     * List of germplasm entities which are direct children of this germplasm
-     *
-     * @return progeny
-     **/
-    @Schema(example = "[{\"germplasmDbId\":\"e8d5dad7\",\"germplasmName\":\"A0021011\",\"parentType\":\"FEMALE\"},{\"germplasmDbId\":\"ac07fbd8\",\"germplasmName\":\"A0021012\",\"parentType\":\"FEMALE\"},{\"germplasmDbId\":\"07f45f67\",\"germplasmName\":\"A0021013\",\"parentType\":\"FEMALE\"}]", required = true, description = "List of germplasm entities which are direct children of this germplasm")
-    public List<ProgenyNodeDEPProgeny> getProgeny() {
-        return progeny;
-    }
-
-    public void setProgeny(List<ProgenyNodeDEPProgeny> progeny) {
-        this.progeny = progeny;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ProgenyNodeDEP progenyNodeDEP = (ProgenyNodeDEP) o;
-        return Objects.equals(this.germplasmDbId, progenyNodeDEP.germplasmDbId) &&
-                Objects.equals(this.germplasmName, progenyNodeDEP.germplasmName) &&
-                Objects.equals(this.progeny, progenyNodeDEP.progeny);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(germplasmDbId, germplasmName, progeny);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ProgenyNodeDEP {\n");
-
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    progeny: ").append(toIndentedString(progeny)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ProgenyNodeDEPProgeny.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ProgenyNodeDEPProgeny.java
deleted file mode 100644
index 5dcf9803..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ProgenyNodeDEPProgeny.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ProgenyNodeDEPProgeny
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class ProgenyNodeDEPProgeny {
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("parentType")
-    private ParentTypeDEP parentType = null;
-
-    public ProgenyNodeDEPProgeny germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier of a progeny germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "e8d5dad7", required = true, description = "The unique identifier of a progeny germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public ProgenyNodeDEPProgeny germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a progeny germplasm
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0021011", description = "The human readable name of a progeny germplasm")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public ProgenyNodeDEPProgeny parentType(ParentTypeDEP parentType) {
-        this.parentType = parentType;
-        return this;
-    }
-
-    /**
-     * Get parentType
-     *
-     * @return parentType
-     **/
-    @Schema(required = true, description = "")
-    public ParentTypeDEP getParentType() {
-        return parentType;
-    }
-
-    public void setParentType(ParentTypeDEP parentType) {
-        this.parentType = parentType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ProgenyNodeDEPProgeny progenyNodeDEPProgeny = (ProgenyNodeDEPProgeny) o;
-        return Objects.equals(this.germplasmDbId, progenyNodeDEPProgeny.germplasmDbId) &&
-                Objects.equals(this.germplasmName, progenyNodeDEPProgeny.germplasmName) &&
-                Objects.equals(this.parentType, progenyNodeDEPProgeny.parentType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(germplasmDbId, germplasmName, parentType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ProgenyNodeDEPProgeny {\n");
-
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    parentType: ").append(toIndentedString(parentType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Scale.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Scale.java
deleted file mode 100644
index e1f91332..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Scale.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * Scale metadata
- */
-@Schema(description = "Scale metadata")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class Scale {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypeEnum.Adapter.class)
-    public enum DataTypeEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypeEnum fromValue(String input) {
-            for (DataTypeEnum b : DataTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataType")
-    private DataTypeEnum dataType = null;
-
-    @SerializedName("decimalPlaces")
-    private Integer decimalPlaces = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("ontologyReference")
-    private GermplasmAttributeMethodOntologyReference ontologyReference = null;
-
-    @SerializedName("scaleDbId")
-    private String scaleDbId = null;
-
-    @SerializedName("scaleName")
-    private String scaleName = null;
-
-    @SerializedName("scalePUI")
-    private String scalePUI = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    @SerializedName("validValues")
-    private GermplasmAttributeScaleValidValues validValues = null;
-
-    public Scale additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Scale putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Scale dataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-        return this;
-    }
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     *
-     * @return dataType
-     **/
-    @Schema(example = "Numerical", description = "<p>Class of the scale, entries can be</p> <p>\"Code\" -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \"75VD\" means \"75 %\" of the plant is infected and the plant is very delayed.</p> <p>\"Date\" - The date class is for events expressed in a time format, See ISO 8601</p> <p>\"Duration\" - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months</p> <p>\"Nominal\" - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories</p> <p>\"Numerical\" - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches</p> <p>\"Ordinal\" - Ordinal scales are scales composed of ordered categories</p> <p>\"Text\" - A free text is used to express the trait.</p>")
-    public DataTypeEnum getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-    }
-
-    public Scale decimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-        return this;
-    }
-
-    /**
-     * For numerical, number of decimal places to be reported
-     *
-     * @return decimalPlaces
-     **/
-    @Schema(example = "2", description = "For numerical, number of decimal places to be reported")
-    public Integer getDecimalPlaces() {
-        return decimalPlaces;
-    }
-
-    public void setDecimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-    }
-
-    public Scale externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Scale addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Scale ontologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeMethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public Scale scaleDbId(String scaleDbId) {
-        this.scaleDbId = scaleDbId;
-        return this;
-    }
-
-    /**
-     * Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.
-     *
-     * @return scaleDbId
-     **/
-    @Schema(example = "af730171", description = "Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.")
-    public String getScaleDbId() {
-        return scaleDbId;
-    }
-
-    public void setScaleDbId(String scaleDbId) {
-        this.scaleDbId = scaleDbId;
-    }
-
-    public Scale scaleName(String scaleName) {
-        this.scaleName = scaleName;
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleName
-     **/
-    @Schema(example = "Meters", description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public String getScaleName() {
-        return scaleName;
-    }
-
-    public void setScaleName(String scaleName) {
-        this.scaleName = scaleName;
-    }
-
-    public Scale scalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000112", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public String getScalePUI() {
-        return scalePUI;
-    }
-
-    public void setScalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-    }
-
-    public Scale units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when &#x60;dataType&#x60; is Numeric, but could also be included for other dataTypes when applicable.
-     *
-     * @return units
-     **/
-    @Schema(example = "m", description = "This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when `dataType` is Numeric, but could also be included for other dataTypes when applicable.")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    public Scale validValues(GermplasmAttributeScaleValidValues validValues) {
-        this.validValues = validValues;
-        return this;
-    }
-
-    /**
-     * Get validValues
-     *
-     * @return validValues
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeScaleValidValues getValidValues() {
-        return validValues;
-    }
-
-    public void setValidValues(GermplasmAttributeScaleValidValues validValues) {
-        this.validValues = validValues;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Scale scale = (Scale) o;
-        return Objects.equals(this.additionalInfo, scale.additionalInfo) &&
-                Objects.equals(this.dataType, scale.dataType) &&
-                Objects.equals(this.decimalPlaces, scale.decimalPlaces) &&
-                Objects.equals(this.externalReferences, scale.externalReferences) &&
-                Objects.equals(this.ontologyReference, scale.ontologyReference) &&
-                Objects.equals(this.scaleDbId, scale.scaleDbId) &&
-                Objects.equals(this.scaleName, scale.scaleName) &&
-                Objects.equals(this.scalePUI, scale.scalePUI) &&
-                Objects.equals(this.units, scale.units) &&
-                Objects.equals(this.validValues, scale.validValues);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, dataType, decimalPlaces, externalReferences, ontologyReference, scaleDbId, scaleName, scalePUI, units, validValues);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Scale {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
-        sb.append("    decimalPlaces: ").append(toIndentedString(decimalPlaces)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scaleDbId: ").append(toIndentedString(scaleDbId)).append("\n");
-        sb.append("    scaleName: ").append(toIndentedString(scaleName)).append("\n");
-        sb.append("    scalePUI: ").append(toIndentedString(scalePUI)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("    validValues: ").append(toIndentedString(validValues)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ScaleBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ScaleBaseClass.java
deleted file mode 100644
index ad195106..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/ScaleBaseClass.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * A Scale describes the units and acceptable values for an ObservationVariable.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Scale \&quot;inches\&quot; or \&quot;pixels\&quot;.
- */
-@Schema(description = "A Scale describes the units and acceptable values for an ObservationVariable.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Scale \"inches\" or \"pixels\".")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class ScaleBaseClass {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypeEnum.Adapter.class)
-    public enum DataTypeEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypeEnum fromValue(String input) {
-            for (DataTypeEnum b : DataTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataType")
-    private DataTypeEnum dataType = null;
-
-    @SerializedName("decimalPlaces")
-    private Integer decimalPlaces = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("ontologyReference")
-    private GermplasmAttributeMethodOntologyReference ontologyReference = null;
-
-    @SerializedName("scaleName")
-    private String scaleName = null;
-
-    @SerializedName("scalePUI")
-    private String scalePUI = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    @SerializedName("validValues")
-    private GermplasmAttributeScaleValidValues validValues = null;
-
-    public ScaleBaseClass additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ScaleBaseClass putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ScaleBaseClass dataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-        return this;
-    }
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     *
-     * @return dataType
-     **/
-    @Schema(example = "Numerical", description = "<p>Class of the scale, entries can be</p> <p>\"Code\" -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \"75VD\" means \"75 %\" of the plant is infected and the plant is very delayed.</p> <p>\"Date\" - The date class is for events expressed in a time format, See ISO 8601</p> <p>\"Duration\" - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months</p> <p>\"Nominal\" - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories</p> <p>\"Numerical\" - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches</p> <p>\"Ordinal\" - Ordinal scales are scales composed of ordered categories</p> <p>\"Text\" - A free text is used to express the trait.</p>")
-    public DataTypeEnum getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-    }
-
-    public ScaleBaseClass decimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-        return this;
-    }
-
-    /**
-     * For numerical, number of decimal places to be reported
-     *
-     * @return decimalPlaces
-     **/
-    @Schema(example = "2", description = "For numerical, number of decimal places to be reported")
-    public Integer getDecimalPlaces() {
-        return decimalPlaces;
-    }
-
-    public void setDecimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-    }
-
-    public ScaleBaseClass externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ScaleBaseClass addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ScaleBaseClass ontologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeMethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public ScaleBaseClass scaleName(String scaleName) {
-        this.scaleName = scaleName;
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleName
-     **/
-    @Schema(example = "Meters", required = true, description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public String getScaleName() {
-        return scaleName;
-    }
-
-    public void setScaleName(String scaleName) {
-        this.scaleName = scaleName;
-    }
-
-    public ScaleBaseClass scalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000112", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public String getScalePUI() {
-        return scalePUI;
-    }
-
-    public void setScalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-    }
-
-    public ScaleBaseClass units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when &#x60;dataType&#x60; is Numeric, but could also be included for other dataTypes when applicable.
-     *
-     * @return units
-     **/
-    @Schema(example = "m", description = "This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when `dataType` is Numeric, but could also be included for other dataTypes when applicable.")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    public ScaleBaseClass validValues(GermplasmAttributeScaleValidValues validValues) {
-        this.validValues = validValues;
-        return this;
-    }
-
-    /**
-     * Get validValues
-     *
-     * @return validValues
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeScaleValidValues getValidValues() {
-        return validValues;
-    }
-
-    public void setValidValues(GermplasmAttributeScaleValidValues validValues) {
-        this.validValues = validValues;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ScaleBaseClass scaleBaseClass = (ScaleBaseClass) o;
-        return Objects.equals(this.additionalInfo, scaleBaseClass.additionalInfo) &&
-                Objects.equals(this.dataType, scaleBaseClass.dataType) &&
-                Objects.equals(this.decimalPlaces, scaleBaseClass.decimalPlaces) &&
-                Objects.equals(this.externalReferences, scaleBaseClass.externalReferences) &&
-                Objects.equals(this.ontologyReference, scaleBaseClass.ontologyReference) &&
-                Objects.equals(this.scaleName, scaleBaseClass.scaleName) &&
-                Objects.equals(this.scalePUI, scaleBaseClass.scalePUI) &&
-                Objects.equals(this.units, scaleBaseClass.units) &&
-                Objects.equals(this.validValues, scaleBaseClass.validValues);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, dataType, decimalPlaces, externalReferences, ontologyReference, scaleName, scalePUI, units, validValues);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScaleBaseClass {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
-        sb.append("    decimalPlaces: ").append(toIndentedString(decimalPlaces)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scaleName: ").append(toIndentedString(scaleName)).append("\n");
-        sb.append("    scalePUI: ").append(toIndentedString(scalePUI)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("    validValues: ").append(toIndentedString(validValues)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersCommonCropNames.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersCommonCropNames.java
deleted file mode 100644
index e49e4e2e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersCommonCropNames.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersCommonCropNames
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SearchRequestParametersCommonCropNames {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    public SearchRequestParametersCommonCropNames commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public SearchRequestParametersCommonCropNames addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersCommonCropNames searchRequestParametersCommonCropNames = (SearchRequestParametersCommonCropNames) o;
-        return Objects.equals(this.commonCropNames, searchRequestParametersCommonCropNames.commonCropNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersCommonCropNames {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersExternalReferences.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersExternalReferences.java
deleted file mode 100644
index 0529402a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersExternalReferences.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersExternalReferences
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SearchRequestParametersExternalReferences {
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    public SearchRequestParametersExternalReferences externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public SearchRequestParametersExternalReferences addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public SearchRequestParametersExternalReferences externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public SearchRequestParametersExternalReferences addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public SearchRequestParametersExternalReferences externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public SearchRequestParametersExternalReferences addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersExternalReferences searchRequestParametersExternalReferences = (SearchRequestParametersExternalReferences) o;
-        return Objects.equals(this.externalReferenceIDs, searchRequestParametersExternalReferences.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, searchRequestParametersExternalReferences.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, searchRequestParametersExternalReferences.externalReferenceSources);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(externalReferenceIDs, externalReferenceIds, externalReferenceSources);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersExternalReferences {\n");
-
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersGermplasm.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersGermplasm.java
deleted file mode 100644
index 0e033b23..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersGermplasm.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersGermplasm
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SearchRequestParametersGermplasm {
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    public SearchRequestParametersGermplasm germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersGermplasm addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public SearchRequestParametersGermplasm germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public SearchRequestParametersGermplasm addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersGermplasm searchRequestParametersGermplasm = (SearchRequestParametersGermplasm) o;
-        return Objects.equals(this.germplasmDbIds, searchRequestParametersGermplasm.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, searchRequestParametersGermplasm.germplasmNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(germplasmDbIds, germplasmNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersGermplasm {\n");
-
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersLocations.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersLocations.java
deleted file mode 100644
index 8ad1e5e6..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersLocations.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersLocations
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SearchRequestParametersLocations {
-    @SerializedName("locationDbIds")
-    private List<String> locationDbIds = null;
-
-    @SerializedName("locationNames")
-    private List<String> locationNames = null;
-
-    public SearchRequestParametersLocations locationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersLocations addLocationDbIdsItem(String locationDbIdsItem) {
-        if (this.locationDbIds == null) {
-            this.locationDbIds = new ArrayList<String>();
-        }
-        this.locationDbIds.add(locationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The location ids to search for
-     *
-     * @return locationDbIds
-     **/
-    @Schema(example = "[\"b28911cf\",\"5071d1e4\"]", description = "The location ids to search for")
-    public List<String> getLocationDbIds() {
-        return locationDbIds;
-    }
-
-    public void setLocationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-    }
-
-    public SearchRequestParametersLocations locationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-        return this;
-    }
-
-    public SearchRequestParametersLocations addLocationNamesItem(String locationNamesItem) {
-        if (this.locationNames == null) {
-            this.locationNames = new ArrayList<String>();
-        }
-        this.locationNames.add(locationNamesItem);
-        return this;
-    }
-
-    /**
-     * A human readable names to search for
-     *
-     * @return locationNames
-     **/
-    @Schema(example = "[\"Location Alpha\",\"The Large Hadron Collider\"]", description = "A human readable names to search for")
-    public List<String> getLocationNames() {
-        return locationNames;
-    }
-
-    public void setLocationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersLocations searchRequestParametersLocations = (SearchRequestParametersLocations) o;
-        return Objects.equals(this.locationDbIds, searchRequestParametersLocations.locationDbIds) &&
-                Objects.equals(this.locationNames, searchRequestParametersLocations.locationNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(locationDbIds, locationNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersLocations {\n");
-
-        sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-        sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersObservationVariables.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersObservationVariables.java
deleted file mode 100644
index 50683cfd..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersObservationVariables.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersObservationVariables
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SearchRequestParametersObservationVariables {
-    @SerializedName("observationVariableDbIds")
-    private List<String> observationVariableDbIds = null;
-
-    @SerializedName("observationVariableNames")
-    private List<String> observationVariableNames = null;
-
-    @SerializedName("observationVariablePUIs")
-    private List<String> observationVariablePUIs = null;
-
-    public SearchRequestParametersObservationVariables observationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersObservationVariables addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-        if (this.observationVariableDbIds == null) {
-            this.observationVariableDbIds = new ArrayList<String>();
-        }
-        this.observationVariableDbIds.add(observationVariableDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The DbIds of Variables to search for
-     *
-     * @return observationVariableDbIds
-     **/
-    @Schema(example = "[\"a646187d\",\"6d23513b\"]", description = "The DbIds of Variables to search for")
-    public List<String> getObservationVariableDbIds() {
-        return observationVariableDbIds;
-    }
-
-    public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-    }
-
-    public SearchRequestParametersObservationVariables observationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-        return this;
-    }
-
-    public SearchRequestParametersObservationVariables addObservationVariableNamesItem(String observationVariableNamesItem) {
-        if (this.observationVariableNames == null) {
-            this.observationVariableNames = new ArrayList<String>();
-        }
-        this.observationVariableNames.add(observationVariableNamesItem);
-        return this;
-    }
-
-    /**
-     * The names of Variables to search for
-     *
-     * @return observationVariableNames
-     **/
-    @Schema(example = "[\"Plant Height in meters\",\"Wheat rust score 1-5\"]", description = "The names of Variables to search for")
-    public List<String> getObservationVariableNames() {
-        return observationVariableNames;
-    }
-
-    public void setObservationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-    }
-
-    public SearchRequestParametersObservationVariables observationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-        return this;
-    }
-
-    public SearchRequestParametersObservationVariables addObservationVariablePUIsItem(String observationVariablePUIsItem) {
-        if (this.observationVariablePUIs == null) {
-            this.observationVariablePUIs = new ArrayList<String>();
-        }
-        this.observationVariablePUIs.add(observationVariablePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI
-     *
-     * @return observationVariablePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008012\",\"http://my-traits.com/trait/CO_123:0007261\"]", description = "The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI")
-    public List<String> getObservationVariablePUIs() {
-        return observationVariablePUIs;
-    }
-
-    public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersObservationVariables searchRequestParametersObservationVariables = (SearchRequestParametersObservationVariables) o;
-        return Objects.equals(this.observationVariableDbIds, searchRequestParametersObservationVariables.observationVariableDbIds) &&
-                Objects.equals(this.observationVariableNames, searchRequestParametersObservationVariables.observationVariableNames) &&
-                Objects.equals(this.observationVariablePUIs, searchRequestParametersObservationVariables.observationVariablePUIs);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(observationVariableDbIds, observationVariableNames, observationVariablePUIs);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersObservationVariables {\n");
-
-        sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-        sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
-        sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersPaging.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersPaging.java
deleted file mode 100644
index 803baf39..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersPaging.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * SearchRequestParametersPaging
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SearchRequestParametersPaging {
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    public SearchRequestParametersPaging page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SearchRequestParametersPaging pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersPaging searchRequestParametersPaging = (SearchRequestParametersPaging) o;
-        return Objects.equals(this.page, searchRequestParametersPaging.page) &&
-                Objects.equals(this.pageSize, searchRequestParametersPaging.pageSize);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(page, pageSize);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersPaging {\n");
-
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersPrograms.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersPrograms.java
deleted file mode 100644
index 444bcc83..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersPrograms.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersPrograms
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SearchRequestParametersPrograms {
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    public SearchRequestParametersPrograms programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersPrograms addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public SearchRequestParametersPrograms programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public SearchRequestParametersPrograms addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersPrograms searchRequestParametersPrograms = (SearchRequestParametersPrograms) o;
-        return Objects.equals(this.programDbIds, searchRequestParametersPrograms.programDbIds) &&
-                Objects.equals(this.programNames, searchRequestParametersPrograms.programNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(programDbIds, programNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersPrograms {\n");
-
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersStudies.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersStudies.java
deleted file mode 100644
index 3a7e2f18..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersStudies.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersStudies
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SearchRequestParametersStudies {
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    public SearchRequestParametersStudies studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersStudies addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public SearchRequestParametersStudies studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public SearchRequestParametersStudies addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersStudies searchRequestParametersStudies = (SearchRequestParametersStudies) o;
-        return Objects.equals(this.studyDbIds, searchRequestParametersStudies.studyDbIds) &&
-                Objects.equals(this.studyNames, searchRequestParametersStudies.studyNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(studyDbIds, studyNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersStudies {\n");
-
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersTokenPaging.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersTokenPaging.java
deleted file mode 100644
index 259b31b0..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersTokenPaging.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * SearchRequestParametersTokenPaging
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SearchRequestParametersTokenPaging {
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("pageToken")
-    private String pageToken = null;
-
-    public SearchRequestParametersTokenPaging page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SearchRequestParametersTokenPaging pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public SearchRequestParametersTokenPaging pageToken(String pageToken) {
-        this.pageToken = pageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;Used to request a specific page of data to be returned. &lt;br&gt;Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.
-     *
-     * @return pageToken
-     **/
-    @Schema(example = "33c27874", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>Used to request a specific page of data to be returned. <br>Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively. ")
-    public String getPageToken() {
-        return pageToken;
-    }
-
-    public void setPageToken(String pageToken) {
-        this.pageToken = pageToken;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersTokenPaging searchRequestParametersTokenPaging = (SearchRequestParametersTokenPaging) o;
-        return Objects.equals(this.page, searchRequestParametersTokenPaging.page) &&
-                Objects.equals(this.pageSize, searchRequestParametersTokenPaging.pageSize) &&
-                Objects.equals(this.pageToken, searchRequestParametersTokenPaging.pageToken);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(page, pageSize, pageToken);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersTokenPaging {\n");
-
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    pageToken: ").append(toIndentedString(pageToken)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersTrials.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersTrials.java
deleted file mode 100644
index f8bd571c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersTrials.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersTrials
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SearchRequestParametersTrials {
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public SearchRequestParametersTrials trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersTrials addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public SearchRequestParametersTrials trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public SearchRequestParametersTrials addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersTrials searchRequestParametersTrials = (SearchRequestParametersTrials) o;
-        return Objects.equals(this.trialDbIds, searchRequestParametersTrials.trialDbIds) &&
-                Objects.equals(this.trialNames, searchRequestParametersTrials.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersTrials {\n");
-
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersVariableBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersVariableBaseClass.java
deleted file mode 100644
index cf3d024f..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SearchRequestParametersVariableBaseClass.java
+++ /dev/null
@@ -1,1034 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersVariableBaseClass
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SearchRequestParametersVariableBaseClass {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypesEnum.Adapter.class)
-    public enum DataTypesEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypesEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypesEnum fromValue(String input) {
-            for (DataTypesEnum b : DataTypesEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypesEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypesEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypesEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypesEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataTypes")
-    private List<DataTypesEnum> dataTypes = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("methodDbIds")
-    private List<String> methodDbIds = null;
-
-    @SerializedName("methodNames")
-    private List<String> methodNames = null;
-
-    @SerializedName("methodPUIs")
-    private List<String> methodPUIs = null;
-
-    @SerializedName("ontologyDbIds")
-    private List<String> ontologyDbIds = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("scaleDbIds")
-    private List<String> scaleDbIds = null;
-
-    @SerializedName("scaleNames")
-    private List<String> scaleNames = null;
-
-    @SerializedName("scalePUIs")
-    private List<String> scalePUIs = null;
-
-    @SerializedName("studyDbId")
-    private List<String> studyDbId = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("traitAttributePUIs")
-    private List<String> traitAttributePUIs = null;
-
-    @SerializedName("traitAttributes")
-    private List<String> traitAttributes = null;
-
-    @SerializedName("traitClasses")
-    private List<String> traitClasses = null;
-
-    @SerializedName("traitDbIds")
-    private List<String> traitDbIds = null;
-
-    @SerializedName("traitEntities")
-    private List<String> traitEntities = null;
-
-    @SerializedName("traitEntityPUIs")
-    private List<String> traitEntityPUIs = null;
-
-    @SerializedName("traitNames")
-    private List<String> traitNames = null;
-
-    @SerializedName("traitPUIs")
-    private List<String> traitPUIs = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public SearchRequestParametersVariableBaseClass commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass dataTypes(List<DataTypesEnum> dataTypes) {
-        this.dataTypes = dataTypes;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addDataTypesItem(DataTypesEnum dataTypesItem) {
-        if (this.dataTypes == null) {
-            this.dataTypes = new ArrayList<DataTypesEnum>();
-        }
-        this.dataTypes.add(dataTypesItem);
-        return this;
-    }
-
-    /**
-     * List of scale data types to filter search results
-     *
-     * @return dataTypes
-     **/
-    @Schema(example = "[\"Numerical\",\"Ordinal\",\"Text\"]", description = "List of scale data types to filter search results")
-    public List<DataTypesEnum> getDataTypes() {
-        return dataTypes;
-    }
-
-    public void setDataTypes(List<DataTypesEnum> dataTypes) {
-        this.dataTypes = dataTypes;
-    }
-
-    public SearchRequestParametersVariableBaseClass externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public SearchRequestParametersVariableBaseClass externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public SearchRequestParametersVariableBaseClass methodDbIds(List<String> methodDbIds) {
-        this.methodDbIds = methodDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addMethodDbIdsItem(String methodDbIdsItem) {
-        if (this.methodDbIds == null) {
-            this.methodDbIds = new ArrayList<String>();
-        }
-        this.methodDbIds.add(methodDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of methods to filter search results
-     *
-     * @return methodDbIds
-     **/
-    @Schema(example = "[\"07e34f83\",\"d3d5517a\"]", description = "List of methods to filter search results")
-    public List<String> getMethodDbIds() {
-        return methodDbIds;
-    }
-
-    public void setMethodDbIds(List<String> methodDbIds) {
-        this.methodDbIds = methodDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass methodNames(List<String> methodNames) {
-        this.methodNames = methodNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addMethodNamesItem(String methodNamesItem) {
-        if (this.methodNames == null) {
-            this.methodNames = new ArrayList<String>();
-        }
-        this.methodNames.add(methodNamesItem);
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodNames
-     **/
-    @Schema(example = "[\"Measuring Tape\",\"Spectrometer\"]", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public List<String> getMethodNames() {
-        return methodNames;
-    }
-
-    public void setMethodNames(List<String> methodNames) {
-        this.methodNames = methodNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass methodPUIs(List<String> methodPUIs) {
-        this.methodPUIs = methodPUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addMethodPUIsItem(String methodPUIsItem) {
-        if (this.methodPUIs == null) {
-            this.methodPUIs = new ArrayList<String>();
-        }
-        this.methodPUIs.add(methodPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000212\",\"http://my-traits.com/trait/CO_123:0003557\"]", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public List<String> getMethodPUIs() {
-        return methodPUIs;
-    }
-
-    public void setMethodPUIs(List<String> methodPUIs) {
-        this.methodPUIs = methodPUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass ontologyDbIds(List<String> ontologyDbIds) {
-        this.ontologyDbIds = ontologyDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addOntologyDbIdsItem(String ontologyDbIdsItem) {
-        if (this.ontologyDbIds == null) {
-            this.ontologyDbIds = new ArrayList<String>();
-        }
-        this.ontologyDbIds.add(ontologyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of ontology IDs to search for
-     *
-     * @return ontologyDbIds
-     **/
-    @Schema(example = "[\"f44f7b23\",\"a26b576e\"]", description = "List of ontology IDs to search for")
-    public List<String> getOntologyDbIds() {
-        return ontologyDbIds;
-    }
-
-    public void setOntologyDbIds(List<String> ontologyDbIds) {
-        this.ontologyDbIds = ontologyDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SearchRequestParametersVariableBaseClass pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public SearchRequestParametersVariableBaseClass programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass scaleDbIds(List<String> scaleDbIds) {
-        this.scaleDbIds = scaleDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addScaleDbIdsItem(String scaleDbIdsItem) {
-        if (this.scaleDbIds == null) {
-            this.scaleDbIds = new ArrayList<String>();
-        }
-        this.scaleDbIds.add(scaleDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Scale
-     *
-     * @return scaleDbIds
-     **/
-    @Schema(example = "[\"a13ecffa\",\"7e1afe4f\"]", description = "The unique identifier for a Scale")
-    public List<String> getScaleDbIds() {
-        return scaleDbIds;
-    }
-
-    public void setScaleDbIds(List<String> scaleDbIds) {
-        this.scaleDbIds = scaleDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass scaleNames(List<String> scaleNames) {
-        this.scaleNames = scaleNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addScaleNamesItem(String scaleNamesItem) {
-        if (this.scaleNames == null) {
-            this.scaleNames = new ArrayList<String>();
-        }
-        this.scaleNames.add(scaleNamesItem);
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleNames
-     **/
-    @Schema(example = "[\"Meters\",\"Liters\"]", description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public List<String> getScaleNames() {
-        return scaleNames;
-    }
-
-    public void setScaleNames(List<String> scaleNames) {
-        this.scaleNames = scaleNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass scalePUIs(List<String> scalePUIs) {
-        this.scalePUIs = scalePUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addScalePUIsItem(String scalePUIsItem) {
-        if (this.scalePUIs == null) {
-            this.scalePUIs = new ArrayList<String>();
-        }
-        this.scalePUIs.add(scalePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000336\",\"http://my-traits.com/trait/CO_123:0000560\"]", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public List<String> getScalePUIs() {
-        return scalePUIs;
-    }
-
-    public void setScalePUIs(List<String> scalePUIs) {
-        this.scalePUIs = scalePUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass studyDbId(List<String> studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addStudyDbIdItem(String studyDbIdItem) {
-        if (this.studyDbId == null) {
-            this.studyDbId = new ArrayList<String>();
-        }
-        this.studyDbId.add(studyDbIdItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;studyDbIds&#x60;. Github issue number #483  &lt;br&gt;The unique ID of a studies to filter on
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "[\"5bcac0ae\",\"7f48e22d\"]", description = "**Deprecated in v2.1** Please use `studyDbIds`. Github issue number #483  <br>The unique ID of a studies to filter on")
-    public List<String> getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(List<String> studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public SearchRequestParametersVariableBaseClass studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitAttributePUIs(List<String> traitAttributePUIs) {
-        this.traitAttributePUIs = traitAttributePUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitAttributePUIsItem(String traitAttributePUIsItem) {
-        if (this.traitAttributePUIs == null) {
-            this.traitAttributePUIs = new ArrayList<String>();
-        }
-        this.traitAttributePUIs.add(traitAttributePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return traitAttributePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008336\",\"http://my-traits.com/trait/CO_123:0001092\"]", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public List<String> getTraitAttributePUIs() {
-        return traitAttributePUIs;
-    }
-
-    public void setTraitAttributePUIs(List<String> traitAttributePUIs) {
-        this.traitAttributePUIs = traitAttributePUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitAttributes(List<String> traitAttributes) {
-        this.traitAttributes = traitAttributes;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitAttributesItem(String traitAttributesItem) {
-        if (this.traitAttributes == null) {
-            this.traitAttributes = new ArrayList<String>();
-        }
-        this.traitAttributes.add(traitAttributesItem);
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return traitAttributes
-     **/
-    @Schema(example = "[\"Height\",\"Color\"]", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public List<String> getTraitAttributes() {
-        return traitAttributes;
-    }
-
-    public void setTraitAttributes(List<String> traitAttributes) {
-        this.traitAttributes = traitAttributes;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitClasses(List<String> traitClasses) {
-        this.traitClasses = traitClasses;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitClassesItem(String traitClassesItem) {
-        if (this.traitClasses == null) {
-            this.traitClasses = new ArrayList<String>();
-        }
-        this.traitClasses.add(traitClassesItem);
-        return this;
-    }
-
-    /**
-     * List of trait classes to filter search results
-     *
-     * @return traitClasses
-     **/
-    @Schema(example = "[\"morphological\",\"phenological\",\"agronomical\"]", description = "List of trait classes to filter search results")
-    public List<String> getTraitClasses() {
-        return traitClasses;
-    }
-
-    public void setTraitClasses(List<String> traitClasses) {
-        this.traitClasses = traitClasses;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitDbIds(List<String> traitDbIds) {
-        this.traitDbIds = traitDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitDbIdsItem(String traitDbIdsItem) {
-        if (this.traitDbIds == null) {
-            this.traitDbIds = new ArrayList<String>();
-        }
-        this.traitDbIds.add(traitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Trait
-     *
-     * @return traitDbIds
-     **/
-    @Schema(example = "[\"ef81147b\",\"78d82fad\"]", description = "The unique identifier for a Trait")
-    public List<String> getTraitDbIds() {
-        return traitDbIds;
-    }
-
-    public void setTraitDbIds(List<String> traitDbIds) {
-        this.traitDbIds = traitDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitEntities(List<String> traitEntities) {
-        this.traitEntities = traitEntities;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitEntitiesItem(String traitEntitiesItem) {
-        if (this.traitEntities == null) {
-            this.traitEntities = new ArrayList<String>();
-        }
-        this.traitEntities.add(traitEntitiesItem);
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return traitEntities
-     **/
-    @Schema(example = "[\"Stalk\",\"Root\"]", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public List<String> getTraitEntities() {
-        return traitEntities;
-    }
-
-    public void setTraitEntities(List<String> traitEntities) {
-        this.traitEntities = traitEntities;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitEntityPUIs(List<String> traitEntityPUIs) {
-        this.traitEntityPUIs = traitEntityPUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitEntityPUIsItem(String traitEntityPUIsItem) {
-        if (this.traitEntityPUIs == null) {
-            this.traitEntityPUIs = new ArrayList<String>();
-        }
-        this.traitEntityPUIs.add(traitEntityPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return traitEntityPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0004098\",\"http://my-traits.com/trait/CO_123:0002366\"]", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public List<String> getTraitEntityPUIs() {
-        return traitEntityPUIs;
-    }
-
-    public void setTraitEntityPUIs(List<String> traitEntityPUIs) {
-        this.traitEntityPUIs = traitEntityPUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitNames(List<String> traitNames) {
-        this.traitNames = traitNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitNamesItem(String traitNamesItem) {
-        if (this.traitNames == null) {
-            this.traitNames = new ArrayList<String>();
-        }
-        this.traitNames.add(traitNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitNames
-     **/
-    @Schema(example = "[\"Stalk Height\",\"Root Color\"]", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public List<String> getTraitNames() {
-        return traitNames;
-    }
-
-    public void setTraitNames(List<String> traitNames) {
-        this.traitNames = traitNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitPUIs(List<String> traitPUIs) {
-        this.traitPUIs = traitPUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitPUIsItem(String traitPUIsItem) {
-        if (this.traitPUIs == null) {
-            this.traitPUIs = new ArrayList<String>();
-        }
-        this.traitPUIs.add(traitPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000456\",\"http://my-traits.com/trait/CO_123:0000820\"]", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public List<String> getTraitPUIs() {
-        return traitPUIs;
-    }
-
-    public void setTraitPUIs(List<String> traitPUIs) {
-        this.traitPUIs = traitPUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersVariableBaseClass searchRequestParametersVariableBaseClass = (SearchRequestParametersVariableBaseClass) o;
-        return Objects.equals(this.commonCropNames, searchRequestParametersVariableBaseClass.commonCropNames) &&
-                Objects.equals(this.dataTypes, searchRequestParametersVariableBaseClass.dataTypes) &&
-                Objects.equals(this.externalReferenceIDs, searchRequestParametersVariableBaseClass.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, searchRequestParametersVariableBaseClass.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, searchRequestParametersVariableBaseClass.externalReferenceSources) &&
-                Objects.equals(this.methodDbIds, searchRequestParametersVariableBaseClass.methodDbIds) &&
-                Objects.equals(this.methodNames, searchRequestParametersVariableBaseClass.methodNames) &&
-                Objects.equals(this.methodPUIs, searchRequestParametersVariableBaseClass.methodPUIs) &&
-                Objects.equals(this.ontologyDbIds, searchRequestParametersVariableBaseClass.ontologyDbIds) &&
-                Objects.equals(this.page, searchRequestParametersVariableBaseClass.page) &&
-                Objects.equals(this.pageSize, searchRequestParametersVariableBaseClass.pageSize) &&
-                Objects.equals(this.programDbIds, searchRequestParametersVariableBaseClass.programDbIds) &&
-                Objects.equals(this.programNames, searchRequestParametersVariableBaseClass.programNames) &&
-                Objects.equals(this.scaleDbIds, searchRequestParametersVariableBaseClass.scaleDbIds) &&
-                Objects.equals(this.scaleNames, searchRequestParametersVariableBaseClass.scaleNames) &&
-                Objects.equals(this.scalePUIs, searchRequestParametersVariableBaseClass.scalePUIs) &&
-                Objects.equals(this.studyDbId, searchRequestParametersVariableBaseClass.studyDbId) &&
-                Objects.equals(this.studyDbIds, searchRequestParametersVariableBaseClass.studyDbIds) &&
-                Objects.equals(this.studyNames, searchRequestParametersVariableBaseClass.studyNames) &&
-                Objects.equals(this.traitAttributePUIs, searchRequestParametersVariableBaseClass.traitAttributePUIs) &&
-                Objects.equals(this.traitAttributes, searchRequestParametersVariableBaseClass.traitAttributes) &&
-                Objects.equals(this.traitClasses, searchRequestParametersVariableBaseClass.traitClasses) &&
-                Objects.equals(this.traitDbIds, searchRequestParametersVariableBaseClass.traitDbIds) &&
-                Objects.equals(this.traitEntities, searchRequestParametersVariableBaseClass.traitEntities) &&
-                Objects.equals(this.traitEntityPUIs, searchRequestParametersVariableBaseClass.traitEntityPUIs) &&
-                Objects.equals(this.traitNames, searchRequestParametersVariableBaseClass.traitNames) &&
-                Objects.equals(this.traitPUIs, searchRequestParametersVariableBaseClass.traitPUIs) &&
-                Objects.equals(this.trialDbIds, searchRequestParametersVariableBaseClass.trialDbIds) &&
-                Objects.equals(this.trialNames, searchRequestParametersVariableBaseClass.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, dataTypes, externalReferenceIDs, externalReferenceIds, externalReferenceSources, methodDbIds, methodNames, methodPUIs, ontologyDbIds, page, pageSize, programDbIds, programNames, scaleDbIds, scaleNames, scalePUIs, studyDbId, studyDbIds, studyNames, traitAttributePUIs, traitAttributes, traitClasses, traitDbIds, traitEntities, traitEntityPUIs, traitNames, traitPUIs, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersVariableBaseClass {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    dataTypes: ").append(toIndentedString(dataTypes)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    methodDbIds: ").append(toIndentedString(methodDbIds)).append("\n");
-        sb.append("    methodNames: ").append(toIndentedString(methodNames)).append("\n");
-        sb.append("    methodPUIs: ").append(toIndentedString(methodPUIs)).append("\n");
-        sb.append("    ontologyDbIds: ").append(toIndentedString(ontologyDbIds)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    scaleDbIds: ").append(toIndentedString(scaleDbIds)).append("\n");
-        sb.append("    scaleNames: ").append(toIndentedString(scaleNames)).append("\n");
-        sb.append("    scalePUIs: ").append(toIndentedString(scalePUIs)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    traitAttributePUIs: ").append(toIndentedString(traitAttributePUIs)).append("\n");
-        sb.append("    traitAttributes: ").append(toIndentedString(traitAttributes)).append("\n");
-        sb.append("    traitClasses: ").append(toIndentedString(traitClasses)).append("\n");
-        sb.append("    traitDbIds: ").append(toIndentedString(traitDbIds)).append("\n");
-        sb.append("    traitEntities: ").append(toIndentedString(traitEntities)).append("\n");
-        sb.append("    traitEntityPUIs: ").append(toIndentedString(traitEntityPUIs)).append("\n");
-        sb.append("    traitNames: ").append(toIndentedString(traitNames)).append("\n");
-        sb.append("    traitPUIs: ").append(toIndentedString(traitPUIs)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLot.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLot.java
deleted file mode 100644
index 3e6f80d5..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLot.java
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-/**
- * SeedLot
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SeedLot {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("amount")
-    private BigDecimal amount = null;
-
-    @SerializedName("contentMixture")
-    private List<SeedLotContentMixture> contentMixture = null;
-
-    @SerializedName("createdDate")
-    private OffsetDateTime createdDate = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("lastUpdated")
-    private OffsetDateTime lastUpdated = null;
-
-    @SerializedName("locationDbId")
-    private String locationDbId = null;
-
-    @SerializedName("locationName")
-    private String locationName = null;
-
-    @SerializedName("programDbId")
-    private String programDbId = null;
-
-    @SerializedName("programName")
-    private String programName = null;
-
-    @SerializedName("seedLotDbId")
-    private String seedLotDbId = null;
-
-    @SerializedName("seedLotDescription")
-    private String seedLotDescription = null;
-
-    @SerializedName("seedLotName")
-    private String seedLotName = null;
-
-    @SerializedName("sourceCollection")
-    private String sourceCollection = null;
-
-    @SerializedName("storageLocation")
-    private String storageLocation = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    public SeedLot additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public SeedLot putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public SeedLot amount(BigDecimal amount) {
-        this.amount = amount;
-        return this;
-    }
-
-    /**
-     * The current balance of the amount of material in a SeedLot. Could be a count (seeds, bulbs, etc) or a weight (kg of seed).
-     *
-     * @return amount
-     **/
-    @Schema(example = "561", description = "The current balance of the amount of material in a SeedLot. Could be a count (seeds, bulbs, etc) or a weight (kg of seed).")
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public SeedLot contentMixture(List<SeedLotContentMixture> contentMixture) {
-        this.contentMixture = contentMixture;
-        return this;
-    }
-
-    public SeedLot addContentMixtureItem(SeedLotContentMixture contentMixtureItem) {
-        if (this.contentMixture == null) {
-            this.contentMixture = new ArrayList<SeedLotContentMixture>();
-        }
-        this.contentMixture.add(contentMixtureItem);
-        return this;
-    }
-
-    /**
-     * The mixture of germplasm present in the seed lot. &lt;br/&gt; If this seed lot only contains a single germplasm, the response should contain the name  and DbId of that germplasm with a mixturePercentage value of 100 &lt;br/&gt; If the seed lot contains a mixture of different germplasm, the response should contain  the name and DbId every germplasm present. The mixturePercentage field should contain  the ratio of each germplasm in the total mixture. All of the mixturePercentage values  in this array should sum to equal 100.
-     *
-     * @return contentMixture
-     **/
-    @Schema(description = "The mixture of germplasm present in the seed lot. <br/> If this seed lot only contains a single germplasm, the response should contain the name  and DbId of that germplasm with a mixturePercentage value of 100 <br/> If the seed lot contains a mixture of different germplasm, the response should contain  the name and DbId every germplasm present. The mixturePercentage field should contain  the ratio of each germplasm in the total mixture. All of the mixturePercentage values  in this array should sum to equal 100.")
-    public List<SeedLotContentMixture> getContentMixture() {
-        return contentMixture;
-    }
-
-    public void setContentMixture(List<SeedLotContentMixture> contentMixture) {
-        this.contentMixture = contentMixture;
-    }
-
-    public SeedLot createdDate(OffsetDateTime createdDate) {
-        this.createdDate = createdDate;
-        return this;
-    }
-
-    /**
-     * The time stamp for when this seed lot was created
-     *
-     * @return createdDate
-     **/
-    @Schema(description = "The time stamp for when this seed lot was created")
-    public OffsetDateTime getCreatedDate() {
-        return createdDate;
-    }
-
-    public void setCreatedDate(OffsetDateTime createdDate) {
-        this.createdDate = createdDate;
-    }
-
-    public SeedLot externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public SeedLot addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public SeedLot lastUpdated(OffsetDateTime lastUpdated) {
-        this.lastUpdated = lastUpdated;
-        return this;
-    }
-
-    /**
-     * The timestamp for the last update to this Seed Lot (including transactions)
-     *
-     * @return lastUpdated
-     **/
-    @Schema(description = "The timestamp for the last update to this Seed Lot (including transactions)")
-    public OffsetDateTime getLastUpdated() {
-        return lastUpdated;
-    }
-
-    public void setLastUpdated(OffsetDateTime lastUpdated) {
-        this.lastUpdated = lastUpdated;
-    }
-
-    public SeedLot locationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Location
-     *
-     * @return locationDbId
-     **/
-    @Schema(example = "3cfdd67d", description = "The unique identifier for a Location")
-    public String getLocationDbId() {
-        return locationDbId;
-    }
-
-    public void setLocationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-    }
-
-    public SeedLot locationName(String locationName) {
-        this.locationName = locationName;
-        return this;
-    }
-
-    /**
-     * A human readable name for a location
-     *
-     * @return locationName
-     **/
-    @Schema(example = "Location 1", description = "A human readable name for a location")
-    public String getLocationName() {
-        return locationName;
-    }
-
-    public void setLocationName(String locationName) {
-        this.locationName = locationName;
-    }
-
-    public SeedLot programDbId(String programDbId) {
-        this.programDbId = programDbId;
-        return this;
-    }
-
-    /**
-     * The unique DbId of the breeding program this Seed Lot belongs to
-     *
-     * @return programDbId
-     **/
-    @Schema(example = "e972d569", description = "The unique DbId of the breeding program this Seed Lot belongs to")
-    public String getProgramDbId() {
-        return programDbId;
-    }
-
-    public void setProgramDbId(String programDbId) {
-        this.programDbId = programDbId;
-    }
-
-    public SeedLot programName(String programName) {
-        this.programName = programName;
-        return this;
-    }
-
-    /**
-     * The human readable name of the breeding program this Seed Lot belongs to
-     *
-     * @return programName
-     **/
-    @Schema(example = "Tomatillo_Breeding_Program", description = "The human readable name of the breeding program this Seed Lot belongs to")
-    public String getProgramName() {
-        return programName;
-    }
-
-    public void setProgramName(String programName) {
-        this.programName = programName;
-    }
-
-    public SeedLot seedLotDbId(String seedLotDbId) {
-        this.seedLotDbId = seedLotDbId;
-        return this;
-    }
-
-    /**
-     * Unique DbId for the Seed Lot
-     *
-     * @return seedLotDbId
-     **/
-    @Schema(example = "261ecb09", description = "Unique DbId for the Seed Lot")
-    public String getSeedLotDbId() {
-        return seedLotDbId;
-    }
-
-    public void setSeedLotDbId(String seedLotDbId) {
-        this.seedLotDbId = seedLotDbId;
-    }
-
-    public SeedLot seedLotDescription(String seedLotDescription) {
-        this.seedLotDescription = seedLotDescription;
-        return this;
-    }
-
-    /**
-     * A general description of this Seed Lot
-     *
-     * @return seedLotDescription
-     **/
-    @Schema(example = "This is a description of a seed lot", description = "A general description of this Seed Lot")
-    public String getSeedLotDescription() {
-        return seedLotDescription;
-    }
-
-    public void setSeedLotDescription(String seedLotDescription) {
-        this.seedLotDescription = seedLotDescription;
-    }
-
-    public SeedLot seedLotName(String seedLotName) {
-        this.seedLotName = seedLotName;
-        return this;
-    }
-
-    /**
-     * A human readable name for this Seed Lot
-     *
-     * @return seedLotName
-     **/
-    @Schema(example = "Seed Lot Alpha", description = "A human readable name for this Seed Lot")
-    public String getSeedLotName() {
-        return seedLotName;
-    }
-
-    public void setSeedLotName(String seedLotName) {
-        this.seedLotName = seedLotName;
-    }
-
-    public SeedLot sourceCollection(String sourceCollection) {
-        this.sourceCollection = sourceCollection;
-        return this;
-    }
-
-    /**
-     * The description of the source where this material was originally collected (wild, nursery, etc)
-     *
-     * @return sourceCollection
-     **/
-    @Schema(example = "nursery", description = "The description of the source where this material was originally collected (wild, nursery, etc)")
-    public String getSourceCollection() {
-        return sourceCollection;
-    }
-
-    public void setSourceCollection(String sourceCollection) {
-        this.sourceCollection = sourceCollection;
-    }
-
-    public SeedLot storageLocation(String storageLocation) {
-        this.storageLocation = storageLocation;
-        return this;
-    }
-
-    /**
-     * Description the storage location
-     *
-     * @return storageLocation
-     **/
-    @Schema(example = "The storage location is an massive, underground, bunker.", description = "Description the storage location")
-    public String getStorageLocation() {
-        return storageLocation;
-    }
-
-    public void setStorageLocation(String storageLocation) {
-        this.storageLocation = storageLocation;
-    }
-
-    public SeedLot units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * A description of the things being counted in a SeedLot (seeds, bulbs, kg, tree, etc)
-     *
-     * @return units
-     **/
-    @Schema(example = "seeds", description = "A description of the things being counted in a SeedLot (seeds, bulbs, kg, tree, etc)")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SeedLot seedLot = (SeedLot) o;
-        return Objects.equals(this.additionalInfo, seedLot.additionalInfo) &&
-                Objects.equals(this.amount, seedLot.amount) &&
-                Objects.equals(this.contentMixture, seedLot.contentMixture) &&
-                Objects.equals(this.createdDate, seedLot.createdDate) &&
-                Objects.equals(this.externalReferences, seedLot.externalReferences) &&
-                Objects.equals(this.lastUpdated, seedLot.lastUpdated) &&
-                Objects.equals(this.locationDbId, seedLot.locationDbId) &&
-                Objects.equals(this.locationName, seedLot.locationName) &&
-                Objects.equals(this.programDbId, seedLot.programDbId) &&
-                Objects.equals(this.programName, seedLot.programName) &&
-                Objects.equals(this.seedLotDbId, seedLot.seedLotDbId) &&
-                Objects.equals(this.seedLotDescription, seedLot.seedLotDescription) &&
-                Objects.equals(this.seedLotName, seedLot.seedLotName) &&
-                Objects.equals(this.sourceCollection, seedLot.sourceCollection) &&
-                Objects.equals(this.storageLocation, seedLot.storageLocation) &&
-                Objects.equals(this.units, seedLot.units);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, amount, contentMixture, createdDate, externalReferences, lastUpdated, locationDbId, locationName, programDbId, programName, seedLotDbId, seedLotDescription, seedLotName, sourceCollection, storageLocation, units);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SeedLot {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    amount: ").append(toIndentedString(amount)).append("\n");
-        sb.append("    contentMixture: ").append(toIndentedString(contentMixture)).append("\n");
-        sb.append("    createdDate: ").append(toIndentedString(createdDate)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    lastUpdated: ").append(toIndentedString(lastUpdated)).append("\n");
-        sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
-        sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
-        sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-        sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
-        sb.append("    seedLotDbId: ").append(toIndentedString(seedLotDbId)).append("\n");
-        sb.append("    seedLotDescription: ").append(toIndentedString(seedLotDescription)).append("\n");
-        sb.append("    seedLotName: ").append(toIndentedString(seedLotName)).append("\n");
-        sb.append("    sourceCollection: ").append(toIndentedString(sourceCollection)).append("\n");
-        sb.append("    storageLocation: ").append(toIndentedString(storageLocation)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotContentMixture.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotContentMixture.java
deleted file mode 100644
index ebf10ecb..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotContentMixture.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * SeedLotContentMixture
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SeedLotContentMixture {
-    @SerializedName("crossDbId")
-    private String crossDbId = null;
-
-    @SerializedName("crossName")
-    private String crossName = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("mixturePercentage")
-    private Integer mixturePercentage = null;
-
-    public SeedLotContentMixture crossDbId(String crossDbId) {
-        this.crossDbId = crossDbId;
-        return this;
-    }
-
-    /**
-     * The unique DbId for a cross contained in this seed lot
-     *
-     * @return crossDbId
-     **/
-    @Schema(example = "d105fd6f", description = "The unique DbId for a cross contained in this seed lot")
-    public String getCrossDbId() {
-        return crossDbId;
-    }
-
-    public void setCrossDbId(String crossDbId) {
-        this.crossDbId = crossDbId;
-    }
-
-    public SeedLotContentMixture crossName(String crossName) {
-        this.crossName = crossName;
-        return this;
-    }
-
-    /**
-     * The human readable name for a cross contained in this seed lot
-     *
-     * @return crossName
-     **/
-    @Schema(example = "my_Crosses_2018_01", description = "The human readable name for a cross contained in this seed lot")
-    public String getCrossName() {
-        return crossName;
-    }
-
-    public void setCrossName(String crossName) {
-        this.crossName = crossName;
-    }
-
-    public SeedLotContentMixture germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The unique DbId of the Germplasm contained in this Seed Lot
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "029d705d", description = "The unique DbId of the Germplasm contained in this Seed Lot")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public SeedLotContentMixture germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * The human readable name of the Germplasm contained in this Seed Lot
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000003", description = "The human readable name of the Germplasm contained in this Seed Lot")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public SeedLotContentMixture mixturePercentage(Integer mixturePercentage) {
-        this.mixturePercentage = mixturePercentage;
-        return this;
-    }
-
-    /**
-     * The percentage of the given germplasm in the seed lot mixture.
-     *
-     * @return mixturePercentage
-     **/
-    @Schema(example = "100", description = "The percentage of the given germplasm in the seed lot mixture.")
-    public Integer getMixturePercentage() {
-        return mixturePercentage;
-    }
-
-    public void setMixturePercentage(Integer mixturePercentage) {
-        this.mixturePercentage = mixturePercentage;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SeedLotContentMixture seedLotContentMixture = (SeedLotContentMixture) o;
-        return Objects.equals(this.crossDbId, seedLotContentMixture.crossDbId) &&
-                Objects.equals(this.crossName, seedLotContentMixture.crossName) &&
-                Objects.equals(this.germplasmDbId, seedLotContentMixture.germplasmDbId) &&
-                Objects.equals(this.germplasmName, seedLotContentMixture.germplasmName) &&
-                Objects.equals(this.mixturePercentage, seedLotContentMixture.mixturePercentage);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(crossDbId, crossName, germplasmDbId, germplasmName, mixturePercentage);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SeedLotContentMixture {\n");
-
-        sb.append("    crossDbId: ").append(toIndentedString(crossDbId)).append("\n");
-        sb.append("    crossName: ").append(toIndentedString(crossName)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    mixturePercentage: ").append(toIndentedString(mixturePercentage)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotListResponse.java
deleted file mode 100644
index 8f6d41cb..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * SeedLotListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SeedLotListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private SeedLotListResponseResult result = null;
-
-    public SeedLotListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public SeedLotListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public SeedLotListResponse result(SeedLotListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public SeedLotListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(SeedLotListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SeedLotListResponse seedLotListResponse = (SeedLotListResponse) o;
-        return Objects.equals(this._atContext, seedLotListResponse._atContext) &&
-                Objects.equals(this.metadata, seedLotListResponse.metadata) &&
-                Objects.equals(this.result, seedLotListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SeedLotListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotListResponseResult.java
deleted file mode 100644
index 7c79fd6e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SeedLotListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SeedLotListResponseResult {
-    @SerializedName("data")
-    private List<SeedLot> data = new ArrayList<SeedLot>();
-
-    public SeedLotListResponseResult data(List<SeedLot> data) {
-        this.data = data;
-        return this;
-    }
-
-    public SeedLotListResponseResult addDataItem(SeedLot dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<SeedLot> getData() {
-        return data;
-    }
-
-    public void setData(List<SeedLot> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SeedLotListResponseResult seedLotListResponseResult = (SeedLotListResponseResult) o;
-        return Objects.equals(this.data, seedLotListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SeedLotListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotNewRequest.java
deleted file mode 100644
index ae234032..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotNewRequest.java
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-/**
- * SeedLotNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SeedLotNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("amount")
-    private BigDecimal amount = null;
-
-    @SerializedName("contentMixture")
-    private List<SeedLotContentMixture> contentMixture = null;
-
-    @SerializedName("createdDate")
-    private OffsetDateTime createdDate = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("lastUpdated")
-    private OffsetDateTime lastUpdated = null;
-
-    @SerializedName("locationDbId")
-    private String locationDbId = null;
-
-    @SerializedName("locationName")
-    private String locationName = null;
-
-    @SerializedName("programDbId")
-    private String programDbId = null;
-
-    @SerializedName("programName")
-    private String programName = null;
-
-    @SerializedName("seedLotDescription")
-    private String seedLotDescription = null;
-
-    @SerializedName("seedLotName")
-    private String seedLotName = null;
-
-    @SerializedName("sourceCollection")
-    private String sourceCollection = null;
-
-    @SerializedName("storageLocation")
-    private String storageLocation = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    public SeedLotNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public SeedLotNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public SeedLotNewRequest amount(BigDecimal amount) {
-        this.amount = amount;
-        return this;
-    }
-
-    /**
-     * The current balance of the amount of material in a SeedLot. Could be a count (seeds, bulbs, etc) or a weight (kg of seed).
-     *
-     * @return amount
-     **/
-    @Schema(example = "561", description = "The current balance of the amount of material in a SeedLot. Could be a count (seeds, bulbs, etc) or a weight (kg of seed).")
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public SeedLotNewRequest contentMixture(List<SeedLotContentMixture> contentMixture) {
-        this.contentMixture = contentMixture;
-        return this;
-    }
-
-    public SeedLotNewRequest addContentMixtureItem(SeedLotContentMixture contentMixtureItem) {
-        if (this.contentMixture == null) {
-            this.contentMixture = new ArrayList<SeedLotContentMixture>();
-        }
-        this.contentMixture.add(contentMixtureItem);
-        return this;
-    }
-
-    /**
-     * The mixture of germplasm present in the seed lot. &lt;br/&gt; If this seed lot only contains a single germplasm, the response should contain the name  and DbId of that germplasm with a mixturePercentage value of 100 &lt;br/&gt; If the seed lot contains a mixture of different germplasm, the response should contain  the name and DbId every germplasm present. The mixturePercentage field should contain  the ratio of each germplasm in the total mixture. All of the mixturePercentage values  in this array should sum to equal 100.
-     *
-     * @return contentMixture
-     **/
-    @Schema(description = "The mixture of germplasm present in the seed lot. <br/> If this seed lot only contains a single germplasm, the response should contain the name  and DbId of that germplasm with a mixturePercentage value of 100 <br/> If the seed lot contains a mixture of different germplasm, the response should contain  the name and DbId every germplasm present. The mixturePercentage field should contain  the ratio of each germplasm in the total mixture. All of the mixturePercentage values  in this array should sum to equal 100.")
-    public List<SeedLotContentMixture> getContentMixture() {
-        return contentMixture;
-    }
-
-    public void setContentMixture(List<SeedLotContentMixture> contentMixture) {
-        this.contentMixture = contentMixture;
-    }
-
-    public SeedLotNewRequest createdDate(OffsetDateTime createdDate) {
-        this.createdDate = createdDate;
-        return this;
-    }
-
-    /**
-     * The time stamp for when this seed lot was created
-     *
-     * @return createdDate
-     **/
-    @Schema(description = "The time stamp for when this seed lot was created")
-    public OffsetDateTime getCreatedDate() {
-        return createdDate;
-    }
-
-    public void setCreatedDate(OffsetDateTime createdDate) {
-        this.createdDate = createdDate;
-    }
-
-    public SeedLotNewRequest externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public SeedLotNewRequest addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public SeedLotNewRequest lastUpdated(OffsetDateTime lastUpdated) {
-        this.lastUpdated = lastUpdated;
-        return this;
-    }
-
-    /**
-     * The timestamp for the last update to this Seed Lot (including transactions)
-     *
-     * @return lastUpdated
-     **/
-    @Schema(description = "The timestamp for the last update to this Seed Lot (including transactions)")
-    public OffsetDateTime getLastUpdated() {
-        return lastUpdated;
-    }
-
-    public void setLastUpdated(OffsetDateTime lastUpdated) {
-        this.lastUpdated = lastUpdated;
-    }
-
-    public SeedLotNewRequest locationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Location
-     *
-     * @return locationDbId
-     **/
-    @Schema(example = "3cfdd67d", description = "The unique identifier for a Location")
-    public String getLocationDbId() {
-        return locationDbId;
-    }
-
-    public void setLocationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-    }
-
-    public SeedLotNewRequest locationName(String locationName) {
-        this.locationName = locationName;
-        return this;
-    }
-
-    /**
-     * A human readable name for a location
-     *
-     * @return locationName
-     **/
-    @Schema(example = "Location 1", description = "A human readable name for a location")
-    public String getLocationName() {
-        return locationName;
-    }
-
-    public void setLocationName(String locationName) {
-        this.locationName = locationName;
-    }
-
-    public SeedLotNewRequest programDbId(String programDbId) {
-        this.programDbId = programDbId;
-        return this;
-    }
-
-    /**
-     * The unique DbId of the breeding program this Seed Lot belongs to
-     *
-     * @return programDbId
-     **/
-    @Schema(example = "e972d569", description = "The unique DbId of the breeding program this Seed Lot belongs to")
-    public String getProgramDbId() {
-        return programDbId;
-    }
-
-    public void setProgramDbId(String programDbId) {
-        this.programDbId = programDbId;
-    }
-
-    public SeedLotNewRequest programName(String programName) {
-        this.programName = programName;
-        return this;
-    }
-
-    /**
-     * The human readable name of the breeding program this Seed Lot belongs to
-     *
-     * @return programName
-     **/
-    @Schema(example = "Tomatillo_Breeding_Program", description = "The human readable name of the breeding program this Seed Lot belongs to")
-    public String getProgramName() {
-        return programName;
-    }
-
-    public void setProgramName(String programName) {
-        this.programName = programName;
-    }
-
-    public SeedLotNewRequest seedLotDescription(String seedLotDescription) {
-        this.seedLotDescription = seedLotDescription;
-        return this;
-    }
-
-    /**
-     * A general description of this Seed Lot
-     *
-     * @return seedLotDescription
-     **/
-    @Schema(example = "This is a description of a seed lot", description = "A general description of this Seed Lot")
-    public String getSeedLotDescription() {
-        return seedLotDescription;
-    }
-
-    public void setSeedLotDescription(String seedLotDescription) {
-        this.seedLotDescription = seedLotDescription;
-    }
-
-    public SeedLotNewRequest seedLotName(String seedLotName) {
-        this.seedLotName = seedLotName;
-        return this;
-    }
-
-    /**
-     * A human readable name for this Seed Lot
-     *
-     * @return seedLotName
-     **/
-    @Schema(example = "Seed Lot Alpha", description = "A human readable name for this Seed Lot")
-    public String getSeedLotName() {
-        return seedLotName;
-    }
-
-    public void setSeedLotName(String seedLotName) {
-        this.seedLotName = seedLotName;
-    }
-
-    public SeedLotNewRequest sourceCollection(String sourceCollection) {
-        this.sourceCollection = sourceCollection;
-        return this;
-    }
-
-    /**
-     * The description of the source where this material was originally collected (wild, nursery, etc)
-     *
-     * @return sourceCollection
-     **/
-    @Schema(example = "nursery", description = "The description of the source where this material was originally collected (wild, nursery, etc)")
-    public String getSourceCollection() {
-        return sourceCollection;
-    }
-
-    public void setSourceCollection(String sourceCollection) {
-        this.sourceCollection = sourceCollection;
-    }
-
-    public SeedLotNewRequest storageLocation(String storageLocation) {
-        this.storageLocation = storageLocation;
-        return this;
-    }
-
-    /**
-     * Description the storage location
-     *
-     * @return storageLocation
-     **/
-    @Schema(example = "The storage location is an massive, underground, bunker.", description = "Description the storage location")
-    public String getStorageLocation() {
-        return storageLocation;
-    }
-
-    public void setStorageLocation(String storageLocation) {
-        this.storageLocation = storageLocation;
-    }
-
-    public SeedLotNewRequest units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * A description of the things being counted in a SeedLot (seeds, bulbs, kg, tree, etc)
-     *
-     * @return units
-     **/
-    @Schema(example = "seeds", description = "A description of the things being counted in a SeedLot (seeds, bulbs, kg, tree, etc)")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SeedLotNewRequest seedLotNewRequest = (SeedLotNewRequest) o;
-        return Objects.equals(this.additionalInfo, seedLotNewRequest.additionalInfo) &&
-                Objects.equals(this.amount, seedLotNewRequest.amount) &&
-                Objects.equals(this.contentMixture, seedLotNewRequest.contentMixture) &&
-                Objects.equals(this.createdDate, seedLotNewRequest.createdDate) &&
-                Objects.equals(this.externalReferences, seedLotNewRequest.externalReferences) &&
-                Objects.equals(this.lastUpdated, seedLotNewRequest.lastUpdated) &&
-                Objects.equals(this.locationDbId, seedLotNewRequest.locationDbId) &&
-                Objects.equals(this.locationName, seedLotNewRequest.locationName) &&
-                Objects.equals(this.programDbId, seedLotNewRequest.programDbId) &&
-                Objects.equals(this.programName, seedLotNewRequest.programName) &&
-                Objects.equals(this.seedLotDescription, seedLotNewRequest.seedLotDescription) &&
-                Objects.equals(this.seedLotName, seedLotNewRequest.seedLotName) &&
-                Objects.equals(this.sourceCollection, seedLotNewRequest.sourceCollection) &&
-                Objects.equals(this.storageLocation, seedLotNewRequest.storageLocation) &&
-                Objects.equals(this.units, seedLotNewRequest.units);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, amount, contentMixture, createdDate, externalReferences, lastUpdated, locationDbId, locationName, programDbId, programName, seedLotDescription, seedLotName, sourceCollection, storageLocation, units);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SeedLotNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    amount: ").append(toIndentedString(amount)).append("\n");
-        sb.append("    contentMixture: ").append(toIndentedString(contentMixture)).append("\n");
-        sb.append("    createdDate: ").append(toIndentedString(createdDate)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    lastUpdated: ").append(toIndentedString(lastUpdated)).append("\n");
-        sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
-        sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
-        sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-        sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
-        sb.append("    seedLotDescription: ").append(toIndentedString(seedLotDescription)).append("\n");
-        sb.append("    seedLotName: ").append(toIndentedString(seedLotName)).append("\n");
-        sb.append("    sourceCollection: ").append(toIndentedString(sourceCollection)).append("\n");
-        sb.append("    storageLocation: ").append(toIndentedString(storageLocation)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotSingleResponse.java
deleted file mode 100644
index 85e5656e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * SeedLotSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SeedLotSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private SeedLot result = null;
-
-    public SeedLotSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public SeedLotSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public SeedLotSingleResponse result(SeedLot result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public SeedLot getResult() {
-        return result;
-    }
-
-    public void setResult(SeedLot result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SeedLotSingleResponse seedLotSingleResponse = (SeedLotSingleResponse) o;
-        return Objects.equals(this._atContext, seedLotSingleResponse._atContext) &&
-                Objects.equals(this.metadata, seedLotSingleResponse.metadata) &&
-                Objects.equals(this.result, seedLotSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SeedLotSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotTransaction.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotTransaction.java
deleted file mode 100644
index e8f04bc3..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotTransaction.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-/**
- * SeedLotTransaction
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SeedLotTransaction {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("amount")
-    private BigDecimal amount = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("fromSeedLotDbId")
-    private String fromSeedLotDbId = null;
-
-    @SerializedName("toSeedLotDbId")
-    private String toSeedLotDbId = null;
-
-    @SerializedName("transactionDbId")
-    private String transactionDbId = null;
-
-    @SerializedName("transactionDescription")
-    private String transactionDescription = null;
-
-    @SerializedName("transactionTimestamp")
-    private OffsetDateTime transactionTimestamp = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    public SeedLotTransaction additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public SeedLotTransaction putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public SeedLotTransaction amount(BigDecimal amount) {
-        this.amount = amount;
-        return this;
-    }
-
-    /**
-     * The number of units being transfered between SeedLots. Could be a count (seeds, bulbs, etc) or a weight (kg of seed).
-     *
-     * @return amount
-     **/
-    @Schema(example = "45", description = "The number of units being transfered between SeedLots. Could be a count (seeds, bulbs, etc) or a weight (kg of seed).")
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public SeedLotTransaction externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public SeedLotTransaction addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public SeedLotTransaction fromSeedLotDbId(String fromSeedLotDbId) {
-        this.fromSeedLotDbId = fromSeedLotDbId;
-        return this;
-    }
-
-    /**
-     * The identifier for the Seed Lot being transfered out of
-     *
-     * @return fromSeedLotDbId
-     **/
-    @Schema(example = "11eef13b", description = "The identifier for the Seed Lot being transfered out of")
-    public String getFromSeedLotDbId() {
-        return fromSeedLotDbId;
-    }
-
-    public void setFromSeedLotDbId(String fromSeedLotDbId) {
-        this.fromSeedLotDbId = fromSeedLotDbId;
-    }
-
-    public SeedLotTransaction toSeedLotDbId(String toSeedLotDbId) {
-        this.toSeedLotDbId = toSeedLotDbId;
-        return this;
-    }
-
-    /**
-     * The identifier for the Seed Lot being transfered into
-     *
-     * @return toSeedLotDbId
-     **/
-    @Schema(example = "59339b90", description = "The identifier for the Seed Lot being transfered into")
-    public String getToSeedLotDbId() {
-        return toSeedLotDbId;
-    }
-
-    public void setToSeedLotDbId(String toSeedLotDbId) {
-        this.toSeedLotDbId = toSeedLotDbId;
-    }
-
-    public SeedLotTransaction transactionDbId(String transactionDbId) {
-        this.transactionDbId = transactionDbId;
-        return this;
-    }
-
-    /**
-     * Unique DbId for the Seed Lot Transaction
-     *
-     * @return transactionDbId
-     **/
-    @Schema(example = "28e46db9", description = "Unique DbId for the Seed Lot Transaction")
-    public String getTransactionDbId() {
-        return transactionDbId;
-    }
-
-    public void setTransactionDbId(String transactionDbId) {
-        this.transactionDbId = transactionDbId;
-    }
-
-    public SeedLotTransaction transactionDescription(String transactionDescription) {
-        this.transactionDescription = transactionDescription;
-        return this;
-    }
-
-    /**
-     * A general description of this Seed Lot Transaction
-     *
-     * @return transactionDescription
-     **/
-    @Schema(example = "f9cd88d2", description = "A general description of this Seed Lot Transaction")
-    public String getTransactionDescription() {
-        return transactionDescription;
-    }
-
-    public void setTransactionDescription(String transactionDescription) {
-        this.transactionDescription = transactionDescription;
-    }
-
-    public SeedLotTransaction transactionTimestamp(OffsetDateTime transactionTimestamp) {
-        this.transactionTimestamp = transactionTimestamp;
-        return this;
-    }
-
-    /**
-     * The time stamp for when the transaction occurred
-     *
-     * @return transactionTimestamp
-     **/
-    @Schema(description = "The time stamp for when the transaction occurred")
-    public OffsetDateTime getTransactionTimestamp() {
-        return transactionTimestamp;
-    }
-
-    public void setTransactionTimestamp(OffsetDateTime transactionTimestamp) {
-        this.transactionTimestamp = transactionTimestamp;
-    }
-
-    public SeedLotTransaction units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * A description of the things being transfered between SeedLots in a transaction (seeds, bulbs, kg, etc)
-     *
-     * @return units
-     **/
-    @Schema(example = "seeds", description = "A description of the things being transfered between SeedLots in a transaction (seeds, bulbs, kg, etc)")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SeedLotTransaction seedLotTransaction = (SeedLotTransaction) o;
-        return Objects.equals(this.additionalInfo, seedLotTransaction.additionalInfo) &&
-                Objects.equals(this.amount, seedLotTransaction.amount) &&
-                Objects.equals(this.externalReferences, seedLotTransaction.externalReferences) &&
-                Objects.equals(this.fromSeedLotDbId, seedLotTransaction.fromSeedLotDbId) &&
-                Objects.equals(this.toSeedLotDbId, seedLotTransaction.toSeedLotDbId) &&
-                Objects.equals(this.transactionDbId, seedLotTransaction.transactionDbId) &&
-                Objects.equals(this.transactionDescription, seedLotTransaction.transactionDescription) &&
-                Objects.equals(this.transactionTimestamp, seedLotTransaction.transactionTimestamp) &&
-                Objects.equals(this.units, seedLotTransaction.units);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, amount, externalReferences, fromSeedLotDbId, toSeedLotDbId, transactionDbId, transactionDescription, transactionTimestamp, units);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SeedLotTransaction {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    amount: ").append(toIndentedString(amount)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    fromSeedLotDbId: ").append(toIndentedString(fromSeedLotDbId)).append("\n");
-        sb.append("    toSeedLotDbId: ").append(toIndentedString(toSeedLotDbId)).append("\n");
-        sb.append("    transactionDbId: ").append(toIndentedString(transactionDbId)).append("\n");
-        sb.append("    transactionDescription: ").append(toIndentedString(transactionDescription)).append("\n");
-        sb.append("    transactionTimestamp: ").append(toIndentedString(transactionTimestamp)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotTransactionListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotTransactionListResponse.java
deleted file mode 100644
index 88ff6c37..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotTransactionListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * SeedLotTransactionListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SeedLotTransactionListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private SeedLotTransactionListResponseResult result = null;
-
-    public SeedLotTransactionListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public SeedLotTransactionListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public SeedLotTransactionListResponse result(SeedLotTransactionListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public SeedLotTransactionListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(SeedLotTransactionListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SeedLotTransactionListResponse seedLotTransactionListResponse = (SeedLotTransactionListResponse) o;
-        return Objects.equals(this._atContext, seedLotTransactionListResponse._atContext) &&
-                Objects.equals(this.metadata, seedLotTransactionListResponse.metadata) &&
-                Objects.equals(this.result, seedLotTransactionListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SeedLotTransactionListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotTransactionListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotTransactionListResponseResult.java
deleted file mode 100644
index 9358ebfd..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotTransactionListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SeedLotTransactionListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SeedLotTransactionListResponseResult {
-    @SerializedName("data")
-    private List<SeedLotTransaction> data = new ArrayList<SeedLotTransaction>();
-
-    public SeedLotTransactionListResponseResult data(List<SeedLotTransaction> data) {
-        this.data = data;
-        return this;
-    }
-
-    public SeedLotTransactionListResponseResult addDataItem(SeedLotTransaction dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<SeedLotTransaction> getData() {
-        return data;
-    }
-
-    public void setData(List<SeedLotTransaction> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SeedLotTransactionListResponseResult seedLotTransactionListResponseResult = (SeedLotTransactionListResponseResult) o;
-        return Objects.equals(this.data, seedLotTransactionListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SeedLotTransactionListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotTransactionNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotTransactionNewRequest.java
deleted file mode 100644
index 340bce42..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/SeedLotTransactionNewRequest.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-/**
- * SeedLotTransactionNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class SeedLotTransactionNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("amount")
-    private BigDecimal amount = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("fromSeedLotDbId")
-    private String fromSeedLotDbId = null;
-
-    @SerializedName("toSeedLotDbId")
-    private String toSeedLotDbId = null;
-
-    @SerializedName("transactionDescription")
-    private String transactionDescription = null;
-
-    @SerializedName("transactionTimestamp")
-    private OffsetDateTime transactionTimestamp = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    public SeedLotTransactionNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public SeedLotTransactionNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public SeedLotTransactionNewRequest amount(BigDecimal amount) {
-        this.amount = amount;
-        return this;
-    }
-
-    /**
-     * The number of units being transfered between SeedLots. Could be a count (seeds, bulbs, etc) or a weight (kg of seed).
-     *
-     * @return amount
-     **/
-    @Schema(example = "45", description = "The number of units being transfered between SeedLots. Could be a count (seeds, bulbs, etc) or a weight (kg of seed).")
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public SeedLotTransactionNewRequest externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public SeedLotTransactionNewRequest addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public SeedLotTransactionNewRequest fromSeedLotDbId(String fromSeedLotDbId) {
-        this.fromSeedLotDbId = fromSeedLotDbId;
-        return this;
-    }
-
-    /**
-     * The identifier for the Seed Lot being transfered out of
-     *
-     * @return fromSeedLotDbId
-     **/
-    @Schema(example = "11eef13b", description = "The identifier for the Seed Lot being transfered out of")
-    public String getFromSeedLotDbId() {
-        return fromSeedLotDbId;
-    }
-
-    public void setFromSeedLotDbId(String fromSeedLotDbId) {
-        this.fromSeedLotDbId = fromSeedLotDbId;
-    }
-
-    public SeedLotTransactionNewRequest toSeedLotDbId(String toSeedLotDbId) {
-        this.toSeedLotDbId = toSeedLotDbId;
-        return this;
-    }
-
-    /**
-     * The identifier for the Seed Lot being transfered into
-     *
-     * @return toSeedLotDbId
-     **/
-    @Schema(example = "59339b90", description = "The identifier for the Seed Lot being transfered into")
-    public String getToSeedLotDbId() {
-        return toSeedLotDbId;
-    }
-
-    public void setToSeedLotDbId(String toSeedLotDbId) {
-        this.toSeedLotDbId = toSeedLotDbId;
-    }
-
-    public SeedLotTransactionNewRequest transactionDescription(String transactionDescription) {
-        this.transactionDescription = transactionDescription;
-        return this;
-    }
-
-    /**
-     * A general description of this Seed Lot Transaction
-     *
-     * @return transactionDescription
-     **/
-    @Schema(example = "f9cd88d2", description = "A general description of this Seed Lot Transaction")
-    public String getTransactionDescription() {
-        return transactionDescription;
-    }
-
-    public void setTransactionDescription(String transactionDescription) {
-        this.transactionDescription = transactionDescription;
-    }
-
-    public SeedLotTransactionNewRequest transactionTimestamp(OffsetDateTime transactionTimestamp) {
-        this.transactionTimestamp = transactionTimestamp;
-        return this;
-    }
-
-    /**
-     * The time stamp for when the transaction occurred
-     *
-     * @return transactionTimestamp
-     **/
-    @Schema(description = "The time stamp for when the transaction occurred")
-    public OffsetDateTime getTransactionTimestamp() {
-        return transactionTimestamp;
-    }
-
-    public void setTransactionTimestamp(OffsetDateTime transactionTimestamp) {
-        this.transactionTimestamp = transactionTimestamp;
-    }
-
-    public SeedLotTransactionNewRequest units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * A description of the things being transfered between SeedLots in a transaction (seeds, bulbs, kg, etc)
-     *
-     * @return units
-     **/
-    @Schema(example = "seeds", description = "A description of the things being transfered between SeedLots in a transaction (seeds, bulbs, kg, etc)")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SeedLotTransactionNewRequest seedLotTransactionNewRequest = (SeedLotTransactionNewRequest) o;
-        return Objects.equals(this.additionalInfo, seedLotTransactionNewRequest.additionalInfo) &&
-                Objects.equals(this.amount, seedLotTransactionNewRequest.amount) &&
-                Objects.equals(this.externalReferences, seedLotTransactionNewRequest.externalReferences) &&
-                Objects.equals(this.fromSeedLotDbId, seedLotTransactionNewRequest.fromSeedLotDbId) &&
-                Objects.equals(this.toSeedLotDbId, seedLotTransactionNewRequest.toSeedLotDbId) &&
-                Objects.equals(this.transactionDescription, seedLotTransactionNewRequest.transactionDescription) &&
-                Objects.equals(this.transactionTimestamp, seedLotTransactionNewRequest.transactionTimestamp) &&
-                Objects.equals(this.units, seedLotTransactionNewRequest.units);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, amount, externalReferences, fromSeedLotDbId, toSeedLotDbId, transactionDescription, transactionTimestamp, units);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SeedLotTransactionNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    amount: ").append(toIndentedString(amount)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    fromSeedLotDbId: ").append(toIndentedString(fromSeedLotDbId)).append("\n");
-        sb.append("    toSeedLotDbId: ").append(toIndentedString(toSeedLotDbId)).append("\n");
-        sb.append("    transactionDescription: ").append(toIndentedString(transactionDescription)).append("\n");
-        sb.append("    transactionTimestamp: ").append(toIndentedString(transactionTimestamp)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Status.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Status.java
deleted file mode 100644
index bf78fe47..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Status.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * An array of status messages to convey technical logging information from the server to the client.
- */
-@Schema(description = "An array of status messages to convey technical logging information from the server to the client.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class Status {
-    @SerializedName("message")
-    private String message = null;
-
-    /**
-     * The logging level for the attached message
-     */
-    @JsonAdapter(MessageTypeEnum.Adapter.class)
-    public enum MessageTypeEnum {
-        DEBUG("DEBUG"),
-        ERROR("ERROR"),
-        WARNING("WARNING"),
-        INFO("INFO");
-
-        private String value;
-
-        MessageTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static MessageTypeEnum fromValue(String input) {
-            for (MessageTypeEnum b : MessageTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<MessageTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final MessageTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public MessageTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return MessageTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("messageType")
-    private MessageTypeEnum messageType = null;
-
-    public Status message(String message) {
-        this.message = message;
-        return this;
-    }
-
-    /**
-     * A short message concerning the status of this request/response
-     *
-     * @return message
-     **/
-    @Schema(example = "Request accepted, response successful", required = true, description = "A short message concerning the status of this request/response")
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public Status messageType(MessageTypeEnum messageType) {
-        this.messageType = messageType;
-        return this;
-    }
-
-    /**
-     * The logging level for the attached message
-     *
-     * @return messageType
-     **/
-    @Schema(example = "INFO", required = true, description = "The logging level for the attached message")
-    public MessageTypeEnum getMessageType() {
-        return messageType;
-    }
-
-    public void setMessageType(MessageTypeEnum messageType) {
-        this.messageType = messageType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Status status = (Status) o;
-        return Objects.equals(this.message, status.message) &&
-                Objects.equals(this.messageType, status.messageType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(message, messageType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Status {\n");
-
-        sb.append("    message: ").append(toIndentedString(message)).append("\n");
-        sb.append("    messageType: ").append(toIndentedString(messageType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/TaxonID.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/TaxonID.java
deleted file mode 100644
index 7561d907..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/TaxonID.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * TaxonID
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class TaxonID {
-    @SerializedName("sourceName")
-    private String sourceName = null;
-
-    @SerializedName("taxonId")
-    private String taxonId = null;
-
-    public TaxonID sourceName(String sourceName) {
-        this.sourceName = sourceName;
-        return this;
-    }
-
-    /**
-     * The human readable name of the taxonomy provider
-     *
-     * @return sourceName
-     **/
-    @Schema(example = "NCBI", required = true, description = "The human readable name of the taxonomy provider")
-    public String getSourceName() {
-        return sourceName;
-    }
-
-    public void setSourceName(String sourceName) {
-        this.sourceName = sourceName;
-    }
-
-    public TaxonID taxonId(String taxonId) {
-        this.taxonId = taxonId;
-        return this;
-    }
-
-    /**
-     * The identifier (name, ID, URI) of a particular taxonomy within the source provider
-     *
-     * @return taxonId
-     **/
-    @Schema(example = "2026747", required = true, description = "The identifier (name, ID, URI) of a particular taxonomy within the source provider")
-    public String getTaxonId() {
-        return taxonId;
-    }
-
-    public void setTaxonId(String taxonId) {
-        this.taxonId = taxonId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TaxonID taxonID = (TaxonID) o;
-        return Objects.equals(this.sourceName, taxonID.sourceName) &&
-                Objects.equals(this.taxonId, taxonID.taxonId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(sourceName, taxonId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TaxonID {\n");
-
-        sb.append("    sourceName: ").append(toIndentedString(sourceName)).append("\n");
-        sb.append("    taxonId: ").append(toIndentedString(taxonId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/TokenPagination.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/TokenPagination.java
deleted file mode 100644
index b93aa602..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/TokenPagination.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The pagination object is applicable only when the payload contains a \&quot;data\&quot; key. It describes the pagination of the data contained in the \&quot;data\&quot; array, as a way to identify which subset of data is being returned.  &lt;br&gt;Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken to construct an additional query and move to the next or previous page respectively.
- */
-@Schema(description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The pagination object is applicable only when the payload contains a \"data\" key. It describes the pagination of the data contained in the \"data\" array, as a way to identify which subset of data is being returned.  <br>Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken to construct an additional query and move to the next or previous page respectively.  ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class TokenPagination {
-    @SerializedName("currentPage")
-    private Integer currentPage = 0;
-
-    @SerializedName("currentPageToken")
-    private String currentPageToken = null;
-
-    @SerializedName("nextPageToken")
-    private String nextPageToken = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = 1000;
-
-    @SerializedName("prevPageToken")
-    private String prevPageToken = null;
-
-    @SerializedName("totalCount")
-    private Integer totalCount = null;
-
-    @SerializedName("totalPages")
-    private Integer totalPages = null;
-
-    public TokenPagination currentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-        return this;
-    }
-
-    /**
-     * The index number for the returned page of data. This should always match the requested page number or the default page (0).
-     *
-     * @return currentPage
-     **/
-    @Schema(example = "0", description = "The index number for the returned page of data. This should always match the requested page number or the default page (0).")
-    public Integer getCurrentPage() {
-        return currentPage;
-    }
-
-    public void setCurrentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-    }
-
-    public TokenPagination currentPageToken(String currentPageToken) {
-        this.currentPageToken = currentPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the current page of data.
-     *
-     * @return currentPageToken
-     **/
-    @Schema(example = "48bc6ac1", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the current page of data.")
-    public String getCurrentPageToken() {
-        return currentPageToken;
-    }
-
-    public void setCurrentPageToken(String currentPageToken) {
-        this.currentPageToken = currentPageToken;
-    }
-
-    public TokenPagination nextPageToken(String nextPageToken) {
-        this.nextPageToken = nextPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the next page of data.
-     *
-     * @return nextPageToken
-     **/
-    @Schema(example = "cb668f63", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the next page of data.")
-    public String getNextPageToken() {
-        return nextPageToken;
-    }
-
-    public void setNextPageToken(String nextPageToken) {
-        this.nextPageToken = nextPageToken;
-    }
-
-    public TokenPagination pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public TokenPagination prevPageToken(String prevPageToken) {
-        this.prevPageToken = prevPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the previous page of data.
-     *
-     * @return prevPageToken
-     **/
-    @Schema(example = "9659857e", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the previous page of data.")
-    public String getPrevPageToken() {
-        return prevPageToken;
-    }
-
-    public void setPrevPageToken(String prevPageToken) {
-        this.prevPageToken = prevPageToken;
-    }
-
-    public TokenPagination totalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-        return this;
-    }
-
-    /**
-     * The total number of elements that are available on the server and match the requested query parameters.
-     *
-     * @return totalCount
-     **/
-    @Schema(example = "10", description = "The total number of elements that are available on the server and match the requested query parameters.")
-    public Integer getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public TokenPagination totalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-        return this;
-    }
-
-    /**
-     * The total number of pages of elements available on the server. This should be calculated with the following formula.  &lt;br&gt; totalPages &#x3D; CEILING( totalCount / requested_page_size)
-     *
-     * @return totalPages
-     **/
-    @Schema(example = "1", description = "The total number of pages of elements available on the server. This should be calculated with the following formula.  <br> totalPages = CEILING( totalCount / requested_page_size)")
-    public Integer getTotalPages() {
-        return totalPages;
-    }
-
-    public void setTotalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TokenPagination tokenPagination = (TokenPagination) o;
-        return Objects.equals(this.currentPage, tokenPagination.currentPage) &&
-                Objects.equals(this.currentPageToken, tokenPagination.currentPageToken) &&
-                Objects.equals(this.nextPageToken, tokenPagination.nextPageToken) &&
-                Objects.equals(this.pageSize, tokenPagination.pageSize) &&
-                Objects.equals(this.prevPageToken, tokenPagination.prevPageToken) &&
-                Objects.equals(this.totalCount, tokenPagination.totalCount) &&
-                Objects.equals(this.totalPages, tokenPagination.totalPages);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(currentPage, currentPageToken, nextPageToken, pageSize, prevPageToken, totalCount, totalPages);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TokenPagination {\n");
-
-        sb.append("    currentPage: ").append(toIndentedString(currentPage)).append("\n");
-        sb.append("    currentPageToken: ").append(toIndentedString(currentPageToken)).append("\n");
-        sb.append("    nextPageToken: ").append(toIndentedString(nextPageToken)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    prevPageToken: ").append(toIndentedString(prevPageToken)).append("\n");
-        sb.append("    totalCount: ").append(toIndentedString(totalCount)).append("\n");
-        sb.append("    totalPages: ").append(toIndentedString(totalPages)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Trait.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Trait.java
deleted file mode 100644
index 4de228bd..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/Trait.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A Trait describes what property is being observed.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Trait \&quot;Leaf length\&quot; or \&quot;Flower height\&quot;.
- */
-@Schema(description = "A Trait describes what property is being observed.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Trait \"Leaf length\" or \"Flower height\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class Trait {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("alternativeAbbreviations")
-    private List<String> alternativeAbbreviations = null;
-
-    @SerializedName("attribute")
-    private String attribute = null;
-
-    @SerializedName("attributePUI")
-    private String attributePUI = null;
-
-    @SerializedName("entity")
-    private String entity = null;
-
-    @SerializedName("entityPUI")
-    private String entityPUI = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("mainAbbreviation")
-    private String mainAbbreviation = null;
-
-    @SerializedName("ontologyReference")
-    private GermplasmAttributeMethodOntologyReference ontologyReference = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("traitClass")
-    private String traitClass = null;
-
-    @SerializedName("traitDbId")
-    private String traitDbId = null;
-
-    @SerializedName("traitDescription")
-    private String traitDescription = null;
-
-    @SerializedName("traitName")
-    private String traitName = null;
-
-    @SerializedName("traitPUI")
-    private String traitPUI = null;
-
-    public Trait additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Trait putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Trait alternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-        return this;
-    }
-
-    public Trait addAlternativeAbbreviationsItem(String alternativeAbbreviationsItem) {
-        if (this.alternativeAbbreviations == null) {
-            this.alternativeAbbreviations = new ArrayList<String>();
-        }
-        this.alternativeAbbreviations.add(alternativeAbbreviationsItem);
-        return this;
-    }
-
-    /**
-     * A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.
-     *
-     * @return alternativeAbbreviations
-     **/
-    @Schema(example = "[\"H\",\"PH\",\"H1\"]", description = "A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.")
-    public List<String> getAlternativeAbbreviations() {
-        return alternativeAbbreviations;
-    }
-
-    public void setAlternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-    }
-
-    public Trait attribute(String attribute) {
-        this.attribute = attribute;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attribute
-     **/
-    @Schema(example = "height", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    public Trait attributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attributePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PO:00012345", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttributePUI() {
-        return attributePUI;
-    }
-
-    public void setAttributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-    }
-
-    public Trait entity(String entity) {
-        this.entity = entity;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entity
-     **/
-    @Schema(example = "Stalk", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public String getEntity() {
-        return entity;
-    }
-
-    public void setEntity(String entity) {
-        this.entity = entity;
-    }
-
-    public Trait entityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A Trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the Entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entityPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PATO:00098765", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A Trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the Entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public String getEntityPUI() {
-        return entityPUI;
-    }
-
-    public void setEntityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-    }
-
-    public Trait externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Trait addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Trait mainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Trait
-     *
-     * @return mainAbbreviation
-     **/
-    @Schema(example = "PH", description = "A shortened version of the human readable name for a Trait")
-    public String getMainAbbreviation() {
-        return mainAbbreviation;
-    }
-
-    public void setMainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-    }
-
-    public Trait ontologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeMethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public Trait status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Trait status (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Trait status (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Trait synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public Trait addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other trait names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Height\",\"Plant Height\",\"Stalk Height\",\"Canopy Height\"]", description = "Other trait names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public Trait traitClass(String traitClass) {
-        this.traitClass = traitClass;
-        return this;
-    }
-
-    /**
-     * A classification to describe the type of trait and the context it should be considered in. &lt;br/&gt; examples- \&quot;morphological\&quot;, \&quot;phenological\&quot;, \&quot;agronomical\&quot;, \&quot;physiological\&quot;, \&quot;abiotic stress\&quot;, \&quot;biotic stress\&quot;, \&quot;biochemical\&quot;, \&quot;quality traits\&quot;, \&quot;fertility\&quot;, etc.
-     *
-     * @return traitClass
-     **/
-    @Schema(example = "phenological", description = "A classification to describe the type of trait and the context it should be considered in. <br/> examples- \"morphological\", \"phenological\", \"agronomical\", \"physiological\", \"abiotic stress\", \"biotic stress\", \"biochemical\", \"quality traits\", \"fertility\", etc.")
-    public String getTraitClass() {
-        return traitClass;
-    }
-
-    public void setTraitClass(String traitClass) {
-        this.traitClass = traitClass;
-    }
-
-    public Trait traitDbId(String traitDbId) {
-        this.traitDbId = traitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trait
-     *
-     * @return traitDbId
-     **/
-    @Schema(example = "9b2e34f5", description = "The ID which uniquely identifies a trait")
-    public String getTraitDbId() {
-        return traitDbId;
-    }
-
-    public void setTraitDbId(String traitDbId) {
-        this.traitDbId = traitDbId;
-    }
-
-    public Trait traitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-        return this;
-    }
-
-    /**
-     * The description of a trait
-     *
-     * @return traitDescription
-     **/
-    @Schema(example = "The height of the plant", description = "The description of a trait")
-    public String getTraitDescription() {
-        return traitDescription;
-    }
-
-    public void setTraitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-    }
-
-    public Trait traitName(String traitName) {
-        this.traitName = traitName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitName
-     **/
-    @Schema(example = "Height", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public String getTraitName() {
-        return traitName;
-    }
-
-    public void setTraitName(String traitName) {
-        this.traitName = traitName;
-    }
-
-    public Trait traitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000012", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public String getTraitPUI() {
-        return traitPUI;
-    }
-
-    public void setTraitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Trait trait = (Trait) o;
-        return Objects.equals(this.additionalInfo, trait.additionalInfo) &&
-                Objects.equals(this.alternativeAbbreviations, trait.alternativeAbbreviations) &&
-                Objects.equals(this.attribute, trait.attribute) &&
-                Objects.equals(this.attributePUI, trait.attributePUI) &&
-                Objects.equals(this.entity, trait.entity) &&
-                Objects.equals(this.entityPUI, trait.entityPUI) &&
-                Objects.equals(this.externalReferences, trait.externalReferences) &&
-                Objects.equals(this.mainAbbreviation, trait.mainAbbreviation) &&
-                Objects.equals(this.ontologyReference, trait.ontologyReference) &&
-                Objects.equals(this.status, trait.status) &&
-                Objects.equals(this.synonyms, trait.synonyms) &&
-                Objects.equals(this.traitClass, trait.traitClass) &&
-                Objects.equals(this.traitDbId, trait.traitDbId) &&
-                Objects.equals(this.traitDescription, trait.traitDescription) &&
-                Objects.equals(this.traitName, trait.traitName) &&
-                Objects.equals(this.traitPUI, trait.traitPUI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, alternativeAbbreviations, attribute, attributePUI, entity, entityPUI, externalReferences, mainAbbreviation, ontologyReference, status, synonyms, traitClass, traitDbId, traitDescription, traitName, traitPUI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Trait {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    alternativeAbbreviations: ").append(toIndentedString(alternativeAbbreviations)).append("\n");
-        sb.append("    attribute: ").append(toIndentedString(attribute)).append("\n");
-        sb.append("    attributePUI: ").append(toIndentedString(attributePUI)).append("\n");
-        sb.append("    entity: ").append(toIndentedString(entity)).append("\n");
-        sb.append("    entityPUI: ").append(toIndentedString(entityPUI)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    mainAbbreviation: ").append(toIndentedString(mainAbbreviation)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    traitClass: ").append(toIndentedString(traitClass)).append("\n");
-        sb.append("    traitDbId: ").append(toIndentedString(traitDbId)).append("\n");
-        sb.append("    traitDescription: ").append(toIndentedString(traitDescription)).append("\n");
-        sb.append("    traitName: ").append(toIndentedString(traitName)).append("\n");
-        sb.append("    traitPUI: ").append(toIndentedString(traitPUI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/TraitBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/TraitBaseClass.java
deleted file mode 100644
index b8fbeba6..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/TraitBaseClass.java
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A Trait describes what property is being observed.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Trait \&quot;Leaf length\&quot; or \&quot;Flower height\&quot;.
- */
-@Schema(description = "A Trait describes what property is being observed.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Trait \"Leaf length\" or \"Flower height\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class TraitBaseClass {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("alternativeAbbreviations")
-    private List<String> alternativeAbbreviations = null;
-
-    @SerializedName("attribute")
-    private String attribute = null;
-
-    @SerializedName("attributePUI")
-    private String attributePUI = null;
-
-    @SerializedName("entity")
-    private String entity = null;
-
-    @SerializedName("entityPUI")
-    private String entityPUI = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("mainAbbreviation")
-    private String mainAbbreviation = null;
-
-    @SerializedName("ontologyReference")
-    private GermplasmAttributeMethodOntologyReference ontologyReference = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("traitClass")
-    private String traitClass = null;
-
-    @SerializedName("traitDescription")
-    private String traitDescription = null;
-
-    @SerializedName("traitName")
-    private String traitName = null;
-
-    @SerializedName("traitPUI")
-    private String traitPUI = null;
-
-    public TraitBaseClass additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public TraitBaseClass putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public TraitBaseClass alternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-        return this;
-    }
-
-    public TraitBaseClass addAlternativeAbbreviationsItem(String alternativeAbbreviationsItem) {
-        if (this.alternativeAbbreviations == null) {
-            this.alternativeAbbreviations = new ArrayList<String>();
-        }
-        this.alternativeAbbreviations.add(alternativeAbbreviationsItem);
-        return this;
-    }
-
-    /**
-     * A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.
-     *
-     * @return alternativeAbbreviations
-     **/
-    @Schema(example = "[\"H\",\"PH\",\"H1\"]", description = "A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.")
-    public List<String> getAlternativeAbbreviations() {
-        return alternativeAbbreviations;
-    }
-
-    public void setAlternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-    }
-
-    public TraitBaseClass attribute(String attribute) {
-        this.attribute = attribute;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attribute
-     **/
-    @Schema(example = "height", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    public TraitBaseClass attributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attributePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PO:00012345", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttributePUI() {
-        return attributePUI;
-    }
-
-    public void setAttributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-    }
-
-    public TraitBaseClass entity(String entity) {
-        this.entity = entity;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entity
-     **/
-    @Schema(example = "Stalk", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public String getEntity() {
-        return entity;
-    }
-
-    public void setEntity(String entity) {
-        this.entity = entity;
-    }
-
-    public TraitBaseClass entityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A Trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the Entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entityPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PATO:00098765", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A Trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the Entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public String getEntityPUI() {
-        return entityPUI;
-    }
-
-    public void setEntityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-    }
-
-    public TraitBaseClass externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public TraitBaseClass addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public TraitBaseClass mainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Trait
-     *
-     * @return mainAbbreviation
-     **/
-    @Schema(example = "PH", description = "A shortened version of the human readable name for a Trait")
-    public String getMainAbbreviation() {
-        return mainAbbreviation;
-    }
-
-    public void setMainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-    }
-
-    public TraitBaseClass ontologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeMethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public TraitBaseClass status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Trait status (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Trait status (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public TraitBaseClass synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public TraitBaseClass addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other trait names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Height\",\"Plant Height\",\"Stalk Height\",\"Canopy Height\"]", description = "Other trait names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public TraitBaseClass traitClass(String traitClass) {
-        this.traitClass = traitClass;
-        return this;
-    }
-
-    /**
-     * A classification to describe the type of trait and the context it should be considered in. &lt;br/&gt; examples- \&quot;morphological\&quot;, \&quot;phenological\&quot;, \&quot;agronomical\&quot;, \&quot;physiological\&quot;, \&quot;abiotic stress\&quot;, \&quot;biotic stress\&quot;, \&quot;biochemical\&quot;, \&quot;quality traits\&quot;, \&quot;fertility\&quot;, etc.
-     *
-     * @return traitClass
-     **/
-    @Schema(example = "phenological", description = "A classification to describe the type of trait and the context it should be considered in. <br/> examples- \"morphological\", \"phenological\", \"agronomical\", \"physiological\", \"abiotic stress\", \"biotic stress\", \"biochemical\", \"quality traits\", \"fertility\", etc.")
-    public String getTraitClass() {
-        return traitClass;
-    }
-
-    public void setTraitClass(String traitClass) {
-        this.traitClass = traitClass;
-    }
-
-    public TraitBaseClass traitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-        return this;
-    }
-
-    /**
-     * The description of a trait
-     *
-     * @return traitDescription
-     **/
-    @Schema(example = "The height of the plant", description = "The description of a trait")
-    public String getTraitDescription() {
-        return traitDescription;
-    }
-
-    public void setTraitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-    }
-
-    public TraitBaseClass traitName(String traitName) {
-        this.traitName = traitName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitName
-     **/
-    @Schema(example = "Height", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public String getTraitName() {
-        return traitName;
-    }
-
-    public void setTraitName(String traitName) {
-        this.traitName = traitName;
-    }
-
-    public TraitBaseClass traitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000012", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public String getTraitPUI() {
-        return traitPUI;
-    }
-
-    public void setTraitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TraitBaseClass traitBaseClass = (TraitBaseClass) o;
-        return Objects.equals(this.additionalInfo, traitBaseClass.additionalInfo) &&
-                Objects.equals(this.alternativeAbbreviations, traitBaseClass.alternativeAbbreviations) &&
-                Objects.equals(this.attribute, traitBaseClass.attribute) &&
-                Objects.equals(this.attributePUI, traitBaseClass.attributePUI) &&
-                Objects.equals(this.entity, traitBaseClass.entity) &&
-                Objects.equals(this.entityPUI, traitBaseClass.entityPUI) &&
-                Objects.equals(this.externalReferences, traitBaseClass.externalReferences) &&
-                Objects.equals(this.mainAbbreviation, traitBaseClass.mainAbbreviation) &&
-                Objects.equals(this.ontologyReference, traitBaseClass.ontologyReference) &&
-                Objects.equals(this.status, traitBaseClass.status) &&
-                Objects.equals(this.synonyms, traitBaseClass.synonyms) &&
-                Objects.equals(this.traitClass, traitBaseClass.traitClass) &&
-                Objects.equals(this.traitDescription, traitBaseClass.traitDescription) &&
-                Objects.equals(this.traitName, traitBaseClass.traitName) &&
-                Objects.equals(this.traitPUI, traitBaseClass.traitPUI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, alternativeAbbreviations, attribute, attributePUI, entity, entityPUI, externalReferences, mainAbbreviation, ontologyReference, status, synonyms, traitClass, traitDescription, traitName, traitPUI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TraitBaseClass {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    alternativeAbbreviations: ").append(toIndentedString(alternativeAbbreviations)).append("\n");
-        sb.append("    attribute: ").append(toIndentedString(attribute)).append("\n");
-        sb.append("    attributePUI: ").append(toIndentedString(attributePUI)).append("\n");
-        sb.append("    entity: ").append(toIndentedString(entity)).append("\n");
-        sb.append("    entityPUI: ").append(toIndentedString(entityPUI)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    mainAbbreviation: ").append(toIndentedString(mainAbbreviation)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    traitClass: ").append(toIndentedString(traitClass)).append("\n");
-        sb.append("    traitDescription: ").append(toIndentedString(traitDescription)).append("\n");
-        sb.append("    traitName: ").append(toIndentedString(traitName)).append("\n");
-        sb.append("    traitPUI: ").append(toIndentedString(traitPUI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/TraitDataType.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/TraitDataType.java
deleted file mode 100644
index 10f5c585..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/TraitDataType.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-/**
- * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
- */
-@JsonAdapter(TraitDataType.Adapter.class)
-public enum TraitDataType {
-    CODE("Code"),
-    DATE("Date"),
-    DURATION("Duration"),
-    NOMINAL("Nominal"),
-    NUMERICAL("Numerical"),
-    ORDINAL("Ordinal"),
-    TEXT("Text");
-
-    private final String value;
-
-    TraitDataType(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    public static TraitDataType fromValue(String input) {
-        for (TraitDataType b : TraitDataType.values()) {
-            if (b.value.equals(input)) {
-                return b;
-            }
-        }
-        return null;
-    }
-
-    public static class Adapter extends TypeAdapter<TraitDataType> {
-        @Override
-        public void write(final JsonWriter jsonWriter, final TraitDataType enumeration) throws IOException {
-            jsonWriter.value(String.valueOf(enumeration.getValue()));
-        }
-
-        @Override
-        public TraitDataType read(final JsonReader jsonReader) throws IOException {
-            Object value = jsonReader.nextString();
-            return TraitDataType.fromValue((String) (value));
-        }
-    }
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/VariableBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/VariableBaseClass.java
deleted file mode 100644
index 846a159d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/germplasm/VariableBaseClass.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- * BrAPI-Germplasm
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.germplasm;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * VariableBaseClass
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:45:22.672Z[GMT]")
-public class VariableBaseClass {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("contextOfUse")
-    private List<String> contextOfUse = null;
-
-    @SerializedName("defaultValue")
-    private String defaultValue = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("externalReferences")
-    private List<CrossExternalReferences> externalReferences = null;
-
-    @SerializedName("growthStage")
-    private String growthStage = null;
-
-    @SerializedName("institution")
-    private String institution = null;
-
-    @SerializedName("language")
-    private String language = null;
-
-    @SerializedName("method")
-    private GermplasmAttributeMethod method = null;
-
-    @SerializedName("ontologyReference")
-    private GermplasmAttributeMethodOntologyReference ontologyReference = null;
-
-    @SerializedName("scale")
-    private GermplasmAttributeScale scale = null;
-
-    @SerializedName("scientist")
-    private String scientist = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("submissionTimestamp")
-    private OffsetDateTime submissionTimestamp = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("trait")
-    private GermplasmAttributeTrait trait = null;
-
-    public VariableBaseClass additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public VariableBaseClass putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public VariableBaseClass commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Crop name (examples: \&quot;Maize\&quot;, \&quot;Wheat\&quot;)
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Maize", description = "Crop name (examples: \"Maize\", \"Wheat\")")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public VariableBaseClass contextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-        return this;
-    }
-
-    public VariableBaseClass addContextOfUseItem(String contextOfUseItem) {
-        if (this.contextOfUse == null) {
-            this.contextOfUse = new ArrayList<String>();
-        }
-        this.contextOfUse.add(contextOfUseItem);
-        return this;
-    }
-
-    /**
-     * Indication of how trait is routinely used. (examples: [\&quot;Trial evaluation\&quot;, \&quot;Nursery evaluation\&quot;])
-     *
-     * @return contextOfUse
-     **/
-    @Schema(example = "[\"Trial evaluation\",\"Nursery evaluation\"]", description = "Indication of how trait is routinely used. (examples: [\"Trial evaluation\", \"Nursery evaluation\"])")
-    public List<String> getContextOfUse() {
-        return contextOfUse;
-    }
-
-    public void setContextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-    }
-
-    public VariableBaseClass defaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-        return this;
-    }
-
-    /**
-     * Variable default value. (examples: \&quot;red\&quot;, \&quot;2.3\&quot;, etc.)
-     *
-     * @return defaultValue
-     **/
-    @Schema(example = "2.0", description = "Variable default value. (examples: \"red\", \"2.3\", etc.)")
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    public void setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    public VariableBaseClass documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/documentation.html", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public VariableBaseClass externalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public VariableBaseClass addExternalReferencesItem(CrossExternalReferences externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<CrossExternalReferences>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<CrossExternalReferences> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<CrossExternalReferences> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public VariableBaseClass growthStage(String growthStage) {
-        this.growthStage = growthStage;
-        return this;
-    }
-
-    /**
-     * Growth stage at which measurement is made (examples: \&quot;flowering\&quot;)
-     *
-     * @return growthStage
-     **/
-    @Schema(example = "flowering", description = "Growth stage at which measurement is made (examples: \"flowering\")")
-    public String getGrowthStage() {
-        return growthStage;
-    }
-
-    public void setGrowthStage(String growthStage) {
-        this.growthStage = growthStage;
-    }
-
-    public VariableBaseClass institution(String institution) {
-        this.institution = institution;
-        return this;
-    }
-
-    /**
-     * Name of institution submitting the variable
-     *
-     * @return institution
-     **/
-    @Schema(example = "The BrAPI Institute", description = "Name of institution submitting the variable")
-    public String getInstitution() {
-        return institution;
-    }
-
-    public void setInstitution(String institution) {
-        this.institution = institution;
-    }
-
-    public VariableBaseClass language(String language) {
-        this.language = language;
-        return this;
-    }
-
-    /**
-     * 2 letter ISO 639-1 code for the language of submission of the variable.
-     *
-     * @return language
-     **/
-    @Schema(example = "en", description = "2 letter ISO 639-1 code for the language of submission of the variable.")
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public VariableBaseClass method(GermplasmAttributeMethod method) {
-        this.method = method;
-        return this;
-    }
-
-    /**
-     * Get method
-     *
-     * @return method
-     **/
-    @Schema(required = true, description = "")
-    public GermplasmAttributeMethod getMethod() {
-        return method;
-    }
-
-    public void setMethod(GermplasmAttributeMethod method) {
-        this.method = method;
-    }
-
-    public VariableBaseClass ontologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public GermplasmAttributeMethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(GermplasmAttributeMethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public VariableBaseClass scale(GermplasmAttributeScale scale) {
-        this.scale = scale;
-        return this;
-    }
-
-    /**
-     * Get scale
-     *
-     * @return scale
-     **/
-    @Schema(required = true, description = "")
-    public GermplasmAttributeScale getScale() {
-        return scale;
-    }
-
-    public void setScale(GermplasmAttributeScale scale) {
-        this.scale = scale;
-    }
-
-    public VariableBaseClass scientist(String scientist) {
-        this.scientist = scientist;
-        return this;
-    }
-
-    /**
-     * Name of scientist submitting the variable.
-     *
-     * @return scientist
-     **/
-    @Schema(example = "Dr. Bob Robertson", description = "Name of scientist submitting the variable.")
-    public String getScientist() {
-        return scientist;
-    }
-
-    public void setScientist(String scientist) {
-        this.scientist = scientist;
-    }
-
-    public VariableBaseClass status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Variable status. (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Variable status. (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public VariableBaseClass submissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-        return this;
-    }
-
-    /**
-     * Timestamp when the Variable was added (ISO 8601)
-     *
-     * @return submissionTimestamp
-     **/
-    @Schema(description = "Timestamp when the Variable was added (ISO 8601)")
-    public OffsetDateTime getSubmissionTimestamp() {
-        return submissionTimestamp;
-    }
-
-    public void setSubmissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-    }
-
-    public VariableBaseClass synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public VariableBaseClass addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other variable names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Maize Height\",\"Stalk Height\",\"Corn Height\"]", description = "Other variable names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public VariableBaseClass trait(GermplasmAttributeTrait trait) {
-        this.trait = trait;
-        return this;
-    }
-
-    /**
-     * Get trait
-     *
-     * @return trait
-     **/
-    @Schema(required = true, description = "")
-    public GermplasmAttributeTrait getTrait() {
-        return trait;
-    }
-
-    public void setTrait(GermplasmAttributeTrait trait) {
-        this.trait = trait;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariableBaseClass variableBaseClass = (VariableBaseClass) o;
-        return Objects.equals(this.additionalInfo, variableBaseClass.additionalInfo) &&
-                Objects.equals(this.commonCropName, variableBaseClass.commonCropName) &&
-                Objects.equals(this.contextOfUse, variableBaseClass.contextOfUse) &&
-                Objects.equals(this.defaultValue, variableBaseClass.defaultValue) &&
-                Objects.equals(this.documentationURL, variableBaseClass.documentationURL) &&
-                Objects.equals(this.externalReferences, variableBaseClass.externalReferences) &&
-                Objects.equals(this.growthStage, variableBaseClass.growthStage) &&
-                Objects.equals(this.institution, variableBaseClass.institution) &&
-                Objects.equals(this.language, variableBaseClass.language) &&
-                Objects.equals(this.method, variableBaseClass.method) &&
-                Objects.equals(this.ontologyReference, variableBaseClass.ontologyReference) &&
-                Objects.equals(this.scale, variableBaseClass.scale) &&
-                Objects.equals(this.scientist, variableBaseClass.scientist) &&
-                Objects.equals(this.status, variableBaseClass.status) &&
-                Objects.equals(this.submissionTimestamp, variableBaseClass.submissionTimestamp) &&
-                Objects.equals(this.synonyms, variableBaseClass.synonyms) &&
-                Objects.equals(this.trait, variableBaseClass.trait);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, commonCropName, contextOfUse, defaultValue, documentationURL, externalReferences, growthStage, institution, language, method, ontologyReference, scale, scientist, status, submissionTimestamp, synonyms, trait);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariableBaseClass {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    contextOfUse: ").append(toIndentedString(contextOfUse)).append("\n");
-        sb.append("    defaultValue: ").append(toIndentedString(defaultValue)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    growthStage: ").append(toIndentedString(growthStage)).append("\n");
-        sb.append("    institution: ").append(toIndentedString(institution)).append("\n");
-        sb.append("    language: ").append(toIndentedString(language)).append("\n");
-        sb.append("    method: ").append(toIndentedString(method)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scale: ").append(toIndentedString(scale)).append("\n");
-        sb.append("    scientist: ").append(toIndentedString(scientist)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    submissionTimestamp: ").append(toIndentedString(submissionTimestamp)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    trait: ").append(toIndentedString(trait)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/BasePagination.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/BasePagination.java
deleted file mode 100644
index 44686e83..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/BasePagination.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * The pagination object is applicable only when the payload contains a \&quot;data\&quot; key. It describes the pagination of the data contained in the \&quot;data\&quot; array, as a way to identify which subset of data is being returned.  &lt;br&gt; Pages are zero indexed, so the first page will be page 0 (zero).
- */
-@Schema(description = "The pagination object is applicable only when the payload contains a \"data\" key. It describes the pagination of the data contained in the \"data\" array, as a way to identify which subset of data is being returned.  <br> Pages are zero indexed, so the first page will be page 0 (zero).")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class BasePagination {
-    @SerializedName("currentPage")
-    private Integer currentPage = 0;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = 1000;
-
-    @SerializedName("totalCount")
-    private Integer totalCount = null;
-
-    @SerializedName("totalPages")
-    private Integer totalPages = null;
-
-    public BasePagination currentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-        return this;
-    }
-
-    /**
-     * The index number for the returned page of data. This should always match the requested page number or the default page (0).
-     *
-     * @return currentPage
-     **/
-    @Schema(example = "0", required = true, description = "The index number for the returned page of data. This should always match the requested page number or the default page (0).")
-    public Integer getCurrentPage() {
-        return currentPage;
-    }
-
-    public void setCurrentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-    }
-
-    public BasePagination pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", required = true, description = "The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public BasePagination totalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-        return this;
-    }
-
-    /**
-     * The total number of elements that are available on the server and match the requested query parameters.
-     *
-     * @return totalCount
-     **/
-    @Schema(example = "10", description = "The total number of elements that are available on the server and match the requested query parameters.")
-    public Integer getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public BasePagination totalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-        return this;
-    }
-
-    /**
-     * The total number of pages of elements available on the server. This should be calculated with the following formula.  &lt;br&gt; totalPages &#x3D; CEILING( totalCount / requested_page_size)
-     *
-     * @return totalPages
-     **/
-    @Schema(example = "1", description = "The total number of pages of elements available on the server. This should be calculated with the following formula.  <br> totalPages = CEILING( totalCount / requested_page_size)")
-    public Integer getTotalPages() {
-        return totalPages;
-    }
-
-    public void setTotalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        BasePagination basePagination = (BasePagination) o;
-        return Objects.equals(this.currentPage, basePagination.currentPage) &&
-                Objects.equals(this.pageSize, basePagination.pageSize) &&
-                Objects.equals(this.totalCount, basePagination.totalCount) &&
-                Objects.equals(this.totalPages, basePagination.totalPages);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(currentPage, pageSize, totalCount, totalPages);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class BasePagination {\n");
-
-        sb.append("    currentPage: ").append(toIndentedString(currentPage)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    totalCount: ").append(toIndentedString(totalCount)).append("\n");
-        sb.append("    totalPages: ").append(toIndentedString(totalPages)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ContentTypes.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ContentTypes.java
deleted file mode 100644
index 70df705b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ContentTypes.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-/**
- * Gets or Sets ContentTypes
- */
-@JsonAdapter(ContentTypes.Adapter.class)
-public enum ContentTypes {
-    APPLICATION_JSON("application/json"),
-    TEXT_CSV("text/csv"),
-    TEXT_TSV("text/tsv"),
-    APPLICATION_FLAPJACK("application/flapjack");
-
-    private final String value;
-
-    ContentTypes(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    public static ContentTypes fromValue(String input) {
-        for (ContentTypes b : ContentTypes.values()) {
-            if (b.value.equals(input)) {
-                return b;
-            }
-        }
-        return null;
-    }
-
-    public static class Adapter extends TypeAdapter<ContentTypes> {
-        @Override
-        public void write(final JsonWriter jsonWriter, final ContentTypes enumeration) throws IOException {
-            jsonWriter.value(String.valueOf(enumeration.getValue()));
-        }
-
-        @Override
-        public ContentTypes read(final JsonReader jsonReader) throws IOException {
-            Object value = jsonReader.nextString();
-            return ContentTypes.fromValue((String) (value));
-        }
-    }
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Context.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Context.java
deleted file mode 100644
index 89f64790..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Context.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.Objects;
-
-/**
- * The JSON-LD Context is used to provide JSON-LD definitions to each field in a JSON object. By providing an array of context file urls, a BrAPI response object becomes JSON-LD compatible.    For more information, see https://w3c.github.io/json-ld-syntax/#the-context
- */
-@Schema(description = "The JSON-LD Context is used to provide JSON-LD definitions to each field in a JSON object. By providing an array of context file urls, a BrAPI response object becomes JSON-LD compatible.    For more information, see https://w3c.github.io/json-ld-syntax/#the-context")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Context extends ArrayList<String> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Context {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/DataFile.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/DataFile.java
deleted file mode 100644
index 5e77a2a5..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/DataFile.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * A dataFile contains a URL and the relevant file metadata to represent a file
- */
-@Schema(description = "A dataFile contains a URL and the relevant file metadata to represent a file")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class DataFile {
-    @SerializedName("fileDescription")
-    private String fileDescription = null;
-
-    @SerializedName("fileMD5Hash")
-    private String fileMD5Hash = null;
-
-    @SerializedName("fileName")
-    private String fileName = null;
-
-    @SerializedName("fileSize")
-    private Integer fileSize = null;
-
-    @SerializedName("fileType")
-    private String fileType = null;
-
-    @SerializedName("fileURL")
-    private String fileURL = null;
-
-    public DataFile fileDescription(String fileDescription) {
-        this.fileDescription = fileDescription;
-        return this;
-    }
-
-    /**
-     * A human readable description of the file contents
-     *
-     * @return fileDescription
-     **/
-    @Schema(example = "This is an Excel data file", description = "A human readable description of the file contents")
-    public String getFileDescription() {
-        return fileDescription;
-    }
-
-    public void setFileDescription(String fileDescription) {
-        this.fileDescription = fileDescription;
-    }
-
-    public DataFile fileMD5Hash(String fileMD5Hash) {
-        this.fileMD5Hash = fileMD5Hash;
-        return this;
-    }
-
-    /**
-     * The MD5 Hash of the file contents to be used as a check sum
-     *
-     * @return fileMD5Hash
-     **/
-    @Schema(example = "c2365e900c81a89cf74d83dab60df146", description = "The MD5 Hash of the file contents to be used as a check sum")
-    public String getFileMD5Hash() {
-        return fileMD5Hash;
-    }
-
-    public void setFileMD5Hash(String fileMD5Hash) {
-        this.fileMD5Hash = fileMD5Hash;
-    }
-
-    public DataFile fileName(String fileName) {
-        this.fileName = fileName;
-        return this;
-    }
-
-    /**
-     * The name of the file
-     *
-     * @return fileName
-     **/
-    @Schema(example = "datafile.xlsx", description = "The name of the file")
-    public String getFileName() {
-        return fileName;
-    }
-
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
-    public DataFile fileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-        return this;
-    }
-
-    /**
-     * The size of the file in bytes
-     *
-     * @return fileSize
-     **/
-    @Schema(example = "4398", description = "The size of the file in bytes")
-    public Integer getFileSize() {
-        return fileSize;
-    }
-
-    public void setFileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-    }
-
-    public DataFile fileType(String fileType) {
-        this.fileType = fileType;
-        return this;
-    }
-
-    /**
-     * The type or format of the file. Preferably MIME Type.
-     *
-     * @return fileType
-     **/
-    @Schema(example = "application/vnd.ms-excel", description = "The type or format of the file. Preferably MIME Type.")
-    public String getFileType() {
-        return fileType;
-    }
-
-    public void setFileType(String fileType) {
-        this.fileType = fileType;
-    }
-
-    public DataFile fileURL(String fileURL) {
-        this.fileURL = fileURL;
-        return this;
-    }
-
-    /**
-     * The absolute URL where the file is located
-     *
-     * @return fileURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/examples/datafile.xlsx", required = true, description = "The absolute URL where the file is located")
-    public String getFileURL() {
-        return fileURL;
-    }
-
-    public void setFileURL(String fileURL) {
-        this.fileURL = fileURL;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        DataFile dataFile = (DataFile) o;
-        return Objects.equals(this.fileDescription, dataFile.fileDescription) &&
-                Objects.equals(this.fileMD5Hash, dataFile.fileMD5Hash) &&
-                Objects.equals(this.fileName, dataFile.fileName) &&
-                Objects.equals(this.fileSize, dataFile.fileSize) &&
-                Objects.equals(this.fileType, dataFile.fileType) &&
-                Objects.equals(this.fileURL, dataFile.fileURL);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(fileDescription, fileMD5Hash, fileName, fileSize, fileType, fileURL);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class DataFile {\n");
-
-        sb.append("    fileDescription: ").append(toIndentedString(fileDescription)).append("\n");
-        sb.append("    fileMD5Hash: ").append(toIndentedString(fileMD5Hash)).append("\n");
-        sb.append("    fileName: ").append(toIndentedString(fileName)).append("\n");
-        sb.append("    fileSize: ").append(toIndentedString(fileSize)).append("\n");
-        sb.append("    fileType: ").append(toIndentedString(fileType)).append("\n");
-        sb.append("    fileURL: ").append(toIndentedString(fileURL)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Event.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Event.java
deleted file mode 100644
index 5fc0ce9e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Event.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * Event
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Event {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("date")
-    private List<OffsetDateTime> date = null;
-
-    @SerializedName("eventDateRange")
-    private EventEventDateRange eventDateRange = null;
-
-    @SerializedName("eventDbId")
-    private String eventDbId = null;
-
-    @SerializedName("eventDescription")
-    private String eventDescription = null;
-
-    @SerializedName("eventParameters")
-    private List<EventEventParameters> eventParameters = null;
-
-    @SerializedName("eventType")
-    private String eventType = null;
-
-    @SerializedName("eventTypeDbId")
-    private String eventTypeDbId = null;
-
-    @SerializedName("observationUnitDbIds")
-    private List<String> observationUnitDbIds = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("studyName")
-    private String studyName = null;
-
-    public Event additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Event putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Event date(List<OffsetDateTime> date) {
-        this.date = date;
-        return this;
-    }
-
-    public Event addDateItem(OffsetDateTime dateItem) {
-        if (this.date == null) {
-            this.date = new ArrayList<OffsetDateTime>();
-        }
-        this.date.add(dateItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;eventDateRange.discreteDates&#x60;. Github issue number #440              &lt;br&gt;A list of dates when the event occurred &lt;br&gt;MIAPPE V1.1 (DM-68) Event date - Date and time of the event.
-     *
-     * @return date
-     **/
-    @Schema(example = "[\"2018-10-08T18:15:11Z\",\"2018-11-09T18:16:12Z\"]", description = "**Deprecated in v2.1** Please use `eventDateRange.discreteDates`. Github issue number #440              <br>A list of dates when the event occurred <br>MIAPPE V1.1 (DM-68) Event date - Date and time of the event.")
-    public List<OffsetDateTime> getDate() {
-        return date;
-    }
-
-    public void setDate(List<OffsetDateTime> date) {
-        this.date = date;
-    }
-
-    public Event eventDateRange(EventEventDateRange eventDateRange) {
-        this.eventDateRange = eventDateRange;
-        return this;
-    }
-
-    /**
-     * Get eventDateRange
-     *
-     * @return eventDateRange
-     **/
-    @Schema(description = "")
-    public EventEventDateRange getEventDateRange() {
-        return eventDateRange;
-    }
-
-    public void setEventDateRange(EventEventDateRange eventDateRange) {
-        this.eventDateRange = eventDateRange;
-    }
-
-    public Event eventDbId(String eventDbId) {
-        this.eventDbId = eventDbId;
-        return this;
-    }
-
-    /**
-     * Internal database identifier
-     *
-     * @return eventDbId
-     **/
-    @Schema(example = "8566d4cb", required = true, description = "Internal database identifier")
-    public String getEventDbId() {
-        return eventDbId;
-    }
-
-    public void setEventDbId(String eventDbId) {
-        this.eventDbId = eventDbId;
-    }
-
-    public Event eventDescription(String eventDescription) {
-        this.eventDescription = eventDescription;
-        return this;
-    }
-
-    /**
-     * A detailed, human-readable description of this event &lt;br/&gt;MIAPPE V1.1 (DM-67) Event description - Description of the event, including details such as amount applied and possibly duration of the event.
-     *
-     * @return eventDescription
-     **/
-    @Schema(example = "A set of plots was watered", description = "A detailed, human-readable description of this event <br/>MIAPPE V1.1 (DM-67) Event description - Description of the event, including details such as amount applied and possibly duration of the event. ")
-    public String getEventDescription() {
-        return eventDescription;
-    }
-
-    public void setEventDescription(String eventDescription) {
-        this.eventDescription = eventDescription;
-    }
-
-    public Event eventParameters(List<EventEventParameters> eventParameters) {
-        this.eventParameters = eventParameters;
-        return this;
-    }
-
-    public Event addEventParametersItem(EventEventParameters eventParametersItem) {
-        if (this.eventParameters == null) {
-            this.eventParameters = new ArrayList<EventEventParameters>();
-        }
-        this.eventParameters.add(eventParametersItem);
-        return this;
-    }
-
-    /**
-     * A list of objects describing additional event parameters. Each of the following accepts a human-readable value or URI
-     *
-     * @return eventParameters
-     **/
-    @Schema(example = "[{\"code\":\"tiimp\",\"description\":\"Implement or tool used for tillage\",\"name\":\"tillage_implement\",\"unit\":\"code\",\"value\":\"TI001\",\"valueDescription\":\"Standard V-Ripper (TI001)\"},{\"code\":\"tidep\",\"description\":\"Tillage operations depth in centimeters\",\"name\":\"tillage_operations_depth\",\"unit\":\"cm\",\"valuesByDate\":[\"20\",\"50\",\"40\"]},{\"code\":\"timix\",\"description\":\"Tillage operations mixing effectiveness\",\"name\":\"till_mix_effectiveness\",\"unit\":\"percent\",\"value\":\"50\"}]", description = "A list of objects describing additional event parameters. Each of the following accepts a human-readable value or URI")
-    public List<EventEventParameters> getEventParameters() {
-        return eventParameters;
-    }
-
-    public void setEventParameters(List<EventEventParameters> eventParameters) {
-        this.eventParameters = eventParameters;
-    }
-
-    public Event eventType(String eventType) {
-        this.eventType = eventType;
-        return this;
-    }
-
-    /**
-     * General category for this event (e.g. fertilizer, irrigation, tillage). Each eventType should correspond to exactly one eventTypeDbId, if provided. &lt;br/&gt;ICASA Management events allow for the following types: planting, fertilizer, irrigation, tillage, organic_material, harvest, bed_prep, inorg_mulch, inorg_mul_rem, chemicals, mowing, observation, weeding, puddling, flood_level, other &lt;br/&gt;MIAPPE V1.1 (DM-65) Event type - Short name of the event.
-     *
-     * @return eventType
-     **/
-    @Schema(example = "tillage", required = true, description = "General category for this event (e.g. fertilizer, irrigation, tillage). Each eventType should correspond to exactly one eventTypeDbId, if provided. <br/>ICASA Management events allow for the following types: planting, fertilizer, irrigation, tillage, organic_material, harvest, bed_prep, inorg_mulch, inorg_mul_rem, chemicals, mowing, observation, weeding, puddling, flood_level, other <br/>MIAPPE V1.1 (DM-65) Event type - Short name of the event.")
-    public String getEventType() {
-        return eventType;
-    }
-
-    public void setEventType(String eventType) {
-        this.eventType = eventType;
-    }
-
-    public Event eventTypeDbId(String eventTypeDbId) {
-        this.eventTypeDbId = eventTypeDbId;
-        return this;
-    }
-
-    /**
-     * An identifier for this event type, in the form of an ontology class reference &lt;br/&gt;ICASA Management events allow for the following types: planting, fertilizer, irrigation, tillage, organic_material, harvest, bed_prep, inorg_mulch, inorg_mul_rem, chemicals, mowing, observation, weeding, puddling, flood_level, other &lt;br/&gt;MIAPPE V1.1 (DM-66) Event accession number - Accession number of the event type in a suitable controlled vocabulary (Crop Ontology).
-     *
-     * @return eventTypeDbId
-     **/
-    @Schema(example = "4e7d691e", description = "An identifier for this event type, in the form of an ontology class reference <br/>ICASA Management events allow for the following types: planting, fertilizer, irrigation, tillage, organic_material, harvest, bed_prep, inorg_mulch, inorg_mul_rem, chemicals, mowing, observation, weeding, puddling, flood_level, other <br/>MIAPPE V1.1 (DM-66) Event accession number - Accession number of the event type in a suitable controlled vocabulary (Crop Ontology).")
-    public String getEventTypeDbId() {
-        return eventTypeDbId;
-    }
-
-    public void setEventTypeDbId(String eventTypeDbId) {
-        this.eventTypeDbId = eventTypeDbId;
-    }
-
-    public Event observationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-        return this;
-    }
-
-    public Event addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-        if (this.observationUnitDbIds == null) {
-            this.observationUnitDbIds = new ArrayList<String>();
-        }
-        this.observationUnitDbIds.add(observationUnitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of the affected observation units. If this parameter is not given, it is understood that the event affected all units in the study
-     *
-     * @return observationUnitDbIds
-     **/
-    @Schema(example = "[\"8439eaff\",\"d7682e7a\",\"305ae51c\"]", description = "A list of the affected observation units. If this parameter is not given, it is understood that the event affected all units in the study")
-    public List<String> getObservationUnitDbIds() {
-        return observationUnitDbIds;
-    }
-
-    public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-    }
-
-    public Event studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The study in which the event occurred
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "2cc2001f", description = "The study in which the event occurred")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public Event studyName(String studyName) {
-        this.studyName = studyName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a study
-     *
-     * @return studyName
-     **/
-    @Schema(example = "2cc2001f", description = "The human readable name of a study")
-    public String getStudyName() {
-        return studyName;
-    }
-
-    public void setStudyName(String studyName) {
-        this.studyName = studyName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Event event = (Event) o;
-        return Objects.equals(this.additionalInfo, event.additionalInfo) &&
-                Objects.equals(this.date, event.date) &&
-                Objects.equals(this.eventDateRange, event.eventDateRange) &&
-                Objects.equals(this.eventDbId, event.eventDbId) &&
-                Objects.equals(this.eventDescription, event.eventDescription) &&
-                Objects.equals(this.eventParameters, event.eventParameters) &&
-                Objects.equals(this.eventType, event.eventType) &&
-                Objects.equals(this.eventTypeDbId, event.eventTypeDbId) &&
-                Objects.equals(this.observationUnitDbIds, event.observationUnitDbIds) &&
-                Objects.equals(this.studyDbId, event.studyDbId) &&
-                Objects.equals(this.studyName, event.studyName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, date, eventDateRange, eventDbId, eventDescription, eventParameters, eventType, eventTypeDbId, observationUnitDbIds, studyDbId, studyName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Event {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    date: ").append(toIndentedString(date)).append("\n");
-        sb.append("    eventDateRange: ").append(toIndentedString(eventDateRange)).append("\n");
-        sb.append("    eventDbId: ").append(toIndentedString(eventDbId)).append("\n");
-        sb.append("    eventDescription: ").append(toIndentedString(eventDescription)).append("\n");
-        sb.append("    eventParameters: ").append(toIndentedString(eventParameters)).append("\n");
-        sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-        sb.append("    eventTypeDbId: ").append(toIndentedString(eventTypeDbId)).append("\n");
-        sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    studyName: ").append(toIndentedString(studyName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/EventEventDateRange.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/EventEventDateRange.java
deleted file mode 100644
index 1a29dd71..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/EventEventDateRange.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An object describing when a particular Event has taken place. An Event can occur at one or more discrete time points (&#x60;discreteDates&#x60;) or an event can happen continuosly over a longer peroid of time (&#x60;startDate&#x60;, &#x60;endDate&#x60;)
- */
-@Schema(description = "An object describing when a particular Event has taken place. An Event can occur at one or more discrete time points (`discreteDates`) or an event can happen continuosly over a longer peroid of time (`startDate`, `endDate`)")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class EventEventDateRange {
-    @SerializedName("discreteDates")
-    private List<OffsetDateTime> discreteDates = null;
-
-    @SerializedName("endDate")
-    private OffsetDateTime endDate = null;
-
-    @SerializedName("startDate")
-    private OffsetDateTime startDate = null;
-
-    public EventEventDateRange discreteDates(List<OffsetDateTime> discreteDates) {
-        this.discreteDates = discreteDates;
-        return this;
-    }
-
-    public EventEventDateRange addDiscreteDatesItem(OffsetDateTime discreteDatesItem) {
-        if (this.discreteDates == null) {
-            this.discreteDates = new ArrayList<OffsetDateTime>();
-        }
-        this.discreteDates.add(discreteDatesItem);
-        return this;
-    }
-
-    /**
-     * A list of dates when the event occurred &lt;br/&gt;MIAPPE V1.1 (DM-68) Event date - Date and time of the event.
-     *
-     * @return discreteDates
-     **/
-    @Schema(example = "[\"2018-10-08T18:15:11Z\",\"2018-11-09T18:16:12Z\",\"2018-11-19T18:16:12Z\"]", description = "A list of dates when the event occurred <br/>MIAPPE V1.1 (DM-68) Event date - Date and time of the event.")
-    public List<OffsetDateTime> getDiscreteDates() {
-        return discreteDates;
-    }
-
-    public void setDiscreteDates(List<OffsetDateTime> discreteDates) {
-        this.discreteDates = discreteDates;
-    }
-
-    public EventEventDateRange endDate(OffsetDateTime endDate) {
-        this.endDate = endDate;
-        return this;
-    }
-
-    /**
-     * The end of a continous or regularly repetitive event &lt;br/&gt;MIAPPE V1.1 (DM-68) Event date - Date and time of the event.
-     *
-     * @return endDate
-     **/
-    @Schema(example = "2018-10-08T18:15:11Z", description = "The end of a continous or regularly repetitive event <br/>MIAPPE V1.1 (DM-68) Event date - Date and time of the event.")
-    public OffsetDateTime getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(OffsetDateTime endDate) {
-        this.endDate = endDate;
-    }
-
-    public EventEventDateRange startDate(OffsetDateTime startDate) {
-        this.startDate = startDate;
-        return this;
-    }
-
-    /**
-     * The begining of a continous or regularly repetitive event &lt;br/&gt;MIAPPE V1.1 (DM-68) Event date - Date and time of the event.
-     *
-     * @return startDate
-     **/
-    @Schema(example = "2018-10-08T18:15:11Z", description = "The begining of a continous or regularly repetitive event <br/>MIAPPE V1.1 (DM-68) Event date - Date and time of the event.")
-    public OffsetDateTime getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(OffsetDateTime startDate) {
-        this.startDate = startDate;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        EventEventDateRange eventEventDateRange = (EventEventDateRange) o;
-        return Objects.equals(this.discreteDates, eventEventDateRange.discreteDates) &&
-                Objects.equals(this.endDate, eventEventDateRange.endDate) &&
-                Objects.equals(this.startDate, eventEventDateRange.startDate);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(discreteDates, endDate, startDate);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class EventEventDateRange {\n");
-
-        sb.append("    discreteDates: ").append(toIndentedString(discreteDates)).append("\n");
-        sb.append("    endDate: ").append(toIndentedString(endDate)).append("\n");
-        sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/EventEventParameters.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/EventEventParameters.java
deleted file mode 100644
index bf0069b4..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/EventEventParameters.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * EventEventParameters
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class EventEventParameters {
-    @SerializedName("code")
-    private String code = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("key")
-    private String key = null;
-
-    @SerializedName("name")
-    private String name = null;
-
-    @SerializedName("rdfValue")
-    private String rdfValue = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    @SerializedName("valueDescription")
-    private String valueDescription = null;
-
-    @SerializedName("valuesByDate")
-    private List<String> valuesByDate = null;
-
-    public EventEventParameters code(String code) {
-        this.code = code;
-        return this;
-    }
-
-    /**
-     * The shortened code name of an event parameter &lt;br&gt;ICASA \&quot;Code_Display\&quot;
-     *
-     * @return code
-     **/
-    @Schema(example = "tiimp", description = "The shortened code name of an event parameter <br>ICASA \"Code_Display\"")
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public EventEventParameters description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * A human readable description of this event parameter. This description is usually associated with the &#x27;name&#x27; and &#x27;code&#x27; of an event parameter.
-     *
-     * @return description
-     **/
-    @Schema(example = "Implement or tool used for tillage", description = "A human readable description of this event parameter. This description is usually associated with the 'name' and 'code' of an event parameter.")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public EventEventParameters key(String key) {
-        this.key = key;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;name&#x60;. Github issue number #440              &lt;br&gt;Specifies the relationship between the event and the given property. E.g. fertilizer, operator
-     *
-     * @return key
-     **/
-    @Schema(example = "operator", description = "**Deprecated in v2.1** Please use `name`. Github issue number #440              <br>Specifies the relationship between the event and the given property. E.g. fertilizer, operator")
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public EventEventParameters name(String name) {
-        this.name = name;
-        return this;
-    }
-
-    /**
-     * The full name of an event parameter &lt;br&gt;ICASA \&quot;Variable_Name\&quot;
-     *
-     * @return name
-     **/
-    @Schema(example = "tillage_implement", description = "The full name of an event parameter <br>ICASA \"Variable_Name\"")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public EventEventParameters rdfValue(String rdfValue) {
-        this.rdfValue = rdfValue;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;code&#x60;. Github issue number #440              &lt;brThe type of the value given above, e.g. http://xmlns.com/foaf/0.1/Agent
-     *
-     * @return rdfValue
-     **/
-    @Schema(example = "http://xmlns.com/foaf/0.1/Agent", description = "**Deprecated in v2.1** Please use `code`. Github issue number #440              <brThe type of the value given above, e.g. http://xmlns.com/foaf/0.1/Agent")
-    public String getRdfValue() {
-        return rdfValue;
-    }
-
-    public void setRdfValue(String rdfValue) {
-        this.rdfValue = rdfValue;
-    }
-
-    public EventEventParameters units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * The units or data type of the &#x27;value&#x27;.  &lt;br&gt;If the &#x27;value&#x27; comes from a standardized vocabulary or an encoded list of values, then &#x27;unit&#x27; should be &#x27;code&#x27;.  &lt;br&gt;If the &#x27;value&#x27; IS NOT a number, then &#x27;unit&#x27; should specify a data type eg. &#x27;text&#x27;, &#x27;boolean&#x27;, &#x27;date&#x27;, etc.  &lt;br&gt;If the value IS a number, then &#x27;unit&#x27; should specify the units used eg. &#x27;ml&#x27;, &#x27;cm&#x27;, etc &lt;br&gt;ICASA \&quot;Unit_or_type\&quot;
-     *
-     * @return units
-     **/
-    @Schema(example = "code", description = "The units or data type of the 'value'.  <br>If the 'value' comes from a standardized vocabulary or an encoded list of values, then 'unit' should be 'code'.  <br>If the 'value' IS NOT a number, then 'unit' should specify a data type eg. 'text', 'boolean', 'date', etc.  <br>If the value IS a number, then 'unit' should specify the units used eg. 'ml', 'cm', etc <br>ICASA \"Unit_or_type\"")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    public EventEventParameters value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * The single value of this event parameter. This single value is accurate for all the dates in the date range. If &#x27;value&#x27; is populated then &#x27;valuesByDate&#x27; should NOT be populated.
-     *
-     * @return value
-     **/
-    @Schema(example = "TI001", description = "The single value of this event parameter. This single value is accurate for all the dates in the date range. If 'value' is populated then 'valuesByDate' should NOT be populated.")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public EventEventParameters valueDescription(String valueDescription) {
-        this.valueDescription = valueDescription;
-        return this;
-    }
-
-    /**
-     * If the event parameter &#x27;unit&#x27; field is &#x27;code&#x27;, then use &#x27;valueDescription&#x27; to add a human readable description to the value.
-     *
-     * @return valueDescription
-     **/
-    @Schema(example = "Standard V-Ripper (TI001)", description = "If the event parameter 'unit' field is 'code', then use 'valueDescription' to add a human readable description to the value.")
-    public String getValueDescription() {
-        return valueDescription;
-    }
-
-    public void setValueDescription(String valueDescription) {
-        this.valueDescription = valueDescription;
-    }
-
-    public EventEventParameters valuesByDate(List<String> valuesByDate) {
-        this.valuesByDate = valuesByDate;
-        return this;
-    }
-
-    public EventEventParameters addValuesByDateItem(String valuesByDateItem) {
-        if (this.valuesByDate == null) {
-            this.valuesByDate = new ArrayList<String>();
-        }
-        this.valuesByDate.add(valuesByDateItem);
-        return this;
-    }
-
-    /**
-     * An array of values corresponding to each timestamp in the &#x27;discreteDates&#x27; array of this event. The &#x27;valuesByDate&#x27; array should exactly match the size of the &#x27;discreteDates&#x27; array. If &#x27;valuesByDate&#x27; is populated then &#x27;value&#x27; should NOT be populated.
-     *
-     * @return valuesByDate
-     **/
-    @Schema(example = "[\"20\",\"50\",\"40\"]", description = "An array of values corresponding to each timestamp in the 'discreteDates' array of this event. The 'valuesByDate' array should exactly match the size of the 'discreteDates' array. If 'valuesByDate' is populated then 'value' should NOT be populated.")
-    public List<String> getValuesByDate() {
-        return valuesByDate;
-    }
-
-    public void setValuesByDate(List<String> valuesByDate) {
-        this.valuesByDate = valuesByDate;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        EventEventParameters eventEventParameters = (EventEventParameters) o;
-        return Objects.equals(this.code, eventEventParameters.code) &&
-                Objects.equals(this.description, eventEventParameters.description) &&
-                Objects.equals(this.key, eventEventParameters.key) &&
-                Objects.equals(this.name, eventEventParameters.name) &&
-                Objects.equals(this.rdfValue, eventEventParameters.rdfValue) &&
-                Objects.equals(this.units, eventEventParameters.units) &&
-                Objects.equals(this.value, eventEventParameters.value) &&
-                Objects.equals(this.valueDescription, eventEventParameters.valueDescription) &&
-                Objects.equals(this.valuesByDate, eventEventParameters.valuesByDate);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(code, description, key, name, rdfValue, units, value, valueDescription, valuesByDate);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class EventEventParameters {\n");
-
-        sb.append("    code: ").append(toIndentedString(code)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    key: ").append(toIndentedString(key)).append("\n");
-        sb.append("    name: ").append(toIndentedString(name)).append("\n");
-        sb.append("    rdfValue: ").append(toIndentedString(rdfValue)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("    valueDescription: ").append(toIndentedString(valueDescription)).append("\n");
-        sb.append("    valuesByDate: ").append(toIndentedString(valuesByDate)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/EventsResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/EventsResponse.java
deleted file mode 100644
index 8effdbd9..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/EventsResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * EventsResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class EventsResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private EventsResponseResult result = null;
-
-    public EventsResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public EventsResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public EventsResponse result(EventsResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public EventsResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(EventsResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        EventsResponse eventsResponse = (EventsResponse) o;
-        return Objects.equals(this._atContext, eventsResponse._atContext) &&
-                Objects.equals(this.metadata, eventsResponse.metadata) &&
-                Objects.equals(this.result, eventsResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class EventsResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/EventsResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/EventsResponseResult.java
deleted file mode 100644
index a51487ce..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/EventsResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * EventsResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class EventsResponseResult {
-    @SerializedName("data")
-    private List<Event> data = new ArrayList<Event>();
-
-    public EventsResponseResult data(List<Event> data) {
-        this.data = data;
-        return this;
-    }
-
-    public EventsResponseResult addDataItem(Event dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Event> getData() {
-        return data;
-    }
-
-    public void setData(List<Event> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        EventsResponseResult eventsResponseResult = (EventsResponseResult) o;
-        return Objects.equals(this.data, eventsResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class EventsResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ExternalReferences.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ExternalReferences.java
deleted file mode 100644
index 4087051d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ExternalReferences.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.Objects;
-
-/**
- * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
- */
-@Schema(description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ExternalReferences extends ArrayList<ExternalReferencesInner> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ExternalReferences {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ExternalReferencesInner.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ExternalReferencesInner.java
deleted file mode 100644
index 58f2e76d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ExternalReferencesInner.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ExternalReferencesInner
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ExternalReferencesInner {
-    @SerializedName("referenceID")
-    private String referenceID = null;
-
-    @SerializedName("referenceId")
-    private String referenceId = null;
-
-    @SerializedName("referenceSource")
-    private String referenceSource = null;
-
-    public ExternalReferencesInner referenceID(String referenceID) {
-        this.referenceID = referenceID;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;referenceId&#x60;. Github issue number #460  &lt;br&gt;The external reference ID. Could be a simple string or a URI.
-     *
-     * @return referenceID
-     **/
-    @Schema(description = "**Deprecated in v2.1** Please use `referenceId`. Github issue number #460  <br>The external reference ID. Could be a simple string or a URI.")
-    public String getReferenceID() {
-        return referenceID;
-    }
-
-    public void setReferenceID(String referenceID) {
-        this.referenceID = referenceID;
-    }
-
-    public ExternalReferencesInner referenceId(String referenceId) {
-        this.referenceId = referenceId;
-        return this;
-    }
-
-    /**
-     * The external reference ID. Could be a simple string or a URI.
-     *
-     * @return referenceId
-     **/
-    @Schema(description = "The external reference ID. Could be a simple string or a URI.")
-    public String getReferenceId() {
-        return referenceId;
-    }
-
-    public void setReferenceId(String referenceId) {
-        this.referenceId = referenceId;
-    }
-
-    public ExternalReferencesInner referenceSource(String referenceSource) {
-        this.referenceSource = referenceSource;
-        return this;
-    }
-
-    /**
-     * An identifier for the source system or database of this reference
-     *
-     * @return referenceSource
-     **/
-    @Schema(description = "An identifier for the source system or database of this reference")
-    public String getReferenceSource() {
-        return referenceSource;
-    }
-
-    public void setReferenceSource(String referenceSource) {
-        this.referenceSource = referenceSource;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ExternalReferencesInner externalReferencesInner = (ExternalReferencesInner) o;
-        return Objects.equals(this.referenceID, externalReferencesInner.referenceID) &&
-                Objects.equals(this.referenceId, externalReferencesInner.referenceId) &&
-                Objects.equals(this.referenceSource, externalReferencesInner.referenceSource);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(referenceID, referenceId, referenceSource);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ExternalReferencesInner {\n");
-
-        sb.append("    referenceID: ").append(toIndentedString(referenceID)).append("\n");
-        sb.append("    referenceId: ").append(toIndentedString(referenceId)).append("\n");
-        sb.append("    referenceSource: ").append(toIndentedString(referenceSource)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/GeoJSON.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/GeoJSON.java
deleted file mode 100644
index 47e69fea..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/GeoJSON.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * One geometry as defined by GeoJSON (RFC 7946). All coordinates are decimal values on the WGS84 geographic coordinate reference system.  Copied from RFC 7946 Section 3.1.1  A position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.
- */
-@Schema(description = "One geometry as defined by GeoJSON (RFC 7946). All coordinates are decimal values on the WGS84 geographic coordinate reference system.  Copied from RFC 7946 Section 3.1.1  A position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class GeoJSON {
-    @SerializedName("geometry")
-    private OneOfGeoJSONGeometry geometry = null;
-
-    @SerializedName("type")
-    private String type = "Feature";
-
-    public GeoJSON geometry(OneOfGeoJSONGeometry geometry) {
-        this.geometry = geometry;
-        return this;
-    }
-
-    /**
-     * A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.
-     *
-     * @return geometry
-     **/
-    @Schema(example = "{\"coordinates\":[-76.506042,42.417373,123],\"type\":\"Point\"}", description = "A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.")
-    public OneOfGeoJSONGeometry getGeometry() {
-        return geometry;
-    }
-
-    public void setGeometry(OneOfGeoJSONGeometry geometry) {
-        this.geometry = geometry;
-    }
-
-    public GeoJSON type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The literal string \&quot;Feature\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Feature", description = "The literal string \"Feature\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GeoJSON geoJSON = (GeoJSON) o;
-        return Objects.equals(this.geometry, geoJSON.geometry) &&
-                Objects.equals(this.type, geoJSON.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(geometry, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GeoJSON {\n");
-
-        sb.append("    geometry: ").append(toIndentedString(geometry)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/GeoJSONSearchArea.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/GeoJSONSearchArea.java
deleted file mode 100644
index e61cce6d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/GeoJSONSearchArea.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * A GeoJSON Polygon which describes an area to search for other GeoJSON objects. All contained Points and intersecting Polygons should be returned as search results.   All coordinates are decimal values on the WGS84 geographic coordinate reference system.
- */
-@Schema(description = "A GeoJSON Polygon which describes an area to search for other GeoJSON objects. All contained Points and intersecting Polygons should be returned as search results.   All coordinates are decimal values on the WGS84 geographic coordinate reference system.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class GeoJSONSearchArea {
-    @SerializedName("geometry")
-    private OneOfGeoJSONSearchAreaGeometry geometry = null;
-
-    @SerializedName("type")
-    private String type = "Feature";
-
-    public GeoJSONSearchArea geometry(OneOfGeoJSONSearchAreaGeometry geometry) {
-        this.geometry = geometry;
-        return this;
-    }
-
-    /**
-     * A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.
-     *
-     * @return geometry
-     **/
-    @Schema(example = "{\"coordinates\":[-76.506042,42.417373,123],\"type\":\"Point\"}", description = "A geometry as defined by GeoJSON (RFC 7946). In this context, only Point or Polygon geometry are allowed.")
-    public OneOfGeoJSONSearchAreaGeometry getGeometry() {
-        return geometry;
-    }
-
-    public void setGeometry(OneOfGeoJSONSearchAreaGeometry geometry) {
-        this.geometry = geometry;
-    }
-
-    public GeoJSONSearchArea type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The literal string \&quot;Feature\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Feature", description = "The literal string \"Feature\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        GeoJSONSearchArea geoJSONSearchArea = (GeoJSONSearchArea) o;
-        return Objects.equals(this.geometry, geoJSONSearchArea.geometry) &&
-                Objects.equals(this.type, geoJSONSearchArea.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(geometry, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GeoJSONSearchArea {\n");
-
-        sb.append("    geometry: ").append(toIndentedString(geometry)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Image.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Image.java
deleted file mode 100644
index a91a318e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Image.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * Image
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Image {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("copyright")
-    private String copyright = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("descriptiveOntologyTerms")
-    private List<String> descriptiveOntologyTerms = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("imageDbId")
-    private String imageDbId = null;
-
-    @SerializedName("imageFileName")
-    private String imageFileName = null;
-
-    @SerializedName("imageFileSize")
-    private Integer imageFileSize = null;
-
-    @SerializedName("imageHeight")
-    private Integer imageHeight = null;
-
-    @SerializedName("imageLocation")
-    private GeoJSON imageLocation = null;
-
-    @SerializedName("imageName")
-    private String imageName = null;
-
-    @SerializedName("imageTimeStamp")
-    private OffsetDateTime imageTimeStamp = null;
-
-    @SerializedName("imageURL")
-    private String imageURL = null;
-
-    @SerializedName("imageWidth")
-    private Integer imageWidth = null;
-
-    @SerializedName("mimeType")
-    private String mimeType = null;
-
-    @SerializedName("observationDbIds")
-    private List<String> observationDbIds = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    public Image additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Image putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Image copyright(String copyright) {
-        this.copyright = copyright;
-        return this;
-    }
-
-    /**
-     * The copyright information of this image. Example &#x27;Copyright 2018 Bob Robertson&#x27;
-     *
-     * @return copyright
-     **/
-    @Schema(example = "Copyright 2018 Bob Robertson", description = "The copyright information of this image. Example 'Copyright 2018 Bob Robertson'")
-    public String getCopyright() {
-        return copyright;
-    }
-
-    public void setCopyright(String copyright) {
-        this.copyright = copyright;
-    }
-
-    public Image description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * The human readable description of an image.
-     *
-     * @return description
-     **/
-    @Schema(example = "This is a picture of a tomato", description = "The human readable description of an image.")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Image descriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-        return this;
-    }
-
-    public Image addDescriptiveOntologyTermsItem(String descriptiveOntologyTermsItem) {
-        if (this.descriptiveOntologyTerms == null) {
-            this.descriptiveOntologyTerms = new ArrayList<String>();
-        }
-        this.descriptiveOntologyTerms.add(descriptiveOntologyTermsItem);
-        return this;
-    }
-
-    /**
-     * A list of terms to formally describe the image. Each item could be a simple Tag, an Ontology reference Id, or a full ontology URL.
-     *
-     * @return descriptiveOntologyTerms
-     **/
-    @Schema(example = "[\"doi:10.1002/0470841559\",\"Red\",\"ncbi:0300294\"]", description = "A list of terms to formally describe the image. Each item could be a simple Tag, an Ontology reference Id, or a full ontology URL.")
-    public List<String> getDescriptiveOntologyTerms() {
-        return descriptiveOntologyTerms;
-    }
-
-    public void setDescriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-    }
-
-    public Image externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Image addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Image imageDbId(String imageDbId) {
-        this.imageDbId = imageDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier of an image
-     *
-     * @return imageDbId
-     **/
-    @Schema(example = "a55efb9c", description = "The unique identifier of an image")
-    public String getImageDbId() {
-        return imageDbId;
-    }
-
-    public void setImageDbId(String imageDbId) {
-        this.imageDbId = imageDbId;
-    }
-
-    public Image imageFileName(String imageFileName) {
-        this.imageFileName = imageFileName;
-        return this;
-    }
-
-    /**
-     * The name of the image file. Might be the same as &#x27;imageName&#x27;, but could be different.
-     *
-     * @return imageFileName
-     **/
-    @Schema(example = "image_0000231.jpg", description = "The name of the image file. Might be the same as 'imageName', but could be different.")
-    public String getImageFileName() {
-        return imageFileName;
-    }
-
-    public void setImageFileName(String imageFileName) {
-        this.imageFileName = imageFileName;
-    }
-
-    public Image imageFileSize(Integer imageFileSize) {
-        this.imageFileSize = imageFileSize;
-        return this;
-    }
-
-    /**
-     * The size of the image in Bytes.
-     *
-     * @return imageFileSize
-     **/
-    @Schema(example = "50000", description = "The size of the image in Bytes.")
-    public Integer getImageFileSize() {
-        return imageFileSize;
-    }
-
-    public void setImageFileSize(Integer imageFileSize) {
-        this.imageFileSize = imageFileSize;
-    }
-
-    public Image imageHeight(Integer imageHeight) {
-        this.imageHeight = imageHeight;
-        return this;
-    }
-
-    /**
-     * The height of the image in Pixels.
-     *
-     * @return imageHeight
-     **/
-    @Schema(example = "550", description = "The height of the image in Pixels.")
-    public Integer getImageHeight() {
-        return imageHeight;
-    }
-
-    public void setImageHeight(Integer imageHeight) {
-        this.imageHeight = imageHeight;
-    }
-
-    public Image imageLocation(GeoJSON imageLocation) {
-        this.imageLocation = imageLocation;
-        return this;
-    }
-
-    /**
-     * Get imageLocation
-     *
-     * @return imageLocation
-     **/
-    @Schema(description = "")
-    public GeoJSON getImageLocation() {
-        return imageLocation;
-    }
-
-    public void setImageLocation(GeoJSON imageLocation) {
-        this.imageLocation = imageLocation;
-    }
-
-    public Image imageName(String imageName) {
-        this.imageName = imageName;
-        return this;
-    }
-
-    /**
-     * The human readable name of an image. Might be the same as &#x27;imageFileName&#x27;, but could be different.
-     *
-     * @return imageName
-     **/
-    @Schema(example = "Tomato Image 1", description = "The human readable name of an image. Might be the same as 'imageFileName', but could be different.")
-    public String getImageName() {
-        return imageName;
-    }
-
-    public void setImageName(String imageName) {
-        this.imageName = imageName;
-    }
-
-    public Image imageTimeStamp(OffsetDateTime imageTimeStamp) {
-        this.imageTimeStamp = imageTimeStamp;
-        return this;
-    }
-
-    /**
-     * The date and time the image was taken
-     *
-     * @return imageTimeStamp
-     **/
-    @Schema(description = "The date and time the image was taken")
-    public OffsetDateTime getImageTimeStamp() {
-        return imageTimeStamp;
-    }
-
-    public void setImageTimeStamp(OffsetDateTime imageTimeStamp) {
-        this.imageTimeStamp = imageTimeStamp;
-    }
-
-    public Image imageURL(String imageURL) {
-        this.imageURL = imageURL;
-        return this;
-    }
-
-    /**
-     * The complete, absolute URI path to the image file. Images might be stored on a different host or path than the BrAPI web server.
-     *
-     * @return imageURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/images/tomato", description = "The complete, absolute URI path to the image file. Images might be stored on a different host or path than the BrAPI web server.")
-    public String getImageURL() {
-        return imageURL;
-    }
-
-    public void setImageURL(String imageURL) {
-        this.imageURL = imageURL;
-    }
-
-    public Image imageWidth(Integer imageWidth) {
-        this.imageWidth = imageWidth;
-        return this;
-    }
-
-    /**
-     * The width of the image in Pixels.
-     *
-     * @return imageWidth
-     **/
-    @Schema(example = "700", description = "The width of the image in Pixels.")
-    public Integer getImageWidth() {
-        return imageWidth;
-    }
-
-    public void setImageWidth(Integer imageWidth) {
-        this.imageWidth = imageWidth;
-    }
-
-    public Image mimeType(String mimeType) {
-        this.mimeType = mimeType;
-        return this;
-    }
-
-    /**
-     * The file type of the image. Examples &#x27;image/jpeg&#x27;, &#x27;image/png&#x27;, &#x27;image/svg&#x27;, etc
-     *
-     * @return mimeType
-     **/
-    @Schema(example = "image/jpeg", description = "The file type of the image. Examples 'image/jpeg', 'image/png', 'image/svg', etc")
-    public String getMimeType() {
-        return mimeType;
-    }
-
-    public void setMimeType(String mimeType) {
-        this.mimeType = mimeType;
-    }
-
-    public Image observationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-        return this;
-    }
-
-    public Image addObservationDbIdsItem(String observationDbIdsItem) {
-        if (this.observationDbIds == null) {
-            this.observationDbIds = new ArrayList<String>();
-        }
-        this.observationDbIds.add(observationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of observation Ids this image is associated with, if applicable.
-     *
-     * @return observationDbIds
-     **/
-    @Schema(example = "[\"d05dd235\",\"8875177d\",\"c08e81b6\"]", description = "A list of observation Ids this image is associated with, if applicable.")
-    public List<String> getObservationDbIds() {
-        return observationDbIds;
-    }
-
-    public void setObservationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-    }
-
-    public Image observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The related observation unit identifier, if relevant.
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "b7e690b6", description = "The related observation unit identifier, if relevant.")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Image image = (Image) o;
-        return Objects.equals(this.additionalInfo, image.additionalInfo) &&
-                Objects.equals(this.copyright, image.copyright) &&
-                Objects.equals(this.description, image.description) &&
-                Objects.equals(this.descriptiveOntologyTerms, image.descriptiveOntologyTerms) &&
-                Objects.equals(this.externalReferences, image.externalReferences) &&
-                Objects.equals(this.imageDbId, image.imageDbId) &&
-                Objects.equals(this.imageFileName, image.imageFileName) &&
-                Objects.equals(this.imageFileSize, image.imageFileSize) &&
-                Objects.equals(this.imageHeight, image.imageHeight) &&
-                Objects.equals(this.imageLocation, image.imageLocation) &&
-                Objects.equals(this.imageName, image.imageName) &&
-                Objects.equals(this.imageTimeStamp, image.imageTimeStamp) &&
-                Objects.equals(this.imageURL, image.imageURL) &&
-                Objects.equals(this.imageWidth, image.imageWidth) &&
-                Objects.equals(this.mimeType, image.mimeType) &&
-                Objects.equals(this.observationDbIds, image.observationDbIds) &&
-                Objects.equals(this.observationUnitDbId, image.observationUnitDbId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, copyright, description, descriptiveOntologyTerms, externalReferences, imageDbId, imageFileName, imageFileSize, imageHeight, imageLocation, imageName, imageTimeStamp, imageURL, imageWidth, mimeType, observationDbIds, observationUnitDbId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Image {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    copyright: ").append(toIndentedString(copyright)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    descriptiveOntologyTerms: ").append(toIndentedString(descriptiveOntologyTerms)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    imageDbId: ").append(toIndentedString(imageDbId)).append("\n");
-        sb.append("    imageFileName: ").append(toIndentedString(imageFileName)).append("\n");
-        sb.append("    imageFileSize: ").append(toIndentedString(imageFileSize)).append("\n");
-        sb.append("    imageHeight: ").append(toIndentedString(imageHeight)).append("\n");
-        sb.append("    imageLocation: ").append(toIndentedString(imageLocation)).append("\n");
-        sb.append("    imageName: ").append(toIndentedString(imageName)).append("\n");
-        sb.append("    imageTimeStamp: ").append(toIndentedString(imageTimeStamp)).append("\n");
-        sb.append("    imageURL: ").append(toIndentedString(imageURL)).append("\n");
-        sb.append("    imageWidth: ").append(toIndentedString(imageWidth)).append("\n");
-        sb.append("    mimeType: ").append(toIndentedString(mimeType)).append("\n");
-        sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageDeleteResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageDeleteResponse.java
deleted file mode 100644
index 6bfa9bab..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageDeleteResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ImageDeleteResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ImageDeleteResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ImageDeleteResponseResult result = null;
-
-    public ImageDeleteResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ImageDeleteResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ImageDeleteResponse result(ImageDeleteResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ImageDeleteResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ImageDeleteResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ImageDeleteResponse imageDeleteResponse = (ImageDeleteResponse) o;
-        return Objects.equals(this._atContext, imageDeleteResponse._atContext) &&
-                Objects.equals(this.metadata, imageDeleteResponse.metadata) &&
-                Objects.equals(this.result, imageDeleteResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ImageDeleteResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageDeleteResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageDeleteResponseResult.java
deleted file mode 100644
index ccaf9135..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageDeleteResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ImageDeleteResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ImageDeleteResponseResult {
-    @SerializedName("imageDbIds")
-    private List<String> imageDbIds = new ArrayList<String>();
-
-    public ImageDeleteResponseResult imageDbIds(List<String> imageDbIds) {
-        this.imageDbIds = imageDbIds;
-        return this;
-    }
-
-    public ImageDeleteResponseResult addImageDbIdsItem(String imageDbIdsItem) {
-        this.imageDbIds.add(imageDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique ids of the Image records which have been successfully deleted
-     *
-     * @return imageDbIds
-     **/
-    @Schema(example = "[\"6a4a59d8\",\"3ff067e0\"]", required = true, description = "The unique ids of the Image records which have been successfully deleted")
-    public List<String> getImageDbIds() {
-        return imageDbIds;
-    }
-
-    public void setImageDbIds(List<String> imageDbIds) {
-        this.imageDbIds = imageDbIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ImageDeleteResponseResult imageDeleteResponseResult = (ImageDeleteResponseResult) o;
-        return Objects.equals(this.imageDbIds, imageDeleteResponseResult.imageDbIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(imageDbIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ImageDeleteResponseResult {\n");
-
-        sb.append("    imageDbIds: ").append(toIndentedString(imageDbIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageListResponse.java
deleted file mode 100644
index 9fee6168..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ImageListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ImageListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ImageListResponseResult result = null;
-
-    public ImageListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ImageListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ImageListResponse result(ImageListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ImageListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ImageListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ImageListResponse imageListResponse = (ImageListResponse) o;
-        return Objects.equals(this._atContext, imageListResponse._atContext) &&
-                Objects.equals(this.metadata, imageListResponse.metadata) &&
-                Objects.equals(this.result, imageListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ImageListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageListResponseResult.java
deleted file mode 100644
index d9684184..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ImageListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ImageListResponseResult {
-    @SerializedName("data")
-    private List<Image> data = new ArrayList<Image>();
-
-    public ImageListResponseResult data(List<Image> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ImageListResponseResult addDataItem(Image dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Image> getData() {
-        return data;
-    }
-
-    public void setData(List<Image> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ImageListResponseResult imageListResponseResult = (ImageListResponseResult) o;
-        return Objects.equals(this.data, imageListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ImageListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageNewRequest.java
deleted file mode 100644
index 275ef0b2..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageNewRequest.java
+++ /dev/null
@@ -1,481 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * ImageNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ImageNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("copyright")
-    private String copyright = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("descriptiveOntologyTerms")
-    private List<String> descriptiveOntologyTerms = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("imageFileName")
-    private String imageFileName = null;
-
-    @SerializedName("imageFileSize")
-    private Integer imageFileSize = null;
-
-    @SerializedName("imageHeight")
-    private Integer imageHeight = null;
-
-    @SerializedName("imageLocation")
-    private GeoJSON imageLocation = null;
-
-    @SerializedName("imageName")
-    private String imageName = null;
-
-    @SerializedName("imageTimeStamp")
-    private OffsetDateTime imageTimeStamp = null;
-
-    @SerializedName("imageURL")
-    private String imageURL = null;
-
-    @SerializedName("imageWidth")
-    private Integer imageWidth = null;
-
-    @SerializedName("mimeType")
-    private String mimeType = null;
-
-    @SerializedName("observationDbIds")
-    private List<String> observationDbIds = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    public ImageNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ImageNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ImageNewRequest copyright(String copyright) {
-        this.copyright = copyright;
-        return this;
-    }
-
-    /**
-     * The copyright information of this image. Example &#x27;Copyright 2018 Bob Robertson&#x27;
-     *
-     * @return copyright
-     **/
-    @Schema(example = "Copyright 2018 Bob Robertson", description = "The copyright information of this image. Example 'Copyright 2018 Bob Robertson'")
-    public String getCopyright() {
-        return copyright;
-    }
-
-    public void setCopyright(String copyright) {
-        this.copyright = copyright;
-    }
-
-    public ImageNewRequest description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * The human readable description of an image.
-     *
-     * @return description
-     **/
-    @Schema(example = "This is a picture of a tomato", description = "The human readable description of an image.")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public ImageNewRequest descriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-        return this;
-    }
-
-    public ImageNewRequest addDescriptiveOntologyTermsItem(String descriptiveOntologyTermsItem) {
-        if (this.descriptiveOntologyTerms == null) {
-            this.descriptiveOntologyTerms = new ArrayList<String>();
-        }
-        this.descriptiveOntologyTerms.add(descriptiveOntologyTermsItem);
-        return this;
-    }
-
-    /**
-     * A list of terms to formally describe the image. Each item could be a simple Tag, an Ontology reference Id, or a full ontology URL.
-     *
-     * @return descriptiveOntologyTerms
-     **/
-    @Schema(example = "[\"doi:10.1002/0470841559\",\"Red\",\"ncbi:0300294\"]", description = "A list of terms to formally describe the image. Each item could be a simple Tag, an Ontology reference Id, or a full ontology URL.")
-    public List<String> getDescriptiveOntologyTerms() {
-        return descriptiveOntologyTerms;
-    }
-
-    public void setDescriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-    }
-
-    public ImageNewRequest externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ImageNewRequest addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ImageNewRequest imageFileName(String imageFileName) {
-        this.imageFileName = imageFileName;
-        return this;
-    }
-
-    /**
-     * The name of the image file. Might be the same as &#x27;imageName&#x27;, but could be different.
-     *
-     * @return imageFileName
-     **/
-    @Schema(example = "image_0000231.jpg", description = "The name of the image file. Might be the same as 'imageName', but could be different.")
-    public String getImageFileName() {
-        return imageFileName;
-    }
-
-    public void setImageFileName(String imageFileName) {
-        this.imageFileName = imageFileName;
-    }
-
-    public ImageNewRequest imageFileSize(Integer imageFileSize) {
-        this.imageFileSize = imageFileSize;
-        return this;
-    }
-
-    /**
-     * The size of the image in Bytes.
-     *
-     * @return imageFileSize
-     **/
-    @Schema(example = "50000", description = "The size of the image in Bytes.")
-    public Integer getImageFileSize() {
-        return imageFileSize;
-    }
-
-    public void setImageFileSize(Integer imageFileSize) {
-        this.imageFileSize = imageFileSize;
-    }
-
-    public ImageNewRequest imageHeight(Integer imageHeight) {
-        this.imageHeight = imageHeight;
-        return this;
-    }
-
-    /**
-     * The height of the image in Pixels.
-     *
-     * @return imageHeight
-     **/
-    @Schema(example = "550", description = "The height of the image in Pixels.")
-    public Integer getImageHeight() {
-        return imageHeight;
-    }
-
-    public void setImageHeight(Integer imageHeight) {
-        this.imageHeight = imageHeight;
-    }
-
-    public ImageNewRequest imageLocation(GeoJSON imageLocation) {
-        this.imageLocation = imageLocation;
-        return this;
-    }
-
-    /**
-     * Get imageLocation
-     *
-     * @return imageLocation
-     **/
-    @Schema(description = "")
-    public GeoJSON getImageLocation() {
-        return imageLocation;
-    }
-
-    public void setImageLocation(GeoJSON imageLocation) {
-        this.imageLocation = imageLocation;
-    }
-
-    public ImageNewRequest imageName(String imageName) {
-        this.imageName = imageName;
-        return this;
-    }
-
-    /**
-     * The human readable name of an image. Might be the same as &#x27;imageFileName&#x27;, but could be different.
-     *
-     * @return imageName
-     **/
-    @Schema(example = "Tomato Image 1", description = "The human readable name of an image. Might be the same as 'imageFileName', but could be different.")
-    public String getImageName() {
-        return imageName;
-    }
-
-    public void setImageName(String imageName) {
-        this.imageName = imageName;
-    }
-
-    public ImageNewRequest imageTimeStamp(OffsetDateTime imageTimeStamp) {
-        this.imageTimeStamp = imageTimeStamp;
-        return this;
-    }
-
-    /**
-     * The date and time the image was taken
-     *
-     * @return imageTimeStamp
-     **/
-    @Schema(description = "The date and time the image was taken")
-    public OffsetDateTime getImageTimeStamp() {
-        return imageTimeStamp;
-    }
-
-    public void setImageTimeStamp(OffsetDateTime imageTimeStamp) {
-        this.imageTimeStamp = imageTimeStamp;
-    }
-
-    public ImageNewRequest imageURL(String imageURL) {
-        this.imageURL = imageURL;
-        return this;
-    }
-
-    /**
-     * The complete, absolute URI path to the image file. Images might be stored on a different host or path than the BrAPI web server.
-     *
-     * @return imageURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/images/tomato", description = "The complete, absolute URI path to the image file. Images might be stored on a different host or path than the BrAPI web server.")
-    public String getImageURL() {
-        return imageURL;
-    }
-
-    public void setImageURL(String imageURL) {
-        this.imageURL = imageURL;
-    }
-
-    public ImageNewRequest imageWidth(Integer imageWidth) {
-        this.imageWidth = imageWidth;
-        return this;
-    }
-
-    /**
-     * The width of the image in Pixels.
-     *
-     * @return imageWidth
-     **/
-    @Schema(example = "700", description = "The width of the image in Pixels.")
-    public Integer getImageWidth() {
-        return imageWidth;
-    }
-
-    public void setImageWidth(Integer imageWidth) {
-        this.imageWidth = imageWidth;
-    }
-
-    public ImageNewRequest mimeType(String mimeType) {
-        this.mimeType = mimeType;
-        return this;
-    }
-
-    /**
-     * The file type of the image. Examples &#x27;image/jpeg&#x27;, &#x27;image/png&#x27;, &#x27;image/svg&#x27;, etc
-     *
-     * @return mimeType
-     **/
-    @Schema(example = "image/jpeg", description = "The file type of the image. Examples 'image/jpeg', 'image/png', 'image/svg', etc")
-    public String getMimeType() {
-        return mimeType;
-    }
-
-    public void setMimeType(String mimeType) {
-        this.mimeType = mimeType;
-    }
-
-    public ImageNewRequest observationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-        return this;
-    }
-
-    public ImageNewRequest addObservationDbIdsItem(String observationDbIdsItem) {
-        if (this.observationDbIds == null) {
-            this.observationDbIds = new ArrayList<String>();
-        }
-        this.observationDbIds.add(observationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of observation Ids this image is associated with, if applicable.
-     *
-     * @return observationDbIds
-     **/
-    @Schema(example = "[\"d05dd235\",\"8875177d\",\"c08e81b6\"]", description = "A list of observation Ids this image is associated with, if applicable.")
-    public List<String> getObservationDbIds() {
-        return observationDbIds;
-    }
-
-    public void setObservationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-    }
-
-    public ImageNewRequest observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The related observation unit identifier, if relevant.
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "b7e690b6", description = "The related observation unit identifier, if relevant.")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ImageNewRequest imageNewRequest = (ImageNewRequest) o;
-        return Objects.equals(this.additionalInfo, imageNewRequest.additionalInfo) &&
-                Objects.equals(this.copyright, imageNewRequest.copyright) &&
-                Objects.equals(this.description, imageNewRequest.description) &&
-                Objects.equals(this.descriptiveOntologyTerms, imageNewRequest.descriptiveOntologyTerms) &&
-                Objects.equals(this.externalReferences, imageNewRequest.externalReferences) &&
-                Objects.equals(this.imageFileName, imageNewRequest.imageFileName) &&
-                Objects.equals(this.imageFileSize, imageNewRequest.imageFileSize) &&
-                Objects.equals(this.imageHeight, imageNewRequest.imageHeight) &&
-                Objects.equals(this.imageLocation, imageNewRequest.imageLocation) &&
-                Objects.equals(this.imageName, imageNewRequest.imageName) &&
-                Objects.equals(this.imageTimeStamp, imageNewRequest.imageTimeStamp) &&
-                Objects.equals(this.imageURL, imageNewRequest.imageURL) &&
-                Objects.equals(this.imageWidth, imageNewRequest.imageWidth) &&
-                Objects.equals(this.mimeType, imageNewRequest.mimeType) &&
-                Objects.equals(this.observationDbIds, imageNewRequest.observationDbIds) &&
-                Objects.equals(this.observationUnitDbId, imageNewRequest.observationUnitDbId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, copyright, description, descriptiveOntologyTerms, externalReferences, imageFileName, imageFileSize, imageHeight, imageLocation, imageName, imageTimeStamp, imageURL, imageWidth, mimeType, observationDbIds, observationUnitDbId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ImageNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    copyright: ").append(toIndentedString(copyright)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    descriptiveOntologyTerms: ").append(toIndentedString(descriptiveOntologyTerms)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    imageFileName: ").append(toIndentedString(imageFileName)).append("\n");
-        sb.append("    imageFileSize: ").append(toIndentedString(imageFileSize)).append("\n");
-        sb.append("    imageHeight: ").append(toIndentedString(imageHeight)).append("\n");
-        sb.append("    imageLocation: ").append(toIndentedString(imageLocation)).append("\n");
-        sb.append("    imageName: ").append(toIndentedString(imageName)).append("\n");
-        sb.append("    imageTimeStamp: ").append(toIndentedString(imageTimeStamp)).append("\n");
-        sb.append("    imageURL: ").append(toIndentedString(imageURL)).append("\n");
-        sb.append("    imageWidth: ").append(toIndentedString(imageWidth)).append("\n");
-        sb.append("    mimeType: ").append(toIndentedString(mimeType)).append("\n");
-        sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageSearchRequest.java
deleted file mode 100644
index 4a6663be..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageSearchRequest.java
+++ /dev/null
@@ -1,747 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ImageSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ImageSearchRequest {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("descriptiveOntologyTerms")
-    private List<String> descriptiveOntologyTerms = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("imageDbIds")
-    private List<String> imageDbIds = null;
-
-    @SerializedName("imageFileNames")
-    private List<String> imageFileNames = null;
-
-    @SerializedName("imageFileSizeMax")
-    private Integer imageFileSizeMax = null;
-
-    @SerializedName("imageFileSizeMin")
-    private Integer imageFileSizeMin = null;
-
-    @SerializedName("imageHeightMax")
-    private Integer imageHeightMax = null;
-
-    @SerializedName("imageHeightMin")
-    private Integer imageHeightMin = null;
-
-    @SerializedName("imageLocation")
-    private GeoJSONSearchArea imageLocation = null;
-
-    @SerializedName("imageNames")
-    private List<String> imageNames = null;
-
-    @SerializedName("imageTimeStampRangeEnd")
-    private OffsetDateTime imageTimeStampRangeEnd = null;
-
-    @SerializedName("imageTimeStampRangeStart")
-    private OffsetDateTime imageTimeStampRangeStart = null;
-
-    @SerializedName("imageWidthMax")
-    private Integer imageWidthMax = null;
-
-    @SerializedName("imageWidthMin")
-    private Integer imageWidthMin = null;
-
-    @SerializedName("mimeTypes")
-    private List<String> mimeTypes = null;
-
-    @SerializedName("observationDbIds")
-    private List<String> observationDbIds = null;
-
-    @SerializedName("observationUnitDbIds")
-    private List<String> observationUnitDbIds = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    public ImageSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public ImageSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public ImageSearchRequest descriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-        return this;
-    }
-
-    public ImageSearchRequest addDescriptiveOntologyTermsItem(String descriptiveOntologyTermsItem) {
-        if (this.descriptiveOntologyTerms == null) {
-            this.descriptiveOntologyTerms = new ArrayList<String>();
-        }
-        this.descriptiveOntologyTerms.add(descriptiveOntologyTermsItem);
-        return this;
-    }
-
-    /**
-     * A list of terms to formally describe the image to search for. Each item could be a simple Tag, an Ontology reference Id, or a full ontology URL.
-     *
-     * @return descriptiveOntologyTerms
-     **/
-    @Schema(example = "[\"doi:10.1002/0470841559\",\"Red\",\"ncbi:0300294\"]", description = "A list of terms to formally describe the image to search for. Each item could be a simple Tag, an Ontology reference Id, or a full ontology URL.")
-    public List<String> getDescriptiveOntologyTerms() {
-        return descriptiveOntologyTerms;
-    }
-
-    public void setDescriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-    }
-
-    public ImageSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public ImageSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public ImageSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public ImageSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public ImageSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public ImageSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public ImageSearchRequest imageDbIds(List<String> imageDbIds) {
-        this.imageDbIds = imageDbIds;
-        return this;
-    }
-
-    public ImageSearchRequest addImageDbIdsItem(String imageDbIdsItem) {
-        if (this.imageDbIds == null) {
-            this.imageDbIds = new ArrayList<String>();
-        }
-        this.imageDbIds.add(imageDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of image Ids to search for
-     *
-     * @return imageDbIds
-     **/
-    @Schema(example = "[\"564b64a6\",\"0d122d1d\"]", description = "A list of image Ids to search for")
-    public List<String> getImageDbIds() {
-        return imageDbIds;
-    }
-
-    public void setImageDbIds(List<String> imageDbIds) {
-        this.imageDbIds = imageDbIds;
-    }
-
-    public ImageSearchRequest imageFileNames(List<String> imageFileNames) {
-        this.imageFileNames = imageFileNames;
-        return this;
-    }
-
-    public ImageSearchRequest addImageFileNamesItem(String imageFileNamesItem) {
-        if (this.imageFileNames == null) {
-            this.imageFileNames = new ArrayList<String>();
-        }
-        this.imageFileNames.add(imageFileNamesItem);
-        return this;
-    }
-
-    /**
-     * Image file names to search for.
-     *
-     * @return imageFileNames
-     **/
-    @Schema(example = "[\"image_01032019.jpg\",\"picture_field_1234.jpg\"]", description = "Image file names to search for.")
-    public List<String> getImageFileNames() {
-        return imageFileNames;
-    }
-
-    public void setImageFileNames(List<String> imageFileNames) {
-        this.imageFileNames = imageFileNames;
-    }
-
-    public ImageSearchRequest imageFileSizeMax(Integer imageFileSizeMax) {
-        this.imageFileSizeMax = imageFileSizeMax;
-        return this;
-    }
-
-    /**
-     * A maximum image file size to search for.
-     *
-     * @return imageFileSizeMax
-     **/
-    @Schema(example = "20000000", description = "A maximum image file size to search for.")
-    public Integer getImageFileSizeMax() {
-        return imageFileSizeMax;
-    }
-
-    public void setImageFileSizeMax(Integer imageFileSizeMax) {
-        this.imageFileSizeMax = imageFileSizeMax;
-    }
-
-    public ImageSearchRequest imageFileSizeMin(Integer imageFileSizeMin) {
-        this.imageFileSizeMin = imageFileSizeMin;
-        return this;
-    }
-
-    /**
-     * A minimum image file size to search for.
-     *
-     * @return imageFileSizeMin
-     **/
-    @Schema(example = "1000", description = "A minimum image file size to search for.")
-    public Integer getImageFileSizeMin() {
-        return imageFileSizeMin;
-    }
-
-    public void setImageFileSizeMin(Integer imageFileSizeMin) {
-        this.imageFileSizeMin = imageFileSizeMin;
-    }
-
-    public ImageSearchRequest imageHeightMax(Integer imageHeightMax) {
-        this.imageHeightMax = imageHeightMax;
-        return this;
-    }
-
-    /**
-     * A maximum image height to search for.
-     *
-     * @return imageHeightMax
-     **/
-    @Schema(example = "1080", description = "A maximum image height to search for.")
-    public Integer getImageHeightMax() {
-        return imageHeightMax;
-    }
-
-    public void setImageHeightMax(Integer imageHeightMax) {
-        this.imageHeightMax = imageHeightMax;
-    }
-
-    public ImageSearchRequest imageHeightMin(Integer imageHeightMin) {
-        this.imageHeightMin = imageHeightMin;
-        return this;
-    }
-
-    /**
-     * A minimum image height to search for.
-     *
-     * @return imageHeightMin
-     **/
-    @Schema(example = "720", description = "A minimum image height to search for.")
-    public Integer getImageHeightMin() {
-        return imageHeightMin;
-    }
-
-    public void setImageHeightMin(Integer imageHeightMin) {
-        this.imageHeightMin = imageHeightMin;
-    }
-
-    public ImageSearchRequest imageLocation(GeoJSONSearchArea imageLocation) {
-        this.imageLocation = imageLocation;
-        return this;
-    }
-
-    /**
-     * Get imageLocation
-     *
-     * @return imageLocation
-     **/
-    @Schema(description = "")
-    public GeoJSONSearchArea getImageLocation() {
-        return imageLocation;
-    }
-
-    public void setImageLocation(GeoJSONSearchArea imageLocation) {
-        this.imageLocation = imageLocation;
-    }
-
-    public ImageSearchRequest imageNames(List<String> imageNames) {
-        this.imageNames = imageNames;
-        return this;
-    }
-
-    public ImageSearchRequest addImageNamesItem(String imageNamesItem) {
-        if (this.imageNames == null) {
-            this.imageNames = new ArrayList<String>();
-        }
-        this.imageNames.add(imageNamesItem);
-        return this;
-    }
-
-    /**
-     * Human readable names to search for.
-     *
-     * @return imageNames
-     **/
-    @Schema(example = "[\"Image 43\",\"Tractor in field\"]", description = "Human readable names to search for.")
-    public List<String> getImageNames() {
-        return imageNames;
-    }
-
-    public void setImageNames(List<String> imageNames) {
-        this.imageNames = imageNames;
-    }
-
-    public ImageSearchRequest imageTimeStampRangeEnd(OffsetDateTime imageTimeStampRangeEnd) {
-        this.imageTimeStampRangeEnd = imageTimeStampRangeEnd;
-        return this;
-    }
-
-    /**
-     * The latest timestamp to search for.
-     *
-     * @return imageTimeStampRangeEnd
-     **/
-    @Schema(description = "The latest timestamp to search for.")
-    public OffsetDateTime getImageTimeStampRangeEnd() {
-        return imageTimeStampRangeEnd;
-    }
-
-    public void setImageTimeStampRangeEnd(OffsetDateTime imageTimeStampRangeEnd) {
-        this.imageTimeStampRangeEnd = imageTimeStampRangeEnd;
-    }
-
-    public ImageSearchRequest imageTimeStampRangeStart(OffsetDateTime imageTimeStampRangeStart) {
-        this.imageTimeStampRangeStart = imageTimeStampRangeStart;
-        return this;
-    }
-
-    /**
-     * The earliest timestamp to search for.
-     *
-     * @return imageTimeStampRangeStart
-     **/
-    @Schema(description = "The earliest timestamp to search for.")
-    public OffsetDateTime getImageTimeStampRangeStart() {
-        return imageTimeStampRangeStart;
-    }
-
-    public void setImageTimeStampRangeStart(OffsetDateTime imageTimeStampRangeStart) {
-        this.imageTimeStampRangeStart = imageTimeStampRangeStart;
-    }
-
-    public ImageSearchRequest imageWidthMax(Integer imageWidthMax) {
-        this.imageWidthMax = imageWidthMax;
-        return this;
-    }
-
-    /**
-     * A maximum image width to search for.
-     *
-     * @return imageWidthMax
-     **/
-    @Schema(example = "1920", description = "A maximum image width to search for.")
-    public Integer getImageWidthMax() {
-        return imageWidthMax;
-    }
-
-    public void setImageWidthMax(Integer imageWidthMax) {
-        this.imageWidthMax = imageWidthMax;
-    }
-
-    public ImageSearchRequest imageWidthMin(Integer imageWidthMin) {
-        this.imageWidthMin = imageWidthMin;
-        return this;
-    }
-
-    /**
-     * A minimum image width to search for.
-     *
-     * @return imageWidthMin
-     **/
-    @Schema(example = "1280", description = "A minimum image width to search for.")
-    public Integer getImageWidthMin() {
-        return imageWidthMin;
-    }
-
-    public void setImageWidthMin(Integer imageWidthMin) {
-        this.imageWidthMin = imageWidthMin;
-    }
-
-    public ImageSearchRequest mimeTypes(List<String> mimeTypes) {
-        this.mimeTypes = mimeTypes;
-        return this;
-    }
-
-    public ImageSearchRequest addMimeTypesItem(String mimeTypesItem) {
-        if (this.mimeTypes == null) {
-            this.mimeTypes = new ArrayList<String>();
-        }
-        this.mimeTypes.add(mimeTypesItem);
-        return this;
-    }
-
-    /**
-     * A set of image file types to search for.
-     *
-     * @return mimeTypes
-     **/
-    @Schema(example = "[\"image/jpg\",\"image/jpeg\",\"image/gif\"]", description = "A set of image file types to search for.")
-    public List<String> getMimeTypes() {
-        return mimeTypes;
-    }
-
-    public void setMimeTypes(List<String> mimeTypes) {
-        this.mimeTypes = mimeTypes;
-    }
-
-    public ImageSearchRequest observationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-        return this;
-    }
-
-    public ImageSearchRequest addObservationDbIdsItem(String observationDbIdsItem) {
-        if (this.observationDbIds == null) {
-            this.observationDbIds = new ArrayList<String>();
-        }
-        this.observationDbIds.add(observationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of observation Ids this image is associated with to search for
-     *
-     * @return observationDbIds
-     **/
-    @Schema(example = "[\"47326456\",\"fc9823ac\"]", description = "A list of observation Ids this image is associated with to search for")
-    public List<String> getObservationDbIds() {
-        return observationDbIds;
-    }
-
-    public void setObservationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-    }
-
-    public ImageSearchRequest observationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-        return this;
-    }
-
-    public ImageSearchRequest addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-        if (this.observationUnitDbIds == null) {
-            this.observationUnitDbIds = new ArrayList<String>();
-        }
-        this.observationUnitDbIds.add(observationUnitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A set of observation unit identifiers to search for.
-     *
-     * @return observationUnitDbIds
-     **/
-    @Schema(example = "[\"f5e4b273\",\"328c9424\"]", description = "A set of observation unit identifiers to search for.")
-    public List<String> getObservationUnitDbIds() {
-        return observationUnitDbIds;
-    }
-
-    public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-    }
-
-    public ImageSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public ImageSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public ImageSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public ImageSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public ImageSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public ImageSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ImageSearchRequest imageSearchRequest = (ImageSearchRequest) o;
-        return Objects.equals(this.commonCropNames, imageSearchRequest.commonCropNames) &&
-                Objects.equals(this.descriptiveOntologyTerms, imageSearchRequest.descriptiveOntologyTerms) &&
-                Objects.equals(this.externalReferenceIDs, imageSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, imageSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, imageSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.imageDbIds, imageSearchRequest.imageDbIds) &&
-                Objects.equals(this.imageFileNames, imageSearchRequest.imageFileNames) &&
-                Objects.equals(this.imageFileSizeMax, imageSearchRequest.imageFileSizeMax) &&
-                Objects.equals(this.imageFileSizeMin, imageSearchRequest.imageFileSizeMin) &&
-                Objects.equals(this.imageHeightMax, imageSearchRequest.imageHeightMax) &&
-                Objects.equals(this.imageHeightMin, imageSearchRequest.imageHeightMin) &&
-                Objects.equals(this.imageLocation, imageSearchRequest.imageLocation) &&
-                Objects.equals(this.imageNames, imageSearchRequest.imageNames) &&
-                Objects.equals(this.imageTimeStampRangeEnd, imageSearchRequest.imageTimeStampRangeEnd) &&
-                Objects.equals(this.imageTimeStampRangeStart, imageSearchRequest.imageTimeStampRangeStart) &&
-                Objects.equals(this.imageWidthMax, imageSearchRequest.imageWidthMax) &&
-                Objects.equals(this.imageWidthMin, imageSearchRequest.imageWidthMin) &&
-                Objects.equals(this.mimeTypes, imageSearchRequest.mimeTypes) &&
-                Objects.equals(this.observationDbIds, imageSearchRequest.observationDbIds) &&
-                Objects.equals(this.observationUnitDbIds, imageSearchRequest.observationUnitDbIds) &&
-                Objects.equals(this.page, imageSearchRequest.page) &&
-                Objects.equals(this.pageSize, imageSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, imageSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, imageSearchRequest.programNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, descriptiveOntologyTerms, externalReferenceIDs, externalReferenceIds, externalReferenceSources, imageDbIds, imageFileNames, imageFileSizeMax, imageFileSizeMin, imageHeightMax, imageHeightMin, imageLocation, imageNames, imageTimeStampRangeEnd, imageTimeStampRangeStart, imageWidthMax, imageWidthMin, mimeTypes, observationDbIds, observationUnitDbIds, page, pageSize, programDbIds, programNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ImageSearchRequest {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    descriptiveOntologyTerms: ").append(toIndentedString(descriptiveOntologyTerms)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    imageDbIds: ").append(toIndentedString(imageDbIds)).append("\n");
-        sb.append("    imageFileNames: ").append(toIndentedString(imageFileNames)).append("\n");
-        sb.append("    imageFileSizeMax: ").append(toIndentedString(imageFileSizeMax)).append("\n");
-        sb.append("    imageFileSizeMin: ").append(toIndentedString(imageFileSizeMin)).append("\n");
-        sb.append("    imageHeightMax: ").append(toIndentedString(imageHeightMax)).append("\n");
-        sb.append("    imageHeightMin: ").append(toIndentedString(imageHeightMin)).append("\n");
-        sb.append("    imageLocation: ").append(toIndentedString(imageLocation)).append("\n");
-        sb.append("    imageNames: ").append(toIndentedString(imageNames)).append("\n");
-        sb.append("    imageTimeStampRangeEnd: ").append(toIndentedString(imageTimeStampRangeEnd)).append("\n");
-        sb.append("    imageTimeStampRangeStart: ").append(toIndentedString(imageTimeStampRangeStart)).append("\n");
-        sb.append("    imageWidthMax: ").append(toIndentedString(imageWidthMax)).append("\n");
-        sb.append("    imageWidthMin: ").append(toIndentedString(imageWidthMin)).append("\n");
-        sb.append("    mimeTypes: ").append(toIndentedString(mimeTypes)).append("\n");
-        sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
-        sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageSingleResponse.java
deleted file mode 100644
index a50ea314..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ImageSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ImageSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ImageSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Image result = null;
-
-    public ImageSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ImageSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ImageSingleResponse result(Image result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Image getResult() {
-        return result;
-    }
-
-    public void setResult(Image result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ImageSingleResponse imageSingleResponse = (ImageSingleResponse) o;
-        return Objects.equals(this._atContext, imageSingleResponse._atContext) &&
-                Objects.equals(this.metadata, imageSingleResponse.metadata) &&
-                Objects.equals(this.result, imageSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ImageSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/LinearRing.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/LinearRing.java
deleted file mode 100644
index 55b717c4..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/LinearRing.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An array of at least four positions where the first equals the last
- */
-@Schema(description = "An array of at least four positions where the first equals the last")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class LinearRing extends ArrayList<List> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class LinearRing {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Method.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Method.java
deleted file mode 100644
index e0d6fd8b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Method.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A description of the way an Observation should be collected.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Method \&quot;estimation\&quot; or \&quot;drone image processing\&quot;.
- */
-@Schema(description = "A description of the way an Observation should be collected.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Method \"estimation\" or \"drone image processing\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Method {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("bibliographicalReference")
-    private String bibliographicalReference = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("formula")
-    private String formula = null;
-
-    @SerializedName("methodClass")
-    private String methodClass = null;
-
-    @SerializedName("methodDbId")
-    private String methodDbId = null;
-
-    @SerializedName("methodName")
-    private String methodName = null;
-
-    @SerializedName("methodPUI")
-    private String methodPUI = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    public Method additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Method putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Method bibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-        return this;
-    }
-
-    /**
-     * Bibliographical reference describing the method. &lt;br/&gt;MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.
-     *
-     * @return bibliographicalReference
-     **/
-    @Schema(example = "Smith, 1893, Really Cool Paper, Popular Journal", description = "Bibliographical reference describing the method. <br/>MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.")
-    public String getBibliographicalReference() {
-        return bibliographicalReference;
-    }
-
-    public void setBibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-    }
-
-    public Method description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Method description &lt;br/&gt;MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)
-     *
-     * @return description
-     **/
-    @Schema(example = "A measuring tape was used", description = "Method description <br/>MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Method externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Method addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Method formula(String formula) {
-        this.formula = formula;
-        return this;
-    }
-
-    /**
-     * For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation
-     *
-     * @return formula
-     **/
-    @Schema(example = "a^2 + b^2 = c^2", description = "For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation")
-    public String getFormula() {
-        return formula;
-    }
-
-    public void setFormula(String formula) {
-        this.formula = formula;
-    }
-
-    public Method methodClass(String methodClass) {
-        this.methodClass = methodClass;
-        return this;
-    }
-
-    /**
-     * Method class (examples: \&quot;Measurement\&quot;, \&quot;Counting\&quot;, \&quot;Estimation\&quot;, \&quot;Computation\&quot;, etc.)
-     *
-     * @return methodClass
-     **/
-    @Schema(example = "Measurement", description = "Method class (examples: \"Measurement\", \"Counting\", \"Estimation\", \"Computation\", etc.)")
-    public String getMethodClass() {
-        return methodClass;
-    }
-
-    public void setMethodClass(String methodClass) {
-        this.methodClass = methodClass;
-    }
-
-    public Method methodDbId(String methodDbId) {
-        this.methodDbId = methodDbId;
-        return this;
-    }
-
-    /**
-     * Method unique identifier
-     *
-     * @return methodDbId
-     **/
-    @Schema(example = "0adb2764", description = "Method unique identifier")
-    public String getMethodDbId() {
-        return methodDbId;
-    }
-
-    public void setMethodDbId(String methodDbId) {
-        this.methodDbId = methodDbId;
-    }
-
-    public Method methodName(String methodName) {
-        this.methodName = methodName;
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodName
-     **/
-    @Schema(example = "Measuring Tape", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public String getMethodName() {
-        return methodName;
-    }
-
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
-    public Method methodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000212", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public String getMethodPUI() {
-        return methodPUI;
-    }
-
-    public void setMethodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-    }
-
-    public Method ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Method method = (Method) o;
-        return Objects.equals(this.additionalInfo, method.additionalInfo) &&
-                Objects.equals(this.bibliographicalReference, method.bibliographicalReference) &&
-                Objects.equals(this.description, method.description) &&
-                Objects.equals(this.externalReferences, method.externalReferences) &&
-                Objects.equals(this.formula, method.formula) &&
-                Objects.equals(this.methodClass, method.methodClass) &&
-                Objects.equals(this.methodDbId, method.methodDbId) &&
-                Objects.equals(this.methodName, method.methodName) &&
-                Objects.equals(this.methodPUI, method.methodPUI) &&
-                Objects.equals(this.ontologyReference, method.ontologyReference);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, bibliographicalReference, description, externalReferences, formula, methodClass, methodDbId, methodName, methodPUI, ontologyReference);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Method {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    bibliographicalReference: ").append(toIndentedString(bibliographicalReference)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    formula: ").append(toIndentedString(formula)).append("\n");
-        sb.append("    methodClass: ").append(toIndentedString(methodClass)).append("\n");
-        sb.append("    methodDbId: ").append(toIndentedString(methodDbId)).append("\n");
-        sb.append("    methodName: ").append(toIndentedString(methodName)).append("\n");
-        sb.append("    methodPUI: ").append(toIndentedString(methodPUI)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodBaseClass.java
deleted file mode 100644
index 7dd40878..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodBaseClass.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A description of the way an Observation should be collected.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Method \&quot;estimation\&quot; or \&quot;drone image processing\&quot;.
- */
-@Schema(description = "A description of the way an Observation should be collected.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Method \"estimation\" or \"drone image processing\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class MethodBaseClass {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("bibliographicalReference")
-    private String bibliographicalReference = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("formula")
-    private String formula = null;
-
-    @SerializedName("methodClass")
-    private String methodClass = null;
-
-    @SerializedName("methodName")
-    private String methodName = null;
-
-    @SerializedName("methodPUI")
-    private String methodPUI = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    public MethodBaseClass additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public MethodBaseClass putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public MethodBaseClass bibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-        return this;
-    }
-
-    /**
-     * Bibliographical reference describing the method. &lt;br/&gt;MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.
-     *
-     * @return bibliographicalReference
-     **/
-    @Schema(example = "Smith, 1893, Really Cool Paper, Popular Journal", description = "Bibliographical reference describing the method. <br/>MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.")
-    public String getBibliographicalReference() {
-        return bibliographicalReference;
-    }
-
-    public void setBibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-    }
-
-    public MethodBaseClass description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Method description &lt;br/&gt;MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)
-     *
-     * @return description
-     **/
-    @Schema(example = "A measuring tape was used", description = "Method description <br/>MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public MethodBaseClass externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public MethodBaseClass addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public MethodBaseClass formula(String formula) {
-        this.formula = formula;
-        return this;
-    }
-
-    /**
-     * For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation
-     *
-     * @return formula
-     **/
-    @Schema(example = "a^2 + b^2 = c^2", description = "For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation")
-    public String getFormula() {
-        return formula;
-    }
-
-    public void setFormula(String formula) {
-        this.formula = formula;
-    }
-
-    public MethodBaseClass methodClass(String methodClass) {
-        this.methodClass = methodClass;
-        return this;
-    }
-
-    /**
-     * Method class (examples: \&quot;Measurement\&quot;, \&quot;Counting\&quot;, \&quot;Estimation\&quot;, \&quot;Computation\&quot;, etc.)
-     *
-     * @return methodClass
-     **/
-    @Schema(example = "Measurement", description = "Method class (examples: \"Measurement\", \"Counting\", \"Estimation\", \"Computation\", etc.)")
-    public String getMethodClass() {
-        return methodClass;
-    }
-
-    public void setMethodClass(String methodClass) {
-        this.methodClass = methodClass;
-    }
-
-    public MethodBaseClass methodName(String methodName) {
-        this.methodName = methodName;
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodName
-     **/
-    @Schema(example = "Measuring Tape", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public String getMethodName() {
-        return methodName;
-    }
-
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
-    public MethodBaseClass methodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000212", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public String getMethodPUI() {
-        return methodPUI;
-    }
-
-    public void setMethodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-    }
-
-    public MethodBaseClass ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodBaseClass methodBaseClass = (MethodBaseClass) o;
-        return Objects.equals(this.additionalInfo, methodBaseClass.additionalInfo) &&
-                Objects.equals(this.bibliographicalReference, methodBaseClass.bibliographicalReference) &&
-                Objects.equals(this.description, methodBaseClass.description) &&
-                Objects.equals(this.externalReferences, methodBaseClass.externalReferences) &&
-                Objects.equals(this.formula, methodBaseClass.formula) &&
-                Objects.equals(this.methodClass, methodBaseClass.methodClass) &&
-                Objects.equals(this.methodName, methodBaseClass.methodName) &&
-                Objects.equals(this.methodPUI, methodBaseClass.methodPUI) &&
-                Objects.equals(this.ontologyReference, methodBaseClass.ontologyReference);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, bibliographicalReference, description, externalReferences, formula, methodClass, methodName, methodPUI, ontologyReference);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodBaseClass {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    bibliographicalReference: ").append(toIndentedString(bibliographicalReference)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    formula: ").append(toIndentedString(formula)).append("\n");
-        sb.append("    methodClass: ").append(toIndentedString(methodClass)).append("\n");
-        sb.append("    methodName: ").append(toIndentedString(methodName)).append("\n");
-        sb.append("    methodPUI: ").append(toIndentedString(methodPUI)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodListResponse.java
deleted file mode 100644
index 931e107c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * MethodListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class MethodListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private MethodListResponseResult result = null;
-
-    public MethodListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public MethodListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public MethodListResponse result(MethodListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public MethodListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(MethodListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodListResponse methodListResponse = (MethodListResponse) o;
-        return Objects.equals(this._atContext, methodListResponse._atContext) &&
-                Objects.equals(this.metadata, methodListResponse.metadata) &&
-                Objects.equals(this.result, methodListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodListResponseResult.java
deleted file mode 100644
index b084a1e3..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * MethodListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class MethodListResponseResult {
-    @SerializedName("data")
-    private List<Method> data = new ArrayList<Method>();
-
-    public MethodListResponseResult data(List<Method> data) {
-        this.data = data;
-        return this;
-    }
-
-    public MethodListResponseResult addDataItem(Method dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Method> getData() {
-        return data;
-    }
-
-    public void setData(List<Method> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodListResponseResult methodListResponseResult = (MethodListResponseResult) o;
-        return Objects.equals(this.data, methodListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodNewRequest.java
deleted file mode 100644
index ef50181d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodNewRequest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import java.util.Objects;
-
-/**
- * MethodNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class MethodNewRequest {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash();
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodNewRequest {\n");
-
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodOntologyReference.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodOntologyReference.java
deleted file mode 100644
index cb930ab4..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodOntologyReference.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).
- */
-@Schema(description = "MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class MethodOntologyReference {
-    @SerializedName("documentationLinks")
-    private List<MethodOntologyReferenceDocumentationLinks> documentationLinks = null;
-
-    @SerializedName("ontologyDbId")
-    private String ontologyDbId = null;
-
-    @SerializedName("ontologyName")
-    private String ontologyName = null;
-
-    @SerializedName("version")
-    private String version = null;
-
-    public MethodOntologyReference documentationLinks(List<MethodOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-        return this;
-    }
-
-    public MethodOntologyReference addDocumentationLinksItem(MethodOntologyReferenceDocumentationLinks documentationLinksItem) {
-        if (this.documentationLinks == null) {
-            this.documentationLinks = new ArrayList<MethodOntologyReferenceDocumentationLinks>();
-        }
-        this.documentationLinks.add(documentationLinksItem);
-        return this;
-    }
-
-    /**
-     * links to various ontology documentation
-     *
-     * @return documentationLinks
-     **/
-    @Schema(description = "links to various ontology documentation")
-    public List<MethodOntologyReferenceDocumentationLinks> getDocumentationLinks() {
-        return documentationLinks;
-    }
-
-    public void setDocumentationLinks(List<MethodOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-    }
-
-    public MethodOntologyReference ontologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-        return this;
-    }
-
-    /**
-     * Ontology database unique identifier
-     *
-     * @return ontologyDbId
-     **/
-    @Schema(example = "6b071868", required = true, description = "Ontology database unique identifier")
-    public String getOntologyDbId() {
-        return ontologyDbId;
-    }
-
-    public void setOntologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-    }
-
-    public MethodOntologyReference ontologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-        return this;
-    }
-
-    /**
-     * Ontology name
-     *
-     * @return ontologyName
-     **/
-    @Schema(example = "The Crop Ontology", required = true, description = "Ontology name")
-    public String getOntologyName() {
-        return ontologyName;
-    }
-
-    public void setOntologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-    }
-
-    public MethodOntologyReference version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    /**
-     * Ontology version (no specific format)
-     *
-     * @return version
-     **/
-    @Schema(example = "7.2.3", description = "Ontology version (no specific format)")
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodOntologyReference methodOntologyReference = (MethodOntologyReference) o;
-        return Objects.equals(this.documentationLinks, methodOntologyReference.documentationLinks) &&
-                Objects.equals(this.ontologyDbId, methodOntologyReference.ontologyDbId) &&
-                Objects.equals(this.ontologyName, methodOntologyReference.ontologyName) &&
-                Objects.equals(this.version, methodOntologyReference.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(documentationLinks, ontologyDbId, ontologyName, version);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodOntologyReference {\n");
-
-        sb.append("    documentationLinks: ").append(toIndentedString(documentationLinks)).append("\n");
-        sb.append("    ontologyDbId: ").append(toIndentedString(ontologyDbId)).append("\n");
-        sb.append("    ontologyName: ").append(toIndentedString(ontologyName)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodOntologyReferenceDocumentationLinks.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodOntologyReferenceDocumentationLinks.java
deleted file mode 100644
index 16430564..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodOntologyReferenceDocumentationLinks.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * MethodOntologyReferenceDocumentationLinks
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class MethodOntologyReferenceDocumentationLinks {
-    @SerializedName("URL")
-    private String URL = null;
-
-    /**
-     * Gets or Sets type
-     */
-    @JsonAdapter(TypeEnum.Adapter.class)
-    public enum TypeEnum {
-        OBO("OBO"),
-        RDF("RDF"),
-        WEBPAGE("WEBPAGE");
-
-        private String value;
-
-        TypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static TypeEnum fromValue(String input) {
-            for (TypeEnum b : TypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<TypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final TypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public TypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return TypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("type")
-    private TypeEnum type = null;
-
-    public MethodOntologyReferenceDocumentationLinks URL(String URL) {
-        this.URL = URL;
-        return this;
-    }
-
-    /**
-     * Get URL
-     *
-     * @return URL
-     **/
-    @Schema(example = "http://purl.obolibrary.org/obo/ro.owl", description = "")
-    public String getURL() {
-        return URL;
-    }
-
-    public void setURL(String URL) {
-        this.URL = URL;
-    }
-
-    public MethodOntologyReferenceDocumentationLinks type(TypeEnum type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * Get type
-     *
-     * @return type
-     **/
-    @Schema(example = "OBO", description = "")
-    public TypeEnum getType() {
-        return type;
-    }
-
-    public void setType(TypeEnum type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodOntologyReferenceDocumentationLinks methodOntologyReferenceDocumentationLinks = (MethodOntologyReferenceDocumentationLinks) o;
-        return Objects.equals(this.URL, methodOntologyReferenceDocumentationLinks.URL) &&
-                Objects.equals(this.type, methodOntologyReferenceDocumentationLinks.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(URL, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodOntologyReferenceDocumentationLinks {\n");
-
-        sb.append("    URL: ").append(toIndentedString(URL)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodSingleResponse.java
deleted file mode 100644
index b072f40c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/MethodSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * MethodSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class MethodSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Method result = null;
-
-    public MethodSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public MethodSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public MethodSingleResponse result(Method result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Method getResult() {
-        return result;
-    }
-
-    public void setResult(Method result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MethodSingleResponse methodSingleResponse = (MethodSingleResponse) o;
-        return Objects.equals(this._atContext, methodSingleResponse._atContext) &&
-                Objects.equals(this.metadata, methodSingleResponse.metadata) &&
-                Objects.equals(this.result, methodSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class MethodSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Model202AcceptedSearchResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Model202AcceptedSearchResponse.java
deleted file mode 100644
index abd3241a..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Model202AcceptedSearchResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * Model202AcceptedSearchResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Model202AcceptedSearchResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Model202AcceptedSearchResponseResult result = null;
-
-    public Model202AcceptedSearchResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public Model202AcceptedSearchResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public Model202AcceptedSearchResponse result(Model202AcceptedSearchResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(description = "")
-    public Model202AcceptedSearchResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(Model202AcceptedSearchResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Model202AcceptedSearchResponse _202AcceptedSearchResponse = (Model202AcceptedSearchResponse) o;
-        return Objects.equals(this._atContext, _202AcceptedSearchResponse._atContext) &&
-                Objects.equals(this.metadata, _202AcceptedSearchResponse.metadata) &&
-                Objects.equals(this.result, _202AcceptedSearchResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Model202AcceptedSearchResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Model202AcceptedSearchResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Model202AcceptedSearchResponseResult.java
deleted file mode 100644
index 4ba2fc69..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Model202AcceptedSearchResponseResult.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Model202AcceptedSearchResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Model202AcceptedSearchResponseResult {
-    @SerializedName("searchResultsDbId")
-    private String searchResultsDbId = null;
-
-    public Model202AcceptedSearchResponseResult searchResultsDbId(String searchResultsDbId) {
-        this.searchResultsDbId = searchResultsDbId;
-        return this;
-    }
-
-    /**
-     * Get searchResultsDbId
-     *
-     * @return searchResultsDbId
-     **/
-    @Schema(example = "551ae08c", description = "")
-    public String getSearchResultsDbId() {
-        return searchResultsDbId;
-    }
-
-    public void setSearchResultsDbId(String searchResultsDbId) {
-        this.searchResultsDbId = searchResultsDbId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Model202AcceptedSearchResponseResult _202AcceptedSearchResponseResult = (Model202AcceptedSearchResponseResult) o;
-        return Objects.equals(this.searchResultsDbId, _202AcceptedSearchResponseResult.searchResultsDbId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(searchResultsDbId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Model202AcceptedSearchResponseResult {\n");
-
-        sb.append("    searchResultsDbId: ").append(toIndentedString(searchResultsDbId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Observation.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Observation.java
deleted file mode 100644
index f95e9653..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Observation.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * Observation
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Observation {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("collector")
-    private String collector = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("geoCoordinates")
-    private GeoJSON geoCoordinates = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("observationDbId")
-    private String observationDbId = null;
-
-    @SerializedName("observationTimeStamp")
-    private OffsetDateTime observationTimeStamp = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    @SerializedName("observationUnitName")
-    private String observationUnitName = null;
-
-    @SerializedName("observationVariableDbId")
-    private String observationVariableDbId = null;
-
-    @SerializedName("observationVariableName")
-    private String observationVariableName = null;
-
-    @SerializedName("season")
-    private ObservationSeason season = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("uploadedBy")
-    private String uploadedBy = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    public Observation additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Observation putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Observation collector(String collector) {
-        this.collector = collector;
-        return this;
-    }
-
-    /**
-     * The name or identifier of the entity which collected the observation
-     *
-     * @return collector
-     **/
-    @Schema(example = "917d3ae0", description = "The name or identifier of the entity which collected the observation")
-    public String getCollector() {
-        return collector;
-    }
-
-    public void setCollector(String collector) {
-        this.collector = collector;
-    }
-
-    public Observation externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Observation addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Observation geoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-        return this;
-    }
-
-    /**
-     * Get geoCoordinates
-     *
-     * @return geoCoordinates
-     **/
-    @Schema(description = "")
-    public GeoJSON getGeoCoordinates() {
-        return geoCoordinates;
-    }
-
-    public void setGeoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-    }
-
-    public Observation germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "2408ab11", description = "The ID which uniquely identifies a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public Observation germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * Name of the germplasm. It can be the preferred name and does not have to be unique.
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000003", description = "Name of the germplasm. It can be the preferred name and does not have to be unique.")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public Observation observationDbId(String observationDbId) {
-        this.observationDbId = observationDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation
-     *
-     * @return observationDbId
-     **/
-    @Schema(example = "ef24b615", description = "The ID which uniquely identifies an observation")
-    public String getObservationDbId() {
-        return observationDbId;
-    }
-
-    public void setObservationDbId(String observationDbId) {
-        this.observationDbId = observationDbId;
-    }
-
-    public Observation observationTimeStamp(OffsetDateTime observationTimeStamp) {
-        this.observationTimeStamp = observationTimeStamp;
-        return this;
-    }
-
-    /**
-     * The date and time when this observation was made
-     *
-     * @return observationTimeStamp
-     **/
-    @Schema(description = "The date and time when this observation was made")
-    public OffsetDateTime getObservationTimeStamp() {
-        return observationTimeStamp;
-    }
-
-    public void setObservationTimeStamp(OffsetDateTime observationTimeStamp) {
-        this.observationTimeStamp = observationTimeStamp;
-    }
-
-    public Observation observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation unit
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "598111d4", description = "The ID which uniquely identifies an observation unit")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-    public Observation observationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-        return this;
-    }
-
-    /**
-     * A human readable name for an observation unit
-     *
-     * @return observationUnitName
-     **/
-    @Schema(example = "Plot 1", description = "A human readable name for an observation unit")
-    public String getObservationUnitName() {
-        return observationUnitName;
-    }
-
-    public void setObservationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-    }
-
-    public Observation observationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation variable
-     *
-     * @return observationVariableDbId
-     **/
-    @Schema(example = "c403d107", description = "The ID which uniquely identifies an observation variable")
-    public String getObservationVariableDbId() {
-        return observationVariableDbId;
-    }
-
-    public void setObservationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-    }
-
-    public Observation observationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-        return this;
-    }
-
-    /**
-     * A human readable name for an observation variable
-     *
-     * @return observationVariableName
-     **/
-    @Schema(example = "Plant Height in meters", description = "A human readable name for an observation variable")
-    public String getObservationVariableName() {
-        return observationVariableName;
-    }
-
-    public void setObservationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-    }
-
-    public Observation season(ObservationSeason season) {
-        this.season = season;
-        return this;
-    }
-
-    /**
-     * Get season
-     *
-     * @return season
-     **/
-    @Schema(description = "")
-    public ObservationSeason getSeason() {
-        return season;
-    }
-
-    public void setSeason(ObservationSeason season) {
-        this.season = season;
-    }
-
-    public Observation studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a study within the given database server
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "ef2829db", description = "The ID which uniquely identifies a study within the given database server")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public Observation uploadedBy(String uploadedBy) {
-        this.uploadedBy = uploadedBy;
-        return this;
-    }
-
-    /**
-     * The name or id of the user who uploaded the observation to the database system
-     *
-     * @return uploadedBy
-     **/
-    @Schema(example = "a2f7f60b", description = "The name or id of the user who uploaded the observation to the database system")
-    public String getUploadedBy() {
-        return uploadedBy;
-    }
-
-    public void setUploadedBy(String uploadedBy) {
-        this.uploadedBy = uploadedBy;
-    }
-
-    public Observation value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * The value of the data collected as an observation
-     *
-     * @return value
-     **/
-    @Schema(example = "2.3", description = "The value of the data collected as an observation")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Observation observation = (Observation) o;
-        return Objects.equals(this.additionalInfo, observation.additionalInfo) &&
-                Objects.equals(this.collector, observation.collector) &&
-                Objects.equals(this.externalReferences, observation.externalReferences) &&
-                Objects.equals(this.geoCoordinates, observation.geoCoordinates) &&
-                Objects.equals(this.germplasmDbId, observation.germplasmDbId) &&
-                Objects.equals(this.germplasmName, observation.germplasmName) &&
-                Objects.equals(this.observationDbId, observation.observationDbId) &&
-                Objects.equals(this.observationTimeStamp, observation.observationTimeStamp) &&
-                Objects.equals(this.observationUnitDbId, observation.observationUnitDbId) &&
-                Objects.equals(this.observationUnitName, observation.observationUnitName) &&
-                Objects.equals(this.observationVariableDbId, observation.observationVariableDbId) &&
-                Objects.equals(this.observationVariableName, observation.observationVariableName) &&
-                Objects.equals(this.season, observation.season) &&
-                Objects.equals(this.studyDbId, observation.studyDbId) &&
-                Objects.equals(this.uploadedBy, observation.uploadedBy) &&
-                Objects.equals(this.value, observation.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, collector, externalReferences, geoCoordinates, germplasmDbId, germplasmName, observationDbId, observationTimeStamp, observationUnitDbId, observationUnitName, observationVariableDbId, observationVariableName, season, studyDbId, uploadedBy, value);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Observation {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    collector: ").append(toIndentedString(collector)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    geoCoordinates: ").append(toIndentedString(geoCoordinates)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    observationDbId: ").append(toIndentedString(observationDbId)).append("\n");
-        sb.append("    observationTimeStamp: ").append(toIndentedString(observationTimeStamp)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("    observationUnitName: ").append(toIndentedString(observationUnitName)).append("\n");
-        sb.append("    observationVariableDbId: ").append(toIndentedString(observationVariableDbId)).append("\n");
-        sb.append("    observationVariableName: ").append(toIndentedString(observationVariableName)).append("\n");
-        sb.append("    season: ").append(toIndentedString(season)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    uploadedBy: ").append(toIndentedString(uploadedBy)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationDeleteResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationDeleteResponse.java
deleted file mode 100644
index eb3c500c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationDeleteResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ObservationDeleteResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationDeleteResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationDeleteResponseResult result = null;
-
-    public ObservationDeleteResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationDeleteResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationDeleteResponse result(ObservationDeleteResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationDeleteResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationDeleteResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationDeleteResponse observationDeleteResponse = (ObservationDeleteResponse) o;
-        return Objects.equals(this._atContext, observationDeleteResponse._atContext) &&
-                Objects.equals(this.metadata, observationDeleteResponse.metadata) &&
-                Objects.equals(this.result, observationDeleteResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationDeleteResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationDeleteResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationDeleteResponseResult.java
deleted file mode 100644
index 76ac8c38..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationDeleteResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationDeleteResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationDeleteResponseResult {
-    @SerializedName("observationDbIds")
-    private List<String> observationDbIds = new ArrayList<String>();
-
-    public ObservationDeleteResponseResult observationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-        return this;
-    }
-
-    public ObservationDeleteResponseResult addObservationDbIdsItem(String observationDbIdsItem) {
-        this.observationDbIds.add(observationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique ids of the Observation records which have been successfully deleted
-     *
-     * @return observationDbIds
-     **/
-    @Schema(example = "[\"6a4a59d8\",\"3ff067e0\"]", required = true, description = "The unique ids of the Observation records which have been successfully deleted")
-    public List<String> getObservationDbIds() {
-        return observationDbIds;
-    }
-
-    public void setObservationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationDeleteResponseResult observationDeleteResponseResult = (ObservationDeleteResponseResult) o;
-        return Objects.equals(this.observationDbIds, observationDeleteResponseResult.observationDbIds);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(observationDbIds);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationDeleteResponseResult {\n");
-
-        sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationLevelListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationLevelListResponse.java
deleted file mode 100644
index 2c4c6f23..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationLevelListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ObservationLevelListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationLevelListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationLevelListResponseResult result = null;
-
-    public ObservationLevelListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationLevelListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationLevelListResponse result(ObservationLevelListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationLevelListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationLevelListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationLevelListResponse observationLevelListResponse = (ObservationLevelListResponse) o;
-        return Objects.equals(this._atContext, observationLevelListResponse._atContext) &&
-                Objects.equals(this.metadata, observationLevelListResponse.metadata) &&
-                Objects.equals(this.result, observationLevelListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationLevelListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationLevelListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationLevelListResponseResult.java
deleted file mode 100644
index 6556075e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationLevelListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationLevelListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationLevelListResponseResult {
-    @SerializedName("data")
-    private List<ObservationUnitHierarchyLevel> data = new ArrayList<ObservationUnitHierarchyLevel>();
-
-    public ObservationLevelListResponseResult data(List<ObservationUnitHierarchyLevel> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ObservationLevelListResponseResult addDataItem(ObservationUnitHierarchyLevel dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(example = "[{\"levelName\":\"field\",\"levelOrder\":0},{\"levelName\":\"block\",\"levelOrder\":1},{\"levelName\":\"plot\",\"levelOrder\":2},{\"levelName\":\"sub-plot\",\"levelOrder\":3},{\"levelName\":\"plant\",\"levelOrder\":4}]", required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<ObservationUnitHierarchyLevel> getData() {
-        return data;
-    }
-
-    public void setData(List<ObservationUnitHierarchyLevel> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationLevelListResponseResult observationLevelListResponseResult = (ObservationLevelListResponseResult) o;
-        return Objects.equals(this.data, observationLevelListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationLevelListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationListResponse.java
deleted file mode 100644
index 34ea1921..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ObservationListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationListResponseResult result = null;
-
-    public ObservationListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationListResponse result(ObservationListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationListResponse observationListResponse = (ObservationListResponse) o;
-        return Objects.equals(this._atContext, observationListResponse._atContext) &&
-                Objects.equals(this.metadata, observationListResponse.metadata) &&
-                Objects.equals(this.result, observationListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationListResponseResult.java
deleted file mode 100644
index 977f36c5..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationListResponseResult {
-    @SerializedName("data")
-    private List<Observation> data = new ArrayList<Observation>();
-
-    public ObservationListResponseResult data(List<Observation> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ObservationListResponseResult addDataItem(Observation dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Observation> getData() {
-        return data;
-    }
-
-    public void setData(List<Observation> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationListResponseResult observationListResponseResult = (ObservationListResponseResult) o;
-        return Objects.equals(this.data, observationListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationNewRequest.java
deleted file mode 100644
index 758011d4..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationNewRequest.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * ObservationNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("collector")
-    private String collector = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("geoCoordinates")
-    private GeoJSON geoCoordinates = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("observationTimeStamp")
-    private OffsetDateTime observationTimeStamp = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    @SerializedName("observationUnitName")
-    private String observationUnitName = null;
-
-    @SerializedName("observationVariableDbId")
-    private String observationVariableDbId = null;
-
-    @SerializedName("observationVariableName")
-    private String observationVariableName = null;
-
-    @SerializedName("season")
-    private ObservationSeason season = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("uploadedBy")
-    private String uploadedBy = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    public ObservationNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationNewRequest collector(String collector) {
-        this.collector = collector;
-        return this;
-    }
-
-    /**
-     * The name or identifier of the entity which collected the observation
-     *
-     * @return collector
-     **/
-    @Schema(example = "917d3ae0", description = "The name or identifier of the entity which collected the observation")
-    public String getCollector() {
-        return collector;
-    }
-
-    public void setCollector(String collector) {
-        this.collector = collector;
-    }
-
-    public ObservationNewRequest externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationNewRequest addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationNewRequest geoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-        return this;
-    }
-
-    /**
-     * Get geoCoordinates
-     *
-     * @return geoCoordinates
-     **/
-    @Schema(description = "")
-    public GeoJSON getGeoCoordinates() {
-        return geoCoordinates;
-    }
-
-    public void setGeoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-    }
-
-    public ObservationNewRequest germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "2408ab11", description = "The ID which uniquely identifies a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public ObservationNewRequest germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * Name of the germplasm. It can be the preferred name and does not have to be unique.
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000003", description = "Name of the germplasm. It can be the preferred name and does not have to be unique.")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public ObservationNewRequest observationTimeStamp(OffsetDateTime observationTimeStamp) {
-        this.observationTimeStamp = observationTimeStamp;
-        return this;
-    }
-
-    /**
-     * The date and time when this observation was made
-     *
-     * @return observationTimeStamp
-     **/
-    @Schema(description = "The date and time when this observation was made")
-    public OffsetDateTime getObservationTimeStamp() {
-        return observationTimeStamp;
-    }
-
-    public void setObservationTimeStamp(OffsetDateTime observationTimeStamp) {
-        this.observationTimeStamp = observationTimeStamp;
-    }
-
-    public ObservationNewRequest observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation unit
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "598111d4", description = "The ID which uniquely identifies an observation unit")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-    public ObservationNewRequest observationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-        return this;
-    }
-
-    /**
-     * A human readable name for an observation unit
-     *
-     * @return observationUnitName
-     **/
-    @Schema(example = "Plot 1", description = "A human readable name for an observation unit")
-    public String getObservationUnitName() {
-        return observationUnitName;
-    }
-
-    public void setObservationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-    }
-
-    public ObservationNewRequest observationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation variable
-     *
-     * @return observationVariableDbId
-     **/
-    @Schema(example = "c403d107", description = "The ID which uniquely identifies an observation variable")
-    public String getObservationVariableDbId() {
-        return observationVariableDbId;
-    }
-
-    public void setObservationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-    }
-
-    public ObservationNewRequest observationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-        return this;
-    }
-
-    /**
-     * A human readable name for an observation variable
-     *
-     * @return observationVariableName
-     **/
-    @Schema(example = "Plant Height in meters", description = "A human readable name for an observation variable")
-    public String getObservationVariableName() {
-        return observationVariableName;
-    }
-
-    public void setObservationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-    }
-
-    public ObservationNewRequest season(ObservationSeason season) {
-        this.season = season;
-        return this;
-    }
-
-    /**
-     * Get season
-     *
-     * @return season
-     **/
-    @Schema(description = "")
-    public ObservationSeason getSeason() {
-        return season;
-    }
-
-    public void setSeason(ObservationSeason season) {
-        this.season = season;
-    }
-
-    public ObservationNewRequest studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a study within the given database server
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "ef2829db", description = "The ID which uniquely identifies a study within the given database server")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public ObservationNewRequest uploadedBy(String uploadedBy) {
-        this.uploadedBy = uploadedBy;
-        return this;
-    }
-
-    /**
-     * The name or id of the user who uploaded the observation to the database system
-     *
-     * @return uploadedBy
-     **/
-    @Schema(example = "a2f7f60b", description = "The name or id of the user who uploaded the observation to the database system")
-    public String getUploadedBy() {
-        return uploadedBy;
-    }
-
-    public void setUploadedBy(String uploadedBy) {
-        this.uploadedBy = uploadedBy;
-    }
-
-    public ObservationNewRequest value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * The value of the data collected as an observation
-     *
-     * @return value
-     **/
-    @Schema(example = "2.3", description = "The value of the data collected as an observation")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationNewRequest observationNewRequest = (ObservationNewRequest) o;
-        return Objects.equals(this.additionalInfo, observationNewRequest.additionalInfo) &&
-                Objects.equals(this.collector, observationNewRequest.collector) &&
-                Objects.equals(this.externalReferences, observationNewRequest.externalReferences) &&
-                Objects.equals(this.geoCoordinates, observationNewRequest.geoCoordinates) &&
-                Objects.equals(this.germplasmDbId, observationNewRequest.germplasmDbId) &&
-                Objects.equals(this.germplasmName, observationNewRequest.germplasmName) &&
-                Objects.equals(this.observationTimeStamp, observationNewRequest.observationTimeStamp) &&
-                Objects.equals(this.observationUnitDbId, observationNewRequest.observationUnitDbId) &&
-                Objects.equals(this.observationUnitName, observationNewRequest.observationUnitName) &&
-                Objects.equals(this.observationVariableDbId, observationNewRequest.observationVariableDbId) &&
-                Objects.equals(this.observationVariableName, observationNewRequest.observationVariableName) &&
-                Objects.equals(this.season, observationNewRequest.season) &&
-                Objects.equals(this.studyDbId, observationNewRequest.studyDbId) &&
-                Objects.equals(this.uploadedBy, observationNewRequest.uploadedBy) &&
-                Objects.equals(this.value, observationNewRequest.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, collector, externalReferences, geoCoordinates, germplasmDbId, germplasmName, observationTimeStamp, observationUnitDbId, observationUnitName, observationVariableDbId, observationVariableName, season, studyDbId, uploadedBy, value);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    collector: ").append(toIndentedString(collector)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    geoCoordinates: ").append(toIndentedString(geoCoordinates)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    observationTimeStamp: ").append(toIndentedString(observationTimeStamp)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("    observationUnitName: ").append(toIndentedString(observationUnitName)).append("\n");
-        sb.append("    observationVariableDbId: ").append(toIndentedString(observationVariableDbId)).append("\n");
-        sb.append("    observationVariableName: ").append(toIndentedString(observationVariableName)).append("\n");
-        sb.append("    season: ").append(toIndentedString(season)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    uploadedBy: ").append(toIndentedString(uploadedBy)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationSearchRequest.java
deleted file mode 100644
index 434063a1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationSearchRequest.java
+++ /dev/null
@@ -1,867 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationSearchRequest {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("locationDbIds")
-    private List<String> locationDbIds = null;
-
-    @SerializedName("locationNames")
-    private List<String> locationNames = null;
-
-    @SerializedName("observationDbIds")
-    private List<String> observationDbIds = null;
-
-    @SerializedName("observationLevelRelationships")
-    private List<ObservationUnitLevelRelationship1> observationLevelRelationships = null;
-
-    @SerializedName("observationLevels")
-    private List<ObservationUnitLevel1> observationLevels = null;
-
-    @SerializedName("observationTimeStampRangeEnd")
-    private OffsetDateTime observationTimeStampRangeEnd = null;
-
-    @SerializedName("observationTimeStampRangeStart")
-    private OffsetDateTime observationTimeStampRangeStart = null;
-
-    @SerializedName("observationUnitDbIds")
-    private List<String> observationUnitDbIds = null;
-
-    @SerializedName("observationVariableDbIds")
-    private List<String> observationVariableDbIds = null;
-
-    @SerializedName("observationVariableNames")
-    private List<String> observationVariableNames = null;
-
-    @SerializedName("observationVariablePUIs")
-    private List<String> observationVariablePUIs = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("seasonDbIds")
-    private List<String> seasonDbIds = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public ObservationSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public ObservationSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public ObservationSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public ObservationSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public ObservationSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public ObservationSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public ObservationSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public ObservationSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public ObservationSearchRequest germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public ObservationSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public ObservationSearchRequest locationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addLocationDbIdsItem(String locationDbIdsItem) {
-        if (this.locationDbIds == null) {
-            this.locationDbIds = new ArrayList<String>();
-        }
-        this.locationDbIds.add(locationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The location ids to search for
-     *
-     * @return locationDbIds
-     **/
-    @Schema(example = "[\"b28911cf\",\"5071d1e4\"]", description = "The location ids to search for")
-    public List<String> getLocationDbIds() {
-        return locationDbIds;
-    }
-
-    public void setLocationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-    }
-
-    public ObservationSearchRequest locationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-        return this;
-    }
-
-    public ObservationSearchRequest addLocationNamesItem(String locationNamesItem) {
-        if (this.locationNames == null) {
-            this.locationNames = new ArrayList<String>();
-        }
-        this.locationNames.add(locationNamesItem);
-        return this;
-    }
-
-    /**
-     * A human readable names to search for
-     *
-     * @return locationNames
-     **/
-    @Schema(example = "[\"Location Alpha\",\"The Large Hadron Collider\"]", description = "A human readable names to search for")
-    public List<String> getLocationNames() {
-        return locationNames;
-    }
-
-    public void setLocationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-    }
-
-    public ObservationSearchRequest observationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addObservationDbIdsItem(String observationDbIdsItem) {
-        if (this.observationDbIds == null) {
-            this.observationDbIds = new ArrayList<String>();
-        }
-        this.observationDbIds.add(observationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique id of an Observation
-     *
-     * @return observationDbIds
-     **/
-    @Schema(example = "[\"6a4a59d8\",\"3ff067e0\"]", description = "The unique id of an Observation")
-    public List<String> getObservationDbIds() {
-        return observationDbIds;
-    }
-
-    public void setObservationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-    }
-
-    public ObservationSearchRequest observationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-        return this;
-    }
-
-    public ObservationSearchRequest addObservationLevelRelationshipsItem(ObservationUnitLevelRelationship1 observationLevelRelationshipsItem) {
-        if (this.observationLevelRelationships == null) {
-            this.observationLevelRelationships = new ArrayList<ObservationUnitLevelRelationship1>();
-        }
-        this.observationLevelRelationships.add(observationLevelRelationshipsItem);
-        return this;
-    }
-
-    /**
-     * Searches for values in ObservationUnit-&gt;observationUnitPosition-&gt;observationLevelRelationships
-     *
-     * @return observationLevelRelationships
-     **/
-    @Schema(example = "[{\"levelCode\":\"Field_1\",\"levelName\":\"field\"}]", description = "Searches for values in ObservationUnit->observationUnitPosition->observationLevelRelationships")
-    public List<ObservationUnitLevelRelationship1> getObservationLevelRelationships() {
-        return observationLevelRelationships;
-    }
-
-    public void setObservationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-    }
-
-    public ObservationSearchRequest observationLevels(List<ObservationUnitLevel1> observationLevels) {
-        this.observationLevels = observationLevels;
-        return this;
-    }
-
-    public ObservationSearchRequest addObservationLevelsItem(ObservationUnitLevel1 observationLevelsItem) {
-        if (this.observationLevels == null) {
-            this.observationLevels = new ArrayList<ObservationUnitLevel1>();
-        }
-        this.observationLevels.add(observationLevelsItem);
-        return this;
-    }
-
-    /**
-     * Searches for values in ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel
-     *
-     * @return observationLevels
-     **/
-    @Schema(example = "[{\"levelCode\":\"Plot_123\",\"levelName\":\"plot\"},{\"levelCode\":\"Plot_456\",\"levelName\":\"plot\"},{\"levelCode\":\"Plot_789\",\"levelName\":\"plot\"}]", description = "Searches for values in ObservationUnit->observationUnitPosition->observationLevel")
-    public List<ObservationUnitLevel1> getObservationLevels() {
-        return observationLevels;
-    }
-
-    public void setObservationLevels(List<ObservationUnitLevel1> observationLevels) {
-        this.observationLevels = observationLevels;
-    }
-
-    public ObservationSearchRequest observationTimeStampRangeEnd(OffsetDateTime observationTimeStampRangeEnd) {
-        this.observationTimeStampRangeEnd = observationTimeStampRangeEnd;
-        return this;
-    }
-
-    /**
-     * Timestamp range end
-     *
-     * @return observationTimeStampRangeEnd
-     **/
-    @Schema(description = "Timestamp range end")
-    public OffsetDateTime getObservationTimeStampRangeEnd() {
-        return observationTimeStampRangeEnd;
-    }
-
-    public void setObservationTimeStampRangeEnd(OffsetDateTime observationTimeStampRangeEnd) {
-        this.observationTimeStampRangeEnd = observationTimeStampRangeEnd;
-    }
-
-    public ObservationSearchRequest observationTimeStampRangeStart(OffsetDateTime observationTimeStampRangeStart) {
-        this.observationTimeStampRangeStart = observationTimeStampRangeStart;
-        return this;
-    }
-
-    /**
-     * Timestamp range start
-     *
-     * @return observationTimeStampRangeStart
-     **/
-    @Schema(description = "Timestamp range start")
-    public OffsetDateTime getObservationTimeStampRangeStart() {
-        return observationTimeStampRangeStart;
-    }
-
-    public void setObservationTimeStampRangeStart(OffsetDateTime observationTimeStampRangeStart) {
-        this.observationTimeStampRangeStart = observationTimeStampRangeStart;
-    }
-
-    public ObservationSearchRequest observationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-        if (this.observationUnitDbIds == null) {
-            this.observationUnitDbIds = new ArrayList<String>();
-        }
-        this.observationUnitDbIds.add(observationUnitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique id of an Observation Unit
-     *
-     * @return observationUnitDbIds
-     **/
-    @Schema(example = "[\"76f559b5\",\"066bc5d3\"]", description = "The unique id of an Observation Unit")
-    public List<String> getObservationUnitDbIds() {
-        return observationUnitDbIds;
-    }
-
-    public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-    }
-
-    public ObservationSearchRequest observationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-        if (this.observationVariableDbIds == null) {
-            this.observationVariableDbIds = new ArrayList<String>();
-        }
-        this.observationVariableDbIds.add(observationVariableDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The DbIds of Variables to search for
-     *
-     * @return observationVariableDbIds
-     **/
-    @Schema(example = "[\"a646187d\",\"6d23513b\"]", description = "The DbIds of Variables to search for")
-    public List<String> getObservationVariableDbIds() {
-        return observationVariableDbIds;
-    }
-
-    public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-    }
-
-    public ObservationSearchRequest observationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-        return this;
-    }
-
-    public ObservationSearchRequest addObservationVariableNamesItem(String observationVariableNamesItem) {
-        if (this.observationVariableNames == null) {
-            this.observationVariableNames = new ArrayList<String>();
-        }
-        this.observationVariableNames.add(observationVariableNamesItem);
-        return this;
-    }
-
-    /**
-     * The names of Variables to search for
-     *
-     * @return observationVariableNames
-     **/
-    @Schema(example = "[\"Plant Height in meters\",\"Wheat rust score 1-5\"]", description = "The names of Variables to search for")
-    public List<String> getObservationVariableNames() {
-        return observationVariableNames;
-    }
-
-    public void setObservationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-    }
-
-    public ObservationSearchRequest observationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-        return this;
-    }
-
-    public ObservationSearchRequest addObservationVariablePUIsItem(String observationVariablePUIsItem) {
-        if (this.observationVariablePUIs == null) {
-            this.observationVariablePUIs = new ArrayList<String>();
-        }
-        this.observationVariablePUIs.add(observationVariablePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI
-     *
-     * @return observationVariablePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008012\",\"http://my-traits.com/trait/CO_123:0007261\"]", description = "The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI")
-    public List<String> getObservationVariablePUIs() {
-        return observationVariablePUIs;
-    }
-
-    public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-    }
-
-    public ObservationSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public ObservationSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public ObservationSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public ObservationSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public ObservationSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public ObservationSearchRequest seasonDbIds(List<String> seasonDbIds) {
-        this.seasonDbIds = seasonDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addSeasonDbIdsItem(String seasonDbIdsItem) {
-        if (this.seasonDbIds == null) {
-            this.seasonDbIds = new ArrayList<String>();
-        }
-        this.seasonDbIds.add(seasonDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The year or Phenotyping campaign of a multi-annual study (trees, grape, ...)
-     *
-     * @return seasonDbIds
-     **/
-    @Schema(example = "[\"Spring 2018\",\"Season A\"]", description = "The year or Phenotyping campaign of a multi-annual study (trees, grape, ...)")
-    public List<String> getSeasonDbIds() {
-        return seasonDbIds;
-    }
-
-    public void setSeasonDbIds(List<String> seasonDbIds) {
-        this.seasonDbIds = seasonDbIds;
-    }
-
-    public ObservationSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public ObservationSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public ObservationSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public ObservationSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public ObservationSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public ObservationSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public ObservationSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationSearchRequest observationSearchRequest = (ObservationSearchRequest) o;
-        return Objects.equals(this.commonCropNames, observationSearchRequest.commonCropNames) &&
-                Objects.equals(this.externalReferenceIDs, observationSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, observationSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, observationSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.germplasmDbIds, observationSearchRequest.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, observationSearchRequest.germplasmNames) &&
-                Objects.equals(this.locationDbIds, observationSearchRequest.locationDbIds) &&
-                Objects.equals(this.locationNames, observationSearchRequest.locationNames) &&
-                Objects.equals(this.observationDbIds, observationSearchRequest.observationDbIds) &&
-                Objects.equals(this.observationLevelRelationships, observationSearchRequest.observationLevelRelationships) &&
-                Objects.equals(this.observationLevels, observationSearchRequest.observationLevels) &&
-                Objects.equals(this.observationTimeStampRangeEnd, observationSearchRequest.observationTimeStampRangeEnd) &&
-                Objects.equals(this.observationTimeStampRangeStart, observationSearchRequest.observationTimeStampRangeStart) &&
-                Objects.equals(this.observationUnitDbIds, observationSearchRequest.observationUnitDbIds) &&
-                Objects.equals(this.observationVariableDbIds, observationSearchRequest.observationVariableDbIds) &&
-                Objects.equals(this.observationVariableNames, observationSearchRequest.observationVariableNames) &&
-                Objects.equals(this.observationVariablePUIs, observationSearchRequest.observationVariablePUIs) &&
-                Objects.equals(this.page, observationSearchRequest.page) &&
-                Objects.equals(this.pageSize, observationSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, observationSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, observationSearchRequest.programNames) &&
-                Objects.equals(this.seasonDbIds, observationSearchRequest.seasonDbIds) &&
-                Objects.equals(this.studyDbIds, observationSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, observationSearchRequest.studyNames) &&
-                Objects.equals(this.trialDbIds, observationSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, observationSearchRequest.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds, germplasmNames, locationDbIds, locationNames, observationDbIds, observationLevelRelationships, observationLevels, observationTimeStampRangeEnd, observationTimeStampRangeStart, observationUnitDbIds, observationVariableDbIds, observationVariableNames, observationVariablePUIs, page, pageSize, programDbIds, programNames, seasonDbIds, studyDbIds, studyNames, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationSearchRequest {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-        sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-        sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
-        sb.append("    observationLevelRelationships: ").append(toIndentedString(observationLevelRelationships)).append("\n");
-        sb.append("    observationLevels: ").append(toIndentedString(observationLevels)).append("\n");
-        sb.append("    observationTimeStampRangeEnd: ").append(toIndentedString(observationTimeStampRangeEnd)).append("\n");
-        sb.append("    observationTimeStampRangeStart: ").append(toIndentedString(observationTimeStampRangeStart)).append("\n");
-        sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-        sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-        sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
-        sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    seasonDbIds: ").append(toIndentedString(seasonDbIds)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationSeason.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationSeason.java
deleted file mode 100644
index 5dc30097..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationSeason.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationSeason
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationSeason {
-    @SerializedName("season")
-    private String season = null;
-
-    @SerializedName("seasonDbId")
-    private String seasonDbId = null;
-
-    @SerializedName("seasonName")
-    private String seasonName = null;
-
-    @SerializedName("year")
-    private Integer year = null;
-
-    public ObservationSeason season(String season) {
-        this.season = season;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;seasonName&#x60;. Github issue number #456  &lt;br&gt;Name of the season. ex. &#x27;Spring&#x27;, &#x27;Q2&#x27;, &#x27;Season A&#x27;, etc.
-     *
-     * @return season
-     **/
-    @Schema(example = "Spring", description = "**Deprecated in v2.1** Please use `seasonName`. Github issue number #456  <br>Name of the season. ex. 'Spring', 'Q2', 'Season A', etc.")
-    public String getSeason() {
-        return season;
-    }
-
-    public void setSeason(String season) {
-        this.season = season;
-    }
-
-    public ObservationSeason seasonDbId(String seasonDbId) {
-        this.seasonDbId = seasonDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a season. For backward compatibility it can be a string like &#x27;2012&#x27;, &#x27;1957-2004&#x27;
-     *
-     * @return seasonDbId
-     **/
-    @Schema(example = "Spring_2018", required = true, description = "The ID which uniquely identifies a season. For backward compatibility it can be a string like '2012', '1957-2004'")
-    public String getSeasonDbId() {
-        return seasonDbId;
-    }
-
-    public void setSeasonDbId(String seasonDbId) {
-        this.seasonDbId = seasonDbId;
-    }
-
-    public ObservationSeason seasonName(String seasonName) {
-        this.seasonName = seasonName;
-        return this;
-    }
-
-    /**
-     * Name of the season. ex. &#x27;Spring&#x27;, &#x27;Q2&#x27;, &#x27;Season A&#x27;, etc.
-     *
-     * @return seasonName
-     **/
-    @Schema(example = "Spring", description = "Name of the season. ex. 'Spring', 'Q2', 'Season A', etc.")
-    public String getSeasonName() {
-        return seasonName;
-    }
-
-    public void setSeasonName(String seasonName) {
-        this.seasonName = seasonName;
-    }
-
-    public ObservationSeason year(Integer year) {
-        this.year = year;
-        return this;
-    }
-
-    /**
-     * The 4 digit year of the season.
-     *
-     * @return year
-     **/
-    @Schema(example = "2018", description = "The 4 digit year of the season.")
-    public Integer getYear() {
-        return year;
-    }
-
-    public void setYear(Integer year) {
-        this.year = year;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationSeason observationSeason = (ObservationSeason) o;
-        return Objects.equals(this.season, observationSeason.season) &&
-                Objects.equals(this.seasonDbId, observationSeason.seasonDbId) &&
-                Objects.equals(this.seasonName, observationSeason.seasonName) &&
-                Objects.equals(this.year, observationSeason.year);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(season, seasonDbId, seasonName, year);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationSeason {\n");
-
-        sb.append("    season: ").append(toIndentedString(season)).append("\n");
-        sb.append("    seasonDbId: ").append(toIndentedString(seasonDbId)).append("\n");
-        sb.append("    seasonName: ").append(toIndentedString(seasonName)).append("\n");
-        sb.append("    year: ").append(toIndentedString(year)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationSingleResponse.java
deleted file mode 100644
index 20d40742..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ObservationSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Observation result = null;
-
-    public ObservationSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationSingleResponse result(Observation result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Observation getResult() {
-        return result;
-    }
-
-    public void setResult(Observation result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationSingleResponse observationSingleResponse = (ObservationSingleResponse) o;
-        return Objects.equals(this._atContext, observationSingleResponse._atContext) &&
-                Objects.equals(this.metadata, observationSingleResponse.metadata) &&
-                Objects.equals(this.result, observationSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationTable.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationTable.java
deleted file mode 100644
index 8dab281d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationTable.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationTable
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationTable {
-    @SerializedName("data")
-    private List<List<String>> data = null;
-
-    /**
-     * valid header fields
-     */
-    @JsonAdapter(HeaderRowEnum.Adapter.class)
-    public enum HeaderRowEnum {
-        OBSERVATIONTIMESTAMP("observationTimeStamp"),
-        OBSERVATIONUNITDBID("observationUnitDbId"),
-        OBSERVATIONUNITNAME("observationUnitName"),
-        STUDYDBID("studyDbId"),
-        STUDYNAME("studyName"),
-        GERMPLASMDBID("germplasmDbId"),
-        GERMPLASMNAME("germplasmName"),
-        POSITIONCOORDINATEX("positionCoordinateX"),
-        POSITIONCOORDINATEY("positionCoordinateY"),
-        YEAR("year"),
-        FIELD("field"),
-        PLOT("plot"),
-        SUB_PLOT("sub-plot"),
-        PLANT("plant"),
-        POT("pot"),
-        BLOCK("block"),
-        ENTRY("entry"),
-        REP("rep");
-
-        private String value;
-
-        HeaderRowEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static HeaderRowEnum fromValue(String input) {
-            for (HeaderRowEnum b : HeaderRowEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<HeaderRowEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final HeaderRowEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public HeaderRowEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return HeaderRowEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("headerRow")
-    private List<HeaderRowEnum> headerRow = null;
-
-    @SerializedName("observationVariables")
-    private List<ObservationTableObservationVariables> observationVariables = null;
-
-    public ObservationTable data(List<List<String>> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ObservationTable addDataItem(List<String> dataItem) {
-        if (this.data == null) {
-            this.data = new ArrayList<List<String>>();
-        }
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The 2D matrix of observation data. ObservationVariables and other metadata are the columns, ObservationUnits are the rows.
-     *
-     * @return data
-     **/
-    @Schema(example = "[[\"2019-09-10T18:13:27.223Z\",\"f3a8a3db\",\"Plant Alpha\",\"0fe3e48b\",\"2017 Plant Study\",\"06307ec0\",\"A0043001\",\"76.50106681\",\"42.44409301\",\"2017\",\"Field_1\",\"Plot_11\",\"SubPlot_111\",\"Plant_1111\",\"Pot_1111\",\"Block_11\",\"Entry_11\",\"Rep_11\",\"25.3\",\"\",\"\",\"\"],[\"2019-09-10T18:14:27.223Z\",\"f3a8a3db\",\"Plant Alpha\",\"0fe3e48b\",\"2017 Plant Study\",\"06307ec0\",\"A0043001\",\"76.50106681\",\"42.44409301\",\"2017\",\"Field_1\",\"Plot_11\",\"SubPlot_111\",\"Plant_1111\",\"Pot_1111\",\"Block_11\",\"Entry_11\",\"Rep_11\",\"\",\"3\",\"\",\"\"],[\"2019-09-10T18:15:54.868Z\",\"05d1b011\",\"Plant Beta\",\"0fe3e48b\",\"2017 Plant Study\",\"59d435cd\",\"A0043002\",\"76.50106683\",\"42.44409301\",\"2017\",\"Field_1\",\"Plot_11\",\"SubPlot_112\",\"Plant_1122\",\"Pot_1122\",\"Block_11\",\"Entry_11\",\"Rep_12\",\"27.9\",\"\",\"\",\"\"],[\"2019-09-10T18:16:54.868Z\",\"05d1b011\",\"Plant Beta\",\"0fe3e48b\",\"2017 Plant Study\",\"59d435cd\",\"A0043002\",\"76.50106683\",\"42.44409301\",\"2017\",\"Field_1\",\"Plot_11\",\"SubPlot_112\",\"Plant_1122\",\"Pot_1122\",\"Block_11\",\"Entry_11\",\"Rep_12\",\"\",\"1\",\"\",\"\"],[\"2019-09-10T18:17:34.433Z\",\"67e2d87c\",\"Plant Gamma\",\"0fe3e48b\",\"2017 Plant Study\",\"06307ec0\",\"A0043001\",\"76.50106681\",\"42.44409356\",\"2017\",\"Field_1\",\"Plot_12\",\"SubPlot_123\",\"Plant_1233\",\"Pot_1233\",\"Block_12\",\"Entry_12\",\"Rep_11\",\"\",\"3\",\"\",\"\"],[\"2019-09-10T18:18:34.433Z\",\"67e2d87c\",\"Plant Gamma\",\"0fe3e48b\",\"2017 Plant Study\",\"06307ec0\",\"A0043001\",\"76.50106681\",\"42.44409356\",\"2017\",\"Field_1\",\"Plot_12\",\"SubPlot_123\",\"Plant_1233\",\"Pot_1233\",\"Block_12\",\"Entry_12\",\"Rep_11\",\"25.5\",\"\",\"\",\"\"],[\"2019-09-10T18:19:15.629Z\",\"d98d0d4c\",\"Plant Epsilon\",\"0fe3e48b\",\"2017 Plant Study\",\"59d435cd\",\"A0043002\",\"76.50106683\",\"42.44409356\",\"2017\",\"Field_1\",\"Plot_12\",\"SubPlot_124\",\"Plant_1244\",\"Pot_1244\",\"Block_12\",\"Entry_12\",\"Rep_12\",\"28.9\",\"\",\"\",\"\"],[\"2019-09-10T18:20:15.629Z\",\"d98d0d4c\",\"Plant Epsilon\",\"0fe3e48b\",\"2017 Plant Study\",\"59d435cd\",\"A0043002\",\"76.50106683\",\"42.44409356\",\"2017\",\"Field_1\",\"Plot_12\",\"SubPlot_124\",\"Plant_1244\",\"Pot_1244\",\"Block_12\",\"Entry_12\",\"Rep_12\",\"\",\"0\",\"\",\"\"]]", description = "The 2D matrix of observation data. ObservationVariables and other metadata are the columns, ObservationUnits are the rows.")
-    public List<List<String>> getData() {
-        return data;
-    }
-
-    public void setData(List<List<String>> data) {
-        this.data = data;
-    }
-
-    public ObservationTable headerRow(List<HeaderRowEnum> headerRow) {
-        this.headerRow = headerRow;
-        return this;
-    }
-
-    public ObservationTable addHeaderRowItem(HeaderRowEnum headerRowItem) {
-        if (this.headerRow == null) {
-            this.headerRow = new ArrayList<HeaderRowEnum>();
-        }
-        this.headerRow.add(headerRowItem);
-        return this;
-    }
-
-    /**
-     * &lt;p&gt;The table is REQUIRED to have the following columns&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitDbId - Each row is related to one Observation Unit&lt;/li&gt;   &lt;li&gt;observationTimeStamp - Each row is has a time stamp for when the observation was taken&lt;/li&gt;   &lt;li&gt;At least one column with an observationVariableDbId&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table may have any or all of the following OPTIONAL columns. Included columns are decided by the server developer&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitName&lt;/li&gt;   &lt;li&gt;studyDbId&lt;/li&gt;   &lt;li&gt;studyName&lt;/li&gt;   &lt;li&gt;germplasmDbId&lt;/li&gt;   &lt;li&gt;germplasmName&lt;/li&gt;   &lt;li&gt;positionCoordinateX&lt;/li&gt;   &lt;li&gt;positionCoordinateY&lt;/li&gt;   &lt;li&gt;year&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table also may have any number of Observation Unit Hierarchy Level columns. For example:&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;field&lt;/li&gt;   &lt;li&gt;plot&lt;/li&gt;   &lt;li&gt;sub-plot&lt;/li&gt;   &lt;li&gt;plant&lt;/li&gt;   &lt;li&gt;pot&lt;/li&gt;   &lt;li&gt;block&lt;/li&gt;   &lt;li&gt;entry&lt;/li&gt;   &lt;li&gt;rep&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The JSON representation provides a pair of extra arrays for defining the headers of the table.  The first array \&quot;headerRow\&quot; will always contain \&quot;observationUnitDbId\&quot; and any or all of the OPTIONAL column header names.  The second array \&quot;observationVariables\&quot; contains the names and DbIds for the Observation Variables represented in the table.  By appending the two arrays, you can construct the complete header row of the table. &lt;/p&gt;
-     *
-     * @return headerRow
-     **/
-    @Schema(example = "[\"observationTimeStamp\",\"observationUnitDbId\",\"observationUnitName\",\"studyDbId\",\"studyName\",\"germplasmDbId\",\"germplasmName\",\"positionCoordinateX\",\"positionCoordinateY\",\"year\",\"field\",\"plot\",\"sub-plot\",\"plant\",\"pot\",\"block\",\"entry\",\"rep\"]", description = "<p>The table is REQUIRED to have the following columns</p> <ul>   <li>observationUnitDbId - Each row is related to one Observation Unit</li>   <li>observationTimeStamp - Each row is has a time stamp for when the observation was taken</li>   <li>At least one column with an observationVariableDbId</li> </ul> <p>The table may have any or all of the following OPTIONAL columns. Included columns are decided by the server developer</p> <ul>   <li>observationUnitName</li>   <li>studyDbId</li>   <li>studyName</li>   <li>germplasmDbId</li>   <li>germplasmName</li>   <li>positionCoordinateX</li>   <li>positionCoordinateY</li>   <li>year</li> </ul> <p>The table also may have any number of Observation Unit Hierarchy Level columns. For example:</p> <ul>   <li>field</li>   <li>plot</li>   <li>sub-plot</li>   <li>plant</li>   <li>pot</li>   <li>block</li>   <li>entry</li>   <li>rep</li> </ul> <p>The JSON representation provides a pair of extra arrays for defining the headers of the table.  The first array \"headerRow\" will always contain \"observationUnitDbId\" and any or all of the OPTIONAL column header names.  The second array \"observationVariables\" contains the names and DbIds for the Observation Variables represented in the table.  By appending the two arrays, you can construct the complete header row of the table. </p>")
-    public List<HeaderRowEnum> getHeaderRow() {
-        return headerRow;
-    }
-
-    public void setHeaderRow(List<HeaderRowEnum> headerRow) {
-        this.headerRow = headerRow;
-    }
-
-    public ObservationTable observationVariables(List<ObservationTableObservationVariables> observationVariables) {
-        this.observationVariables = observationVariables;
-        return this;
-    }
-
-    public ObservationTable addObservationVariablesItem(ObservationTableObservationVariables observationVariablesItem) {
-        if (this.observationVariables == null) {
-            this.observationVariables = new ArrayList<ObservationTableObservationVariables>();
-        }
-        this.observationVariables.add(observationVariablesItem);
-        return this;
-    }
-
-    /**
-     * The list of observation variables which have values recorded for them in the data matrix. Append to the &#x27;headerRow&#x27; for complete header row of the table.
-     *
-     * @return observationVariables
-     **/
-    @Schema(example = "[{\"observationVariableDbId\":\"367aa1a9\",\"observationVariableName\":\"Plant height\"},{\"observationVariableDbId\":\"2acb934c\",\"observationVariableName\":\"Carotenoid\"},{\"observationVariableDbId\":\"85a21ce1\",\"observationVariableName\":\"Root color\"},{\"observationVariableDbId\":\"46f590e5\",\"observationVariableName\":\"Virus severity\"}]", description = "The list of observation variables which have values recorded for them in the data matrix. Append to the 'headerRow' for complete header row of the table.")
-    public List<ObservationTableObservationVariables> getObservationVariables() {
-        return observationVariables;
-    }
-
-    public void setObservationVariables(List<ObservationTableObservationVariables> observationVariables) {
-        this.observationVariables = observationVariables;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationTable observationTable = (ObservationTable) o;
-        return Objects.equals(this.data, observationTable.data) &&
-                Objects.equals(this.headerRow, observationTable.headerRow) &&
-                Objects.equals(this.observationVariables, observationTable.observationVariables);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data, headerRow, observationVariables);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationTable {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("    headerRow: ").append(toIndentedString(headerRow)).append("\n");
-        sb.append("    observationVariables: ").append(toIndentedString(observationVariables)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationTableObservationVariables.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationTableObservationVariables.java
deleted file mode 100644
index 4966a956..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationTableObservationVariables.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationTableObservationVariables
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationTableObservationVariables {
-    @SerializedName("observationVariableDbId")
-    private String observationVariableDbId = null;
-
-    @SerializedName("observationVariableName")
-    private String observationVariableName = null;
-
-    public ObservationTableObservationVariables observationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-        return this;
-    }
-
-    /**
-     * Variable unique identifier
-     *
-     * @return observationVariableDbId
-     **/
-    @Schema(example = "367aa1a9", description = "Variable unique identifier")
-    public String getObservationVariableDbId() {
-        return observationVariableDbId;
-    }
-
-    public void setObservationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-    }
-
-    public ObservationTableObservationVariables observationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-        return this;
-    }
-
-    /**
-     * Variable name (usually a short name)
-     *
-     * @return observationVariableName
-     **/
-    @Schema(example = "Plant height", description = "Variable name (usually a short name)")
-    public String getObservationVariableName() {
-        return observationVariableName;
-    }
-
-    public void setObservationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationTableObservationVariables observationTableObservationVariables = (ObservationTableObservationVariables) o;
-        return Objects.equals(this.observationVariableDbId, observationTableObservationVariables.observationVariableDbId) &&
-                Objects.equals(this.observationVariableName, observationTableObservationVariables.observationVariableName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(observationVariableDbId, observationVariableName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationTableObservationVariables {\n");
-
-        sb.append("    observationVariableDbId: ").append(toIndentedString(observationVariableDbId)).append("\n");
-        sb.append("    observationVariableName: ").append(toIndentedString(observationVariableName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationTableResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationTableResponse.java
deleted file mode 100644
index 802b8815..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationTableResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ObservationTableResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationTableResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationTable result = null;
-
-    public ObservationTableResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationTableResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationTableResponse result(ObservationTable result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationTable getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationTable result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationTableResponse observationTableResponse = (ObservationTableResponse) o;
-        return Objects.equals(this._atContext, observationTableResponse._atContext) &&
-                Objects.equals(this.metadata, observationTableResponse.metadata) &&
-                Objects.equals(this.result, observationTableResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationTableResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationTreatment.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationTreatment.java
deleted file mode 100644
index b3f355fd..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationTreatment.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationTreatment
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationTreatment {
-    @SerializedName("factor")
-    private String factor = null;
-
-    @SerializedName("modality")
-    private String modality = null;
-
-    public ObservationTreatment factor(String factor) {
-        this.factor = factor;
-        return this;
-    }
-
-    /**
-     * The type of treatment/factor. ex. &#x27;fertilizer&#x27;, &#x27;inoculation&#x27;, &#x27;irrigation&#x27;, etc  MIAPPE V1.1 (DM-61) Experimental Factor type - Name/Acronym of the experimental factor.
-     *
-     * @return factor
-     **/
-    @Schema(example = "fertilizer", description = "The type of treatment/factor. ex. 'fertilizer', 'inoculation', 'irrigation', etc  MIAPPE V1.1 (DM-61) Experimental Factor type - Name/Acronym of the experimental factor.")
-    public String getFactor() {
-        return factor;
-    }
-
-    public void setFactor(String factor) {
-        this.factor = factor;
-    }
-
-    public ObservationTreatment modality(String modality) {
-        this.modality = modality;
-        return this;
-    }
-
-    /**
-     * The treatment/factor description. ex. &#x27;low fertilizer&#x27;, &#x27;yellow rust inoculation&#x27;, &#x27;high water&#x27;, etc  MIAPPE V1.1 (DM-62) Experimental Factor description - Free text description of the experimental factor. This includes all relevant treatments planned and protocol planned for all the plants targeted by a given experimental factor.
-     *
-     * @return modality
-     **/
-    @Schema(example = "low fertilizer", description = "The treatment/factor description. ex. 'low fertilizer', 'yellow rust inoculation', 'high water', etc  MIAPPE V1.1 (DM-62) Experimental Factor description - Free text description of the experimental factor. This includes all relevant treatments planned and protocol planned for all the plants targeted by a given experimental factor. ")
-    public String getModality() {
-        return modality;
-    }
-
-    public void setModality(String modality) {
-        this.modality = modality;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationTreatment observationTreatment = (ObservationTreatment) o;
-        return Objects.equals(this.factor, observationTreatment.factor) &&
-                Objects.equals(this.modality, observationTreatment.modality);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(factor, modality);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationTreatment {\n");
-
-        sb.append("    factor: ").append(toIndentedString(factor)).append("\n");
-        sb.append("    modality: ").append(toIndentedString(modality)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnit.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnit.java
deleted file mode 100644
index 6dbc5397..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnit.java
+++ /dev/null
@@ -1,624 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * ObservationUnit
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnit {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("crossDbId")
-    private String crossDbId = null;
-
-    @SerializedName("crossName")
-    private String crossName = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("locationDbId")
-    private String locationDbId = null;
-
-    @SerializedName("locationName")
-    private String locationName = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    @SerializedName("observationUnitName")
-    private String observationUnitName = null;
-
-    @SerializedName("observationUnitPUI")
-    private String observationUnitPUI = null;
-
-    @SerializedName("observationUnitPosition")
-    private ObservationUnitObservationUnitPosition observationUnitPosition = null;
-
-    @SerializedName("observations")
-    private List<ObservationUnitObservations> observations = null;
-
-    @SerializedName("programDbId")
-    private String programDbId = null;
-
-    @SerializedName("programName")
-    private String programName = null;
-
-    @SerializedName("seedLotDbId")
-    private String seedLotDbId = null;
-
-    @SerializedName("seedLotName")
-    private String seedLotName = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("studyName")
-    private String studyName = null;
-
-    @SerializedName("treatments")
-    private List<ObservationUnitTreatments> treatments = null;
-
-    @SerializedName("trialDbId")
-    private String trialDbId = null;
-
-    @SerializedName("trialName")
-    private String trialName = null;
-
-    public ObservationUnit additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationUnit putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationUnit crossDbId(String crossDbId) {
-        this.crossDbId = crossDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for a cross
-     *
-     * @return crossDbId
-     **/
-    @Schema(example = "d105fd6f", description = "the unique identifier for a cross")
-    public String getCrossDbId() {
-        return crossDbId;
-    }
-
-    public void setCrossDbId(String crossDbId) {
-        this.crossDbId = crossDbId;
-    }
-
-    public ObservationUnit crossName(String crossName) {
-        this.crossName = crossName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a cross
-     *
-     * @return crossName
-     **/
-    @Schema(example = "my_Crosses_2018_01", description = "the human readable name for a cross")
-    public String getCrossName() {
-        return crossName;
-    }
-
-    public void setCrossName(String crossName) {
-        this.crossName = crossName;
-    }
-
-    public ObservationUnit externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationUnit addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationUnit germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "e9d9ed57", description = "The ID which uniquely identifies a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public ObservationUnit germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * Name of the germplasm. It can be the preferred name and does not have to be unique.
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000001", description = "Name of the germplasm. It can be the preferred name and does not have to be unique.")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public ObservationUnit locationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a location, associated with this study
-     *
-     * @return locationDbId
-     **/
-    @Schema(example = "0e208b20", description = "The ID which uniquely identifies a location, associated with this study")
-    public String getLocationDbId() {
-        return locationDbId;
-    }
-
-    public void setLocationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-    }
-
-    public ObservationUnit locationName(String locationName) {
-        this.locationName = locationName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a location associated with this study
-     *
-     * @return locationName
-     **/
-    @Schema(example = "Field Station Alpha", description = "The human readable name of a location associated with this study")
-    public String getLocationName() {
-        return locationName;
-    }
-
-    public void setLocationName(String locationName) {
-        this.locationName = locationName;
-    }
-
-    public ObservationUnit observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation unit  MIAPPE V1.1 (DM-70) Observation unit ID - Identifier used to identify the observation unit in data files containing the values observed or measured on that unit. Must be locally unique.
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "8c67503c", description = "The ID which uniquely identifies an observation unit  MIAPPE V1.1 (DM-70) Observation unit ID - Identifier used to identify the observation unit in data files containing the values observed or measured on that unit. Must be locally unique. ")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-    public ObservationUnit observationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-        return this;
-    }
-
-    /**
-     * A human readable name for an observation unit
-     *
-     * @return observationUnitName
-     **/
-    @Schema(example = "Plot 1", description = "A human readable name for an observation unit")
-    public String getObservationUnitName() {
-        return observationUnitName;
-    }
-
-    public void setObservationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-    }
-
-    public ObservationUnit observationUnitPUI(String observationUnitPUI) {
-        this.observationUnitPUI = observationUnitPUI;
-        return this;
-    }
-
-    /**
-     * A Permanent Unique Identifier for an observation unit  MIAPPE V1.1 (DM-72) External ID - Identifier for the observation unit in a persistent repository, comprises the name of the repository and the identifier of the observation unit therein. The EBI Biosamples repository can be used. URI are recommended when possible.
-     *
-     * @return observationUnitPUI
-     **/
-    @Schema(example = "http://pui.per/plot/1a9afc14", description = "A Permanent Unique Identifier for an observation unit  MIAPPE V1.1 (DM-72) External ID - Identifier for the observation unit in a persistent repository, comprises the name of the repository and the identifier of the observation unit therein. The EBI Biosamples repository can be used. URI are recommended when possible.")
-    public String getObservationUnitPUI() {
-        return observationUnitPUI;
-    }
-
-    public void setObservationUnitPUI(String observationUnitPUI) {
-        this.observationUnitPUI = observationUnitPUI;
-    }
-
-    public ObservationUnit observationUnitPosition(ObservationUnitObservationUnitPosition observationUnitPosition) {
-        this.observationUnitPosition = observationUnitPosition;
-        return this;
-    }
-
-    /**
-     * Get observationUnitPosition
-     *
-     * @return observationUnitPosition
-     **/
-    @Schema(description = "")
-    public ObservationUnitObservationUnitPosition getObservationUnitPosition() {
-        return observationUnitPosition;
-    }
-
-    public void setObservationUnitPosition(ObservationUnitObservationUnitPosition observationUnitPosition) {
-        this.observationUnitPosition = observationUnitPosition;
-    }
-
-    public ObservationUnit observations(List<ObservationUnitObservations> observations) {
-        this.observations = observations;
-        return this;
-    }
-
-    public ObservationUnit addObservationsItem(ObservationUnitObservations observationsItem) {
-        if (this.observations == null) {
-            this.observations = new ArrayList<ObservationUnitObservations>();
-        }
-        this.observations.add(observationsItem);
-        return this;
-    }
-
-    /**
-     * All observations attached to this observation unit.   Default for this field is null or omitted. Do NOT include data in this field unless the &#x27;includeObservations&#x27; flag is explicitly set to True.
-     *
-     * @return observations
-     **/
-    @Schema(description = "All observations attached to this observation unit.   Default for this field is null or omitted. Do NOT include data in this field unless the 'includeObservations' flag is explicitly set to True.")
-    public List<ObservationUnitObservations> getObservations() {
-        return observations;
-    }
-
-    public void setObservations(List<ObservationUnitObservations> observations) {
-        this.observations = observations;
-    }
-
-    public ObservationUnit programDbId(String programDbId) {
-        this.programDbId = programDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a program
-     *
-     * @return programDbId
-     **/
-    @Schema(example = "2d763a7a", description = "The ID which uniquely identifies a program")
-    public String getProgramDbId() {
-        return programDbId;
-    }
-
-    public void setProgramDbId(String programDbId) {
-        this.programDbId = programDbId;
-    }
-
-    public ObservationUnit programName(String programName) {
-        this.programName = programName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a program
-     *
-     * @return programName
-     **/
-    @Schema(example = "The Perfect Breeding Program", description = "The human readable name of a program")
-    public String getProgramName() {
-        return programName;
-    }
-
-    public void setProgramName(String programName) {
-        this.programName = programName;
-    }
-
-    public ObservationUnit seedLotDbId(String seedLotDbId) {
-        this.seedLotDbId = seedLotDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for the originating Seed Lot
-     *
-     * @return seedLotDbId
-     **/
-    @Schema(example = "261ecb09", description = "The unique identifier for the originating Seed Lot")
-    public String getSeedLotDbId() {
-        return seedLotDbId;
-    }
-
-    public void setSeedLotDbId(String seedLotDbId) {
-        this.seedLotDbId = seedLotDbId;
-    }
-
-    public ObservationUnit seedLotName(String seedLotName) {
-        this.seedLotName = seedLotName;
-        return this;
-    }
-
-    /**
-     * A human readable name for the originating Seed Lot
-     *
-     * @return seedLotName
-     **/
-    @Schema(example = "Seed Lot Alpha", description = "A human readable name for the originating Seed Lot")
-    public String getSeedLotName() {
-        return seedLotName;
-    }
-
-    public void setSeedLotName(String seedLotName) {
-        this.seedLotName = seedLotName;
-    }
-
-    public ObservationUnit studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a study within the given database server
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "9865addc", description = "The ID which uniquely identifies a study within the given database server")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public ObservationUnit studyName(String studyName) {
-        this.studyName = studyName;
-        return this;
-    }
-
-    /**
-     * The human readable name for a study
-     *
-     * @return studyName
-     **/
-    @Schema(example = "Purple_Tomato_1", description = "The human readable name for a study")
-    public String getStudyName() {
-        return studyName;
-    }
-
-    public void setStudyName(String studyName) {
-        this.studyName = studyName;
-    }
-
-    public ObservationUnit treatments(List<ObservationUnitTreatments> treatments) {
-        this.treatments = treatments;
-        return this;
-    }
-
-    public ObservationUnit addTreatmentsItem(ObservationUnitTreatments treatmentsItem) {
-        if (this.treatments == null) {
-            this.treatments = new ArrayList<ObservationUnitTreatments>();
-        }
-        this.treatments.add(treatmentsItem);
-        return this;
-    }
-
-    /**
-     * List of treatments applied to an observation unit.  MIAPPE V1.1 (DM-74) Observation Unit factor value - List of values for each factor applied to the observation unit.
-     *
-     * @return treatments
-     **/
-    @Schema(description = "List of treatments applied to an observation unit.  MIAPPE V1.1 (DM-74) Observation Unit factor value - List of values for each factor applied to the observation unit.")
-    public List<ObservationUnitTreatments> getTreatments() {
-        return treatments;
-    }
-
-    public void setTreatments(List<ObservationUnitTreatments> treatments) {
-        this.treatments = treatments;
-    }
-
-    public ObservationUnit trialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial
-     *
-     * @return trialDbId
-     **/
-    @Schema(example = "776a609c", description = "The ID which uniquely identifies a trial")
-    public String getTrialDbId() {
-        return trialDbId;
-    }
-
-    public void setTrialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-    }
-
-    public ObservationUnit trialName(String trialName) {
-        this.trialName = trialName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial
-     *
-     * @return trialName
-     **/
-    @Schema(example = "Purple Tomato", description = "The human readable name of a trial")
-    public String getTrialName() {
-        return trialName;
-    }
-
-    public void setTrialName(String trialName) {
-        this.trialName = trialName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnit observationUnit = (ObservationUnit) o;
-        return Objects.equals(this.additionalInfo, observationUnit.additionalInfo) &&
-                Objects.equals(this.crossDbId, observationUnit.crossDbId) &&
-                Objects.equals(this.crossName, observationUnit.crossName) &&
-                Objects.equals(this.externalReferences, observationUnit.externalReferences) &&
-                Objects.equals(this.germplasmDbId, observationUnit.germplasmDbId) &&
-                Objects.equals(this.germplasmName, observationUnit.germplasmName) &&
-                Objects.equals(this.locationDbId, observationUnit.locationDbId) &&
-                Objects.equals(this.locationName, observationUnit.locationName) &&
-                Objects.equals(this.observationUnitDbId, observationUnit.observationUnitDbId) &&
-                Objects.equals(this.observationUnitName, observationUnit.observationUnitName) &&
-                Objects.equals(this.observationUnitPUI, observationUnit.observationUnitPUI) &&
-                Objects.equals(this.observationUnitPosition, observationUnit.observationUnitPosition) &&
-                Objects.equals(this.observations, observationUnit.observations) &&
-                Objects.equals(this.programDbId, observationUnit.programDbId) &&
-                Objects.equals(this.programName, observationUnit.programName) &&
-                Objects.equals(this.seedLotDbId, observationUnit.seedLotDbId) &&
-                Objects.equals(this.seedLotName, observationUnit.seedLotName) &&
-                Objects.equals(this.studyDbId, observationUnit.studyDbId) &&
-                Objects.equals(this.studyName, observationUnit.studyName) &&
-                Objects.equals(this.treatments, observationUnit.treatments) &&
-                Objects.equals(this.trialDbId, observationUnit.trialDbId) &&
-                Objects.equals(this.trialName, observationUnit.trialName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, crossDbId, crossName, externalReferences, germplasmDbId, germplasmName, locationDbId, locationName, observationUnitDbId, observationUnitName, observationUnitPUI, observationUnitPosition, observations, programDbId, programName, seedLotDbId, seedLotName, studyDbId, studyName, treatments, trialDbId, trialName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnit {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    crossDbId: ").append(toIndentedString(crossDbId)).append("\n");
-        sb.append("    crossName: ").append(toIndentedString(crossName)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
-        sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("    observationUnitName: ").append(toIndentedString(observationUnitName)).append("\n");
-        sb.append("    observationUnitPUI: ").append(toIndentedString(observationUnitPUI)).append("\n");
-        sb.append("    observationUnitPosition: ").append(toIndentedString(observationUnitPosition)).append("\n");
-        sb.append("    observations: ").append(toIndentedString(observations)).append("\n");
-        sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-        sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
-        sb.append("    seedLotDbId: ").append(toIndentedString(seedLotDbId)).append("\n");
-        sb.append("    seedLotName: ").append(toIndentedString(seedLotName)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    studyName: ").append(toIndentedString(studyName)).append("\n");
-        sb.append("    treatments: ").append(toIndentedString(treatments)).append("\n");
-        sb.append("    trialDbId: ").append(toIndentedString(trialDbId)).append("\n");
-        sb.append("    trialName: ").append(toIndentedString(trialName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitHierarchyLevel.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitHierarchyLevel.java
deleted file mode 100644
index 2236d9d7..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitHierarchyLevel.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6).   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
- */
-@Schema(description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6).   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitHierarchyLevel {
-    @SerializedName("levelName")
-    private String levelName = null;
-
-    @SerializedName("levelOrder")
-    private Integer levelOrder = null;
-
-    public ObservationUnitHierarchyLevel levelName(String levelName) {
-        this.levelName = levelName;
-        return this;
-    }
-
-    /**
-     * A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelName
-     **/
-    @Schema(example = "plot", description = "A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public ObservationUnitHierarchyLevel levelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-        return this;
-    }
-
-    /**
-     * &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;&#x27;s lower numbers  are at the top of the hierarchy (ie field -&gt; 1) and higher numbers are at the bottom of the hierarchy (ie plant -&gt; 9).   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelOrder
-     **/
-    @Schema(example = "2", description = "`levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`'s lower numbers  are at the top of the hierarchy (ie field -> 1) and higher numbers are at the bottom of the hierarchy (ie plant -> 9).   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public Integer getLevelOrder() {
-        return levelOrder;
-    }
-
-    public void setLevelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitHierarchyLevel observationUnitHierarchyLevel = (ObservationUnitHierarchyLevel) o;
-        return Objects.equals(this.levelName, observationUnitHierarchyLevel.levelName) &&
-                Objects.equals(this.levelOrder, observationUnitHierarchyLevel.levelOrder);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(levelName, levelOrder);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitHierarchyLevel {\n");
-
-        sb.append("    levelName: ").append(toIndentedString(levelName)).append("\n");
-        sb.append("    levelOrder: ").append(toIndentedString(levelOrder)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevel.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevel.java
deleted file mode 100644
index 9d343931..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevel.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6). &#x60;levelCode&#x60; is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**
- */
-@Schema(description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6). `levelCode` is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample** ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitLevel {
-    @SerializedName("levelCode")
-    private String levelCode = null;
-
-    @SerializedName("levelName")
-    private String levelName = null;
-
-    @SerializedName("levelOrder")
-    private Integer levelOrder = null;
-
-    public ObservationUnitLevel levelCode(String levelCode) {
-        this.levelCode = levelCode;
-        return this;
-    }
-
-    /**
-     * An ID code or number to represent a real thing that may or may not be an an observation unit. &lt;br/&gt;For example, if the &#x27;levelName&#x27; is &#x27;plot&#x27;, then the &#x27;levelCode&#x27; would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. &lt;br/&gt;If the &#x27;levelName&#x27; is &#x27;field&#x27;, then the &#x27;levelCode&#x27; might be something like &#x27;3&#x27; or &#x27;F3&#x27; to indicate the third field at a research station.
-     *
-     * @return levelCode
-     **/
-    @Schema(example = "Plot_123", description = "An ID code or number to represent a real thing that may or may not be an an observation unit. <br/>For example, if the 'levelName' is 'plot', then the 'levelCode' would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. <br/>If the 'levelName' is 'field', then the 'levelCode' might be something like '3' or 'F3' to indicate the third field at a research station. ")
-    public String getLevelCode() {
-        return levelCode;
-    }
-
-    public void setLevelCode(String levelCode) {
-        this.levelCode = levelCode;
-    }
-
-    public ObservationUnitLevel levelName(String levelName) {
-        this.levelName = levelName;
-        return this;
-    }
-
-    /**
-     * A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelName
-     **/
-    @Schema(example = "plot", description = "A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public ObservationUnitLevel levelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-        return this;
-    }
-
-    /**
-     * &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;&#x27;s lower numbers  are at the top of the hierarchy (ie field -&gt; 1) and higher numbers are at the bottom of the hierarchy (ie plant -&gt; 9).   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelOrder
-     **/
-    @Schema(example = "2", description = "`levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`'s lower numbers  are at the top of the hierarchy (ie field -> 1) and higher numbers are at the bottom of the hierarchy (ie plant -> 9).   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public Integer getLevelOrder() {
-        return levelOrder;
-    }
-
-    public void setLevelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitLevel observationUnitLevel = (ObservationUnitLevel) o;
-        return Objects.equals(this.levelCode, observationUnitLevel.levelCode) &&
-                Objects.equals(this.levelName, observationUnitLevel.levelName) &&
-                Objects.equals(this.levelOrder, observationUnitLevel.levelOrder);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(levelCode, levelName, levelOrder);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitLevel {\n");
-
-        sb.append("    levelCode: ").append(toIndentedString(levelCode)).append("\n");
-        sb.append("    levelName: ").append(toIndentedString(levelName)).append("\n");
-        sb.append("    levelOrder: ").append(toIndentedString(levelOrder)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevel1.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevel1.java
deleted file mode 100644
index 62ec48ab..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevel1.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6). &#x60;levelCode&#x60; is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**
- */
-@Schema(description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6). `levelCode` is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample** ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitLevel1 {
-    @SerializedName("levelCode")
-    private String levelCode = null;
-
-    @SerializedName("levelName")
-    private String levelName = null;
-
-    @SerializedName("levelOrder")
-    private Integer levelOrder = null;
-
-    public ObservationUnitLevel1 levelCode(String levelCode) {
-        this.levelCode = levelCode;
-        return this;
-    }
-
-    /**
-     * An ID code or number to represent a real thing that may or may not be an an observation unit. &lt;br/&gt;For example, if the &#x27;levelName&#x27; is &#x27;plot&#x27;, then the &#x27;levelCode&#x27; would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. &lt;br/&gt;If the &#x27;levelName&#x27; is &#x27;field&#x27;, then the &#x27;levelCode&#x27; might be something like &#x27;3&#x27; or &#x27;F3&#x27; to indicate the third field at a research station.
-     *
-     * @return levelCode
-     **/
-    @Schema(example = "Plot_123", description = "An ID code or number to represent a real thing that may or may not be an an observation unit. <br/>For example, if the 'levelName' is 'plot', then the 'levelCode' would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. <br/>If the 'levelName' is 'field', then the 'levelCode' might be something like '3' or 'F3' to indicate the third field at a research station. ")
-    public String getLevelCode() {
-        return levelCode;
-    }
-
-    public void setLevelCode(String levelCode) {
-        this.levelCode = levelCode;
-    }
-
-    public ObservationUnitLevel1 levelName(String levelName) {
-        this.levelName = levelName;
-        return this;
-    }
-
-    /**
-     * A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelName
-     **/
-    @Schema(example = "plot", description = "A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public ObservationUnitLevel1 levelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-        return this;
-    }
-
-    /**
-     * &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;&#x27;s lower numbers  are at the top of the hierarchy (ie field -&gt; 1) and higher numbers are at the bottom of the hierarchy (ie plant -&gt; 9).   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelOrder
-     **/
-    @Schema(example = "2", description = "`levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`'s lower numbers  are at the top of the hierarchy (ie field -> 1) and higher numbers are at the bottom of the hierarchy (ie plant -> 9).   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public Integer getLevelOrder() {
-        return levelOrder;
-    }
-
-    public void setLevelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitLevel1 observationUnitLevel1 = (ObservationUnitLevel1) o;
-        return Objects.equals(this.levelCode, observationUnitLevel1.levelCode) &&
-                Objects.equals(this.levelName, observationUnitLevel1.levelName) &&
-                Objects.equals(this.levelOrder, observationUnitLevel1.levelOrder);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(levelCode, levelName, levelOrder);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitLevel1 {\n");
-
-        sb.append("    levelCode: ").append(toIndentedString(levelCode)).append("\n");
-        sb.append("    levelName: ").append(toIndentedString(levelName)).append("\n");
-        sb.append("    levelOrder: ").append(toIndentedString(levelOrder)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevel2.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevel2.java
deleted file mode 100644
index 6bdd577b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevel2.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * The exact level and level code of an observation unit.   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.   MIAPPE V1.1 DM-71 Observation unit type \&quot;Type of observation unit in textual form, usually one of the following: study, block, sub-block, plot, sub-plot, pot, plant. Use of other observation unit types is possible but not recommended.  The observation unit type can not be used to indicate sub-plant levels. However, observations can still be made on the sub-plant level, as long as the details are indicated in the associated observed variable (see observed variables).  Alternatively, it is possible to use samples for more detailed tracing of sub-plant units, attaching the observations to them instead.\&quot;
- */
-@Schema(description = "The exact level and level code of an observation unit.   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>.   MIAPPE V1.1 DM-71 Observation unit type \"Type of observation unit in textual form, usually one of the following: study, block, sub-block, plot, sub-plot, pot, plant. Use of other observation unit types is possible but not recommended.  The observation unit type can not be used to indicate sub-plant levels. However, observations can still be made on the sub-plant level, as long as the details are indicated in the associated observed variable (see observed variables).  Alternatively, it is possible to use samples for more detailed tracing of sub-plant units, attaching the observations to them instead.\" ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitLevel2 {
-    @SerializedName("levelCode")
-    private String levelCode = null;
-
-    @SerializedName("levelName")
-    private String levelName = null;
-
-    @SerializedName("levelOrder")
-    private Integer levelOrder = null;
-
-    public ObservationUnitLevel2 levelCode(String levelCode) {
-        this.levelCode = levelCode;
-        return this;
-    }
-
-    /**
-     * An ID code or number to represent a real thing that may or may not be an an observation unit. &lt;br/&gt;For example, if the &#x27;levelName&#x27; is &#x27;plot&#x27;, then the &#x27;levelCode&#x27; would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. &lt;br/&gt;If the &#x27;levelName&#x27; is &#x27;field&#x27;, then the &#x27;levelCode&#x27; might be something like &#x27;3&#x27; or &#x27;F3&#x27; to indicate the third field at a research station.
-     *
-     * @return levelCode
-     **/
-    @Schema(example = "Plot_123", description = "An ID code or number to represent a real thing that may or may not be an an observation unit. <br/>For example, if the 'levelName' is 'plot', then the 'levelCode' would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. <br/>If the 'levelName' is 'field', then the 'levelCode' might be something like '3' or 'F3' to indicate the third field at a research station. ")
-    public String getLevelCode() {
-        return levelCode;
-    }
-
-    public void setLevelCode(String levelCode) {
-        this.levelCode = levelCode;
-    }
-
-    public ObservationUnitLevel2 levelName(String levelName) {
-        this.levelName = levelName;
-        return this;
-    }
-
-    /**
-     * A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelName
-     **/
-    @Schema(example = "plot", description = "A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public ObservationUnitLevel2 levelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-        return this;
-    }
-
-    /**
-     * &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;&#x27;s lower numbers  are at the top of the hierarchy (ie field -&gt; 1) and higher numbers are at the bottom of the hierarchy (ie plant -&gt; 9).   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelOrder
-     **/
-    @Schema(example = "2", description = "`levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`'s lower numbers  are at the top of the hierarchy (ie field -> 1) and higher numbers are at the bottom of the hierarchy (ie plant -> 9).   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public Integer getLevelOrder() {
-        return levelOrder;
-    }
-
-    public void setLevelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitLevel2 observationUnitLevel2 = (ObservationUnitLevel2) o;
-        return Objects.equals(this.levelCode, observationUnitLevel2.levelCode) &&
-                Objects.equals(this.levelName, observationUnitLevel2.levelName) &&
-                Objects.equals(this.levelOrder, observationUnitLevel2.levelOrder);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(levelCode, levelName, levelOrder);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitLevel2 {\n");
-
-        sb.append("    levelCode: ").append(toIndentedString(levelCode)).append("\n");
-        sb.append("    levelName: ").append(toIndentedString(levelName)).append("\n");
-        sb.append("    levelOrder: ").append(toIndentedString(levelOrder)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevelRelationship.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevelRelationship.java
deleted file mode 100644
index fde91bf2..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevelRelationship.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6). &#x60;levelCode&#x60; is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**
- */
-@Schema(description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6). `levelCode` is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample** ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitLevelRelationship {
-    @SerializedName("levelCode")
-    private String levelCode = null;
-
-    @SerializedName("levelName")
-    private String levelName = null;
-
-    @SerializedName("levelOrder")
-    private Integer levelOrder = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    public ObservationUnitLevelRelationship levelCode(String levelCode) {
-        this.levelCode = levelCode;
-        return this;
-    }
-
-    /**
-     * An ID code or number to represent a real thing that may or may not be an an observation unit. &lt;br/&gt;For example, if the &#x27;levelName&#x27; is &#x27;plot&#x27;, then the &#x27;levelCode&#x27; would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. &lt;br/&gt;If the &#x27;levelName&#x27; is &#x27;field&#x27;, then the &#x27;levelCode&#x27; might be something like &#x27;3&#x27; or &#x27;F3&#x27; to indicate the third field at a research station.
-     *
-     * @return levelCode
-     **/
-    @Schema(example = "Plot_123", description = "An ID code or number to represent a real thing that may or may not be an an observation unit. <br/>For example, if the 'levelName' is 'plot', then the 'levelCode' would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. <br/>If the 'levelName' is 'field', then the 'levelCode' might be something like '3' or 'F3' to indicate the third field at a research station. ")
-    public String getLevelCode() {
-        return levelCode;
-    }
-
-    public void setLevelCode(String levelCode) {
-        this.levelCode = levelCode;
-    }
-
-    public ObservationUnitLevelRelationship levelName(String levelName) {
-        this.levelName = levelName;
-        return this;
-    }
-
-    /**
-     * A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelName
-     **/
-    @Schema(example = "plot", description = "A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public ObservationUnitLevelRelationship levelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-        return this;
-    }
-
-    /**
-     * &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;&#x27;s lower numbers  are at the top of the hierarchy (ie field -&gt; 1) and higher numbers are at the bottom of the hierarchy (ie plant -&gt; 9).   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelOrder
-     **/
-    @Schema(example = "2", description = "`levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`'s lower numbers  are at the top of the hierarchy (ie field -> 1) and higher numbers are at the bottom of the hierarchy (ie plant -> 9).   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public Integer getLevelOrder() {
-        return levelOrder;
-    }
-
-    public void setLevelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-    }
-
-    public ObservationUnitLevelRelationship observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation unit &lt;br/&gt;If this level has on ObservationUnit associated with it, record the observationUnitDbId here. This is intended to construct a strict hierarchy of observationUnits.  &lt;br/&gt;If there is no ObservationUnit associated with this level, this field can set to NULL or omitted from the response.
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "5ab883e9", description = "The ID which uniquely identifies an observation unit <br/>If this level has on ObservationUnit associated with it, record the observationUnitDbId here. This is intended to construct a strict hierarchy of observationUnits.  <br/>If there is no ObservationUnit associated with this level, this field can set to NULL or omitted from the response.")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitLevelRelationship observationUnitLevelRelationship = (ObservationUnitLevelRelationship) o;
-        return Objects.equals(this.levelCode, observationUnitLevelRelationship.levelCode) &&
-                Objects.equals(this.levelName, observationUnitLevelRelationship.levelName) &&
-                Objects.equals(this.levelOrder, observationUnitLevelRelationship.levelOrder) &&
-                Objects.equals(this.observationUnitDbId, observationUnitLevelRelationship.observationUnitDbId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(levelCode, levelName, levelOrder, observationUnitDbId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitLevelRelationship {\n");
-
-        sb.append("    levelCode: ").append(toIndentedString(levelCode)).append("\n");
-        sb.append("    levelName: ").append(toIndentedString(levelName)).append("\n");
-        sb.append("    levelOrder: ").append(toIndentedString(levelOrder)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevelRelationship1.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevelRelationship1.java
deleted file mode 100644
index 9bc5d801..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitLevelRelationship1.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6). &#x60;levelCode&#x60; is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**
- */
-@Schema(description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6). `levelCode` is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample** ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitLevelRelationship1 {
-    @SerializedName("levelCode")
-    private String levelCode = null;
-
-    @SerializedName("levelName")
-    private String levelName = null;
-
-    @SerializedName("levelOrder")
-    private Integer levelOrder = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    public ObservationUnitLevelRelationship1 levelCode(String levelCode) {
-        this.levelCode = levelCode;
-        return this;
-    }
-
-    /**
-     * An ID code or number to represent a real thing that may or may not be an an observation unit. &lt;br/&gt;For example, if the &#x27;levelName&#x27; is &#x27;plot&#x27;, then the &#x27;levelCode&#x27; would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. &lt;br/&gt;If the &#x27;levelName&#x27; is &#x27;field&#x27;, then the &#x27;levelCode&#x27; might be something like &#x27;3&#x27; or &#x27;F3&#x27; to indicate the third field at a research station.
-     *
-     * @return levelCode
-     **/
-    @Schema(example = "Plot_123", description = "An ID code or number to represent a real thing that may or may not be an an observation unit. <br/>For example, if the 'levelName' is 'plot', then the 'levelCode' would be the plot number or plot barcode. If this plot is also considered an ObservationUnit, then the appropriate observationUnitDbId should also be recorded. <br/>If the 'levelName' is 'field', then the 'levelCode' might be something like '3' or 'F3' to indicate the third field at a research station. ")
-    public String getLevelCode() {
-        return levelCode;
-    }
-
-    public void setLevelCode(String levelCode) {
-        this.levelCode = levelCode;
-    }
-
-    public ObservationUnitLevelRelationship1 levelName(String levelName) {
-        this.levelName = levelName;
-        return this;
-    }
-
-    /**
-     * A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelName
-     **/
-    @Schema(example = "plot", description = "A name for this level   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public ObservationUnitLevelRelationship1 levelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-        return this;
-    }
-
-    /**
-     * &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels. &#x60;levelOrder&#x60;&#x27;s lower numbers  are at the top of the hierarchy (ie field -&gt; 1) and higher numbers are at the bottom of the hierarchy (ie plant -&gt; 9).   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.
-     *
-     * @return levelOrder
-     **/
-    @Schema(example = "2", description = "`levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`'s lower numbers  are at the top of the hierarchy (ie field -> 1) and higher numbers are at the bottom of the hierarchy (ie plant -> 9).   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>. ")
-    public Integer getLevelOrder() {
-        return levelOrder;
-    }
-
-    public void setLevelOrder(Integer levelOrder) {
-        this.levelOrder = levelOrder;
-    }
-
-    public ObservationUnitLevelRelationship1 observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation unit &lt;br/&gt;If this level has on ObservationUnit associated with it, record the observationUnitDbId here. This is intended to construct a strict hierarchy of observationUnits.  &lt;br/&gt;If there is no ObservationUnit associated with this level, this field can set to NULL or omitted from the response.
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "5ab883e9", description = "The ID which uniquely identifies an observation unit <br/>If this level has on ObservationUnit associated with it, record the observationUnitDbId here. This is intended to construct a strict hierarchy of observationUnits.  <br/>If there is no ObservationUnit associated with this level, this field can set to NULL or omitted from the response.")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitLevelRelationship1 observationUnitLevelRelationship1 = (ObservationUnitLevelRelationship1) o;
-        return Objects.equals(this.levelCode, observationUnitLevelRelationship1.levelCode) &&
-                Objects.equals(this.levelName, observationUnitLevelRelationship1.levelName) &&
-                Objects.equals(this.levelOrder, observationUnitLevelRelationship1.levelOrder) &&
-                Objects.equals(this.observationUnitDbId, observationUnitLevelRelationship1.observationUnitDbId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(levelCode, levelName, levelOrder, observationUnitDbId);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitLevelRelationship1 {\n");
-
-        sb.append("    levelCode: ").append(toIndentedString(levelCode)).append("\n");
-        sb.append("    levelName: ").append(toIndentedString(levelName)).append("\n");
-        sb.append("    levelOrder: ").append(toIndentedString(levelOrder)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitListResponse.java
deleted file mode 100644
index 2bf6ce60..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ObservationUnitListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationUnitListResponseResult result = null;
-
-    public ObservationUnitListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationUnitListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationUnitListResponse result(ObservationUnitListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationUnitListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationUnitListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitListResponse observationUnitListResponse = (ObservationUnitListResponse) o;
-        return Objects.equals(this._atContext, observationUnitListResponse._atContext) &&
-                Objects.equals(this.metadata, observationUnitListResponse.metadata) &&
-                Objects.equals(this.result, observationUnitListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitListResponseResult.java
deleted file mode 100644
index 78656cf0..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationUnitListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitListResponseResult {
-    @SerializedName("data")
-    private List<ObservationUnit> data = new ArrayList<ObservationUnit>();
-
-    public ObservationUnitListResponseResult data(List<ObservationUnit> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ObservationUnitListResponseResult addDataItem(ObservationUnit dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<ObservationUnit> getData() {
-        return data;
-    }
-
-    public void setData(List<ObservationUnit> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitListResponseResult observationUnitListResponseResult = (ObservationUnitListResponseResult) o;
-        return Objects.equals(this.data, observationUnitListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitNewRequest.java
deleted file mode 100644
index bc9cd4ba..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitNewRequest.java
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * ObservationUnitNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("crossDbId")
-    private String crossDbId = null;
-
-    @SerializedName("crossName")
-    private String crossName = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("locationDbId")
-    private String locationDbId = null;
-
-    @SerializedName("locationName")
-    private String locationName = null;
-
-    @SerializedName("observationUnitName")
-    private String observationUnitName = null;
-
-    @SerializedName("observationUnitPUI")
-    private String observationUnitPUI = null;
-
-    @SerializedName("observationUnitPosition")
-    private ObservationUnitObservationUnitPosition observationUnitPosition = null;
-
-    @SerializedName("programDbId")
-    private String programDbId = null;
-
-    @SerializedName("programName")
-    private String programName = null;
-
-    @SerializedName("seedLotDbId")
-    private String seedLotDbId = null;
-
-    @SerializedName("seedLotName")
-    private String seedLotName = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("studyName")
-    private String studyName = null;
-
-    @SerializedName("treatments")
-    private List<ObservationUnitTreatments> treatments = null;
-
-    @SerializedName("trialDbId")
-    private String trialDbId = null;
-
-    @SerializedName("trialName")
-    private String trialName = null;
-
-    public ObservationUnitNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationUnitNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationUnitNewRequest crossDbId(String crossDbId) {
-        this.crossDbId = crossDbId;
-        return this;
-    }
-
-    /**
-     * the unique identifier for a cross
-     *
-     * @return crossDbId
-     **/
-    @Schema(example = "d105fd6f", description = "the unique identifier for a cross")
-    public String getCrossDbId() {
-        return crossDbId;
-    }
-
-    public void setCrossDbId(String crossDbId) {
-        this.crossDbId = crossDbId;
-    }
-
-    public ObservationUnitNewRequest crossName(String crossName) {
-        this.crossName = crossName;
-        return this;
-    }
-
-    /**
-     * the human readable name for a cross
-     *
-     * @return crossName
-     **/
-    @Schema(example = "my_Crosses_2018_01", description = "the human readable name for a cross")
-    public String getCrossName() {
-        return crossName;
-    }
-
-    public void setCrossName(String crossName) {
-        this.crossName = crossName;
-    }
-
-    public ObservationUnitNewRequest externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationUnitNewRequest addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationUnitNewRequest germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "e9d9ed57", description = "The ID which uniquely identifies a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public ObservationUnitNewRequest germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * Name of the germplasm. It can be the preferred name and does not have to be unique.
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000001", description = "Name of the germplasm. It can be the preferred name and does not have to be unique.")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public ObservationUnitNewRequest locationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a location, associated with this study
-     *
-     * @return locationDbId
-     **/
-    @Schema(example = "0e208b20", description = "The ID which uniquely identifies a location, associated with this study")
-    public String getLocationDbId() {
-        return locationDbId;
-    }
-
-    public void setLocationDbId(String locationDbId) {
-        this.locationDbId = locationDbId;
-    }
-
-    public ObservationUnitNewRequest locationName(String locationName) {
-        this.locationName = locationName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a location associated with this study
-     *
-     * @return locationName
-     **/
-    @Schema(example = "Field Station Alpha", description = "The human readable name of a location associated with this study")
-    public String getLocationName() {
-        return locationName;
-    }
-
-    public void setLocationName(String locationName) {
-        this.locationName = locationName;
-    }
-
-    public ObservationUnitNewRequest observationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-        return this;
-    }
-
-    /**
-     * A human readable name for an observation unit
-     *
-     * @return observationUnitName
-     **/
-    @Schema(example = "Plot 1", description = "A human readable name for an observation unit")
-    public String getObservationUnitName() {
-        return observationUnitName;
-    }
-
-    public void setObservationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-    }
-
-    public ObservationUnitNewRequest observationUnitPUI(String observationUnitPUI) {
-        this.observationUnitPUI = observationUnitPUI;
-        return this;
-    }
-
-    /**
-     * A Permanent Unique Identifier for an observation unit  MIAPPE V1.1 (DM-72) External ID - Identifier for the observation unit in a persistent repository, comprises the name of the repository and the identifier of the observation unit therein. The EBI Biosamples repository can be used. URI are recommended when possible.
-     *
-     * @return observationUnitPUI
-     **/
-    @Schema(example = "http://pui.per/plot/1a9afc14", description = "A Permanent Unique Identifier for an observation unit  MIAPPE V1.1 (DM-72) External ID - Identifier for the observation unit in a persistent repository, comprises the name of the repository and the identifier of the observation unit therein. The EBI Biosamples repository can be used. URI are recommended when possible.")
-    public String getObservationUnitPUI() {
-        return observationUnitPUI;
-    }
-
-    public void setObservationUnitPUI(String observationUnitPUI) {
-        this.observationUnitPUI = observationUnitPUI;
-    }
-
-    public ObservationUnitNewRequest observationUnitPosition(ObservationUnitObservationUnitPosition observationUnitPosition) {
-        this.observationUnitPosition = observationUnitPosition;
-        return this;
-    }
-
-    /**
-     * Get observationUnitPosition
-     *
-     * @return observationUnitPosition
-     **/
-    @Schema(description = "")
-    public ObservationUnitObservationUnitPosition getObservationUnitPosition() {
-        return observationUnitPosition;
-    }
-
-    public void setObservationUnitPosition(ObservationUnitObservationUnitPosition observationUnitPosition) {
-        this.observationUnitPosition = observationUnitPosition;
-    }
-
-    public ObservationUnitNewRequest programDbId(String programDbId) {
-        this.programDbId = programDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a program
-     *
-     * @return programDbId
-     **/
-    @Schema(example = "2d763a7a", description = "The ID which uniquely identifies a program")
-    public String getProgramDbId() {
-        return programDbId;
-    }
-
-    public void setProgramDbId(String programDbId) {
-        this.programDbId = programDbId;
-    }
-
-    public ObservationUnitNewRequest programName(String programName) {
-        this.programName = programName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a program
-     *
-     * @return programName
-     **/
-    @Schema(example = "The Perfect Breeding Program", description = "The human readable name of a program")
-    public String getProgramName() {
-        return programName;
-    }
-
-    public void setProgramName(String programName) {
-        this.programName = programName;
-    }
-
-    public ObservationUnitNewRequest seedLotDbId(String seedLotDbId) {
-        this.seedLotDbId = seedLotDbId;
-        return this;
-    }
-
-    /**
-     * The unique identifier for the originating Seed Lot
-     *
-     * @return seedLotDbId
-     **/
-    @Schema(example = "261ecb09", description = "The unique identifier for the originating Seed Lot")
-    public String getSeedLotDbId() {
-        return seedLotDbId;
-    }
-
-    public void setSeedLotDbId(String seedLotDbId) {
-        this.seedLotDbId = seedLotDbId;
-    }
-
-    public ObservationUnitNewRequest seedLotName(String seedLotName) {
-        this.seedLotName = seedLotName;
-        return this;
-    }
-
-    /**
-     * A human readable name for the originating Seed Lot
-     *
-     * @return seedLotName
-     **/
-    @Schema(example = "Seed Lot Alpha", description = "A human readable name for the originating Seed Lot")
-    public String getSeedLotName() {
-        return seedLotName;
-    }
-
-    public void setSeedLotName(String seedLotName) {
-        this.seedLotName = seedLotName;
-    }
-
-    public ObservationUnitNewRequest studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a study within the given database server
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "9865addc", description = "The ID which uniquely identifies a study within the given database server")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public ObservationUnitNewRequest studyName(String studyName) {
-        this.studyName = studyName;
-        return this;
-    }
-
-    /**
-     * The human readable name for a study
-     *
-     * @return studyName
-     **/
-    @Schema(example = "Purple_Tomato_1", description = "The human readable name for a study")
-    public String getStudyName() {
-        return studyName;
-    }
-
-    public void setStudyName(String studyName) {
-        this.studyName = studyName;
-    }
-
-    public ObservationUnitNewRequest treatments(List<ObservationUnitTreatments> treatments) {
-        this.treatments = treatments;
-        return this;
-    }
-
-    public ObservationUnitNewRequest addTreatmentsItem(ObservationUnitTreatments treatmentsItem) {
-        if (this.treatments == null) {
-            this.treatments = new ArrayList<ObservationUnitTreatments>();
-        }
-        this.treatments.add(treatmentsItem);
-        return this;
-    }
-
-    /**
-     * List of treatments applied to an observation unit.  MIAPPE V1.1 (DM-74) Observation Unit factor value - List of values for each factor applied to the observation unit.
-     *
-     * @return treatments
-     **/
-    @Schema(description = "List of treatments applied to an observation unit.  MIAPPE V1.1 (DM-74) Observation Unit factor value - List of values for each factor applied to the observation unit.")
-    public List<ObservationUnitTreatments> getTreatments() {
-        return treatments;
-    }
-
-    public void setTreatments(List<ObservationUnitTreatments> treatments) {
-        this.treatments = treatments;
-    }
-
-    public ObservationUnitNewRequest trialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial
-     *
-     * @return trialDbId
-     **/
-    @Schema(example = "776a609c", description = "The ID which uniquely identifies a trial")
-    public String getTrialDbId() {
-        return trialDbId;
-    }
-
-    public void setTrialDbId(String trialDbId) {
-        this.trialDbId = trialDbId;
-    }
-
-    public ObservationUnitNewRequest trialName(String trialName) {
-        this.trialName = trialName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial
-     *
-     * @return trialName
-     **/
-    @Schema(example = "Purple Tomato", description = "The human readable name of a trial")
-    public String getTrialName() {
-        return trialName;
-    }
-
-    public void setTrialName(String trialName) {
-        this.trialName = trialName;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitNewRequest observationUnitNewRequest = (ObservationUnitNewRequest) o;
-        return Objects.equals(this.additionalInfo, observationUnitNewRequest.additionalInfo) &&
-                Objects.equals(this.crossDbId, observationUnitNewRequest.crossDbId) &&
-                Objects.equals(this.crossName, observationUnitNewRequest.crossName) &&
-                Objects.equals(this.externalReferences, observationUnitNewRequest.externalReferences) &&
-                Objects.equals(this.germplasmDbId, observationUnitNewRequest.germplasmDbId) &&
-                Objects.equals(this.germplasmName, observationUnitNewRequest.germplasmName) &&
-                Objects.equals(this.locationDbId, observationUnitNewRequest.locationDbId) &&
-                Objects.equals(this.locationName, observationUnitNewRequest.locationName) &&
-                Objects.equals(this.observationUnitName, observationUnitNewRequest.observationUnitName) &&
-                Objects.equals(this.observationUnitPUI, observationUnitNewRequest.observationUnitPUI) &&
-                Objects.equals(this.observationUnitPosition, observationUnitNewRequest.observationUnitPosition) &&
-                Objects.equals(this.programDbId, observationUnitNewRequest.programDbId) &&
-                Objects.equals(this.programName, observationUnitNewRequest.programName) &&
-                Objects.equals(this.seedLotDbId, observationUnitNewRequest.seedLotDbId) &&
-                Objects.equals(this.seedLotName, observationUnitNewRequest.seedLotName) &&
-                Objects.equals(this.studyDbId, observationUnitNewRequest.studyDbId) &&
-                Objects.equals(this.studyName, observationUnitNewRequest.studyName) &&
-                Objects.equals(this.treatments, observationUnitNewRequest.treatments) &&
-                Objects.equals(this.trialDbId, observationUnitNewRequest.trialDbId) &&
-                Objects.equals(this.trialName, observationUnitNewRequest.trialName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, crossDbId, crossName, externalReferences, germplasmDbId, germplasmName, locationDbId, locationName, observationUnitName, observationUnitPUI, observationUnitPosition, programDbId, programName, seedLotDbId, seedLotName, studyDbId, studyName, treatments, trialDbId, trialName);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    crossDbId: ").append(toIndentedString(crossDbId)).append("\n");
-        sb.append("    crossName: ").append(toIndentedString(crossName)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    locationDbId: ").append(toIndentedString(locationDbId)).append("\n");
-        sb.append("    locationName: ").append(toIndentedString(locationName)).append("\n");
-        sb.append("    observationUnitName: ").append(toIndentedString(observationUnitName)).append("\n");
-        sb.append("    observationUnitPUI: ").append(toIndentedString(observationUnitPUI)).append("\n");
-        sb.append("    observationUnitPosition: ").append(toIndentedString(observationUnitPosition)).append("\n");
-        sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
-        sb.append("    programName: ").append(toIndentedString(programName)).append("\n");
-        sb.append("    seedLotDbId: ").append(toIndentedString(seedLotDbId)).append("\n");
-        sb.append("    seedLotName: ").append(toIndentedString(seedLotName)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    studyName: ").append(toIndentedString(studyName)).append("\n");
-        sb.append("    treatments: ").append(toIndentedString(treatments)).append("\n");
-        sb.append("    trialDbId: ").append(toIndentedString(trialDbId)).append("\n");
-        sb.append("    trialName: ").append(toIndentedString(trialName)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitObservationUnitPosition.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitObservationUnitPosition.java
deleted file mode 100644
index 10ceea22..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitObservationUnitPosition.java
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * All positional and layout information related to this Observation Unit   MIAPPE V1.1 (DM-73) Spatial distribution - Type and value of a spatial coordinate (georeference or relative)  or level of observation (plot 45, subblock 7, block 2) provided as a key-value pair of the form type:value.  Levels of observation must be consistent with those listed in the Study section.
- */
-@Schema(description = "All positional and layout information related to this Observation Unit   MIAPPE V1.1 (DM-73) Spatial distribution - Type and value of a spatial coordinate (georeference or relative)  or level of observation (plot 45, subblock 7, block 2) provided as a key-value pair of the form type:value.  Levels of observation must be consistent with those listed in the Study section.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitObservationUnitPosition {
-    /**
-     * The type of entry for this observation unit. ex. \&quot;CHECK\&quot;, \&quot;TEST\&quot;, \&quot;FILLER\&quot;
-     */
-    @JsonAdapter(EntryTypeEnum.Adapter.class)
-    public enum EntryTypeEnum {
-        CHECK("CHECK"),
-        TEST("TEST"),
-        FILLER("FILLER");
-
-        private String value;
-
-        EntryTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static EntryTypeEnum fromValue(String input) {
-            for (EntryTypeEnum b : EntryTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<EntryTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final EntryTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public EntryTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return EntryTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("entryType")
-    private EntryTypeEnum entryType = null;
-
-    @SerializedName("geoCoordinates")
-    private GeoJSON geoCoordinates = null;
-
-    @SerializedName("observationLevel")
-    private ObservationUnitLevel2 observationLevel = null;
-
-    @SerializedName("observationLevelRelationships")
-    private List<ObservationUnitLevelRelationship1> observationLevelRelationships = null;
-
-    @SerializedName("positionCoordinateX")
-    private String positionCoordinateX = null;
-
-    /**
-     * The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   PLANTED_ROW - The physical planted row number   PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column
-     */
-    @JsonAdapter(PositionCoordinateXTypeEnum.Adapter.class)
-    public enum PositionCoordinateXTypeEnum {
-        LONGITUDE("LONGITUDE"),
-        LATITUDE("LATITUDE"),
-        PLANTED_ROW("PLANTED_ROW"),
-        PLANTED_INDIVIDUAL("PLANTED_INDIVIDUAL"),
-        GRID_ROW("GRID_ROW"),
-        GRID_COL("GRID_COL"),
-        MEASURED_ROW("MEASURED_ROW"),
-        MEASURED_COL("MEASURED_COL");
-
-        private String value;
-
-        PositionCoordinateXTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static PositionCoordinateXTypeEnum fromValue(String input) {
-            for (PositionCoordinateXTypeEnum b : PositionCoordinateXTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<PositionCoordinateXTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final PositionCoordinateXTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public PositionCoordinateXTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return PositionCoordinateXTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("positionCoordinateXType")
-    private PositionCoordinateXTypeEnum positionCoordinateXType = null;
-
-    @SerializedName("positionCoordinateY")
-    private String positionCoordinateY = null;
-
-    /**
-     * The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   PLANTED_ROW - The physical planted row number    PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column
-     */
-    @JsonAdapter(PositionCoordinateYTypeEnum.Adapter.class)
-    public enum PositionCoordinateYTypeEnum {
-        LONGITUDE("LONGITUDE"),
-        LATITUDE("LATITUDE"),
-        PLANTED_ROW("PLANTED_ROW"),
-        PLANTED_INDIVIDUAL("PLANTED_INDIVIDUAL"),
-        GRID_ROW("GRID_ROW"),
-        GRID_COL("GRID_COL"),
-        MEASURED_ROW("MEASURED_ROW"),
-        MEASURED_COL("MEASURED_COL");
-
-        private String value;
-
-        PositionCoordinateYTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static PositionCoordinateYTypeEnum fromValue(String input) {
-            for (PositionCoordinateYTypeEnum b : PositionCoordinateYTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<PositionCoordinateYTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final PositionCoordinateYTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public PositionCoordinateYTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return PositionCoordinateYTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("positionCoordinateYType")
-    private PositionCoordinateYTypeEnum positionCoordinateYType = null;
-
-    public ObservationUnitObservationUnitPosition entryType(EntryTypeEnum entryType) {
-        this.entryType = entryType;
-        return this;
-    }
-
-    /**
-     * The type of entry for this observation unit. ex. \&quot;CHECK\&quot;, \&quot;TEST\&quot;, \&quot;FILLER\&quot;
-     *
-     * @return entryType
-     **/
-    @Schema(example = "TEST", description = "The type of entry for this observation unit. ex. \"CHECK\", \"TEST\", \"FILLER\"")
-    public EntryTypeEnum getEntryType() {
-        return entryType;
-    }
-
-    public void setEntryType(EntryTypeEnum entryType) {
-        this.entryType = entryType;
-    }
-
-    public ObservationUnitObservationUnitPosition geoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-        return this;
-    }
-
-    /**
-     * Get geoCoordinates
-     *
-     * @return geoCoordinates
-     **/
-    @Schema(description = "")
-    public GeoJSON getGeoCoordinates() {
-        return geoCoordinates;
-    }
-
-    public void setGeoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-    }
-
-    public ObservationUnitObservationUnitPosition observationLevel(ObservationUnitLevel2 observationLevel) {
-        this.observationLevel = observationLevel;
-        return this;
-    }
-
-    /**
-     * Get observationLevel
-     *
-     * @return observationLevel
-     **/
-    @Schema(description = "")
-    public ObservationUnitLevel2 getObservationLevel() {
-        return observationLevel;
-    }
-
-    public void setObservationLevel(ObservationUnitLevel2 observationLevel) {
-        this.observationLevel = observationLevel;
-    }
-
-    public ObservationUnitObservationUnitPosition observationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-        return this;
-    }
-
-    public ObservationUnitObservationUnitPosition addObservationLevelRelationshipsItem(ObservationUnitLevelRelationship1 observationLevelRelationshipsItem) {
-        if (this.observationLevelRelationships == null) {
-            this.observationLevelRelationships = new ArrayList<ObservationUnitLevelRelationship1>();
-        }
-        this.observationLevelRelationships.add(observationLevelRelationshipsItem);
-        return this;
-    }
-
-    /**
-     * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6). &#x60;levelCode&#x60; is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**
-     *
-     * @return observationLevelRelationships
-     **/
-    @Schema(example = "[{\"levelCode\":\"Field_1\",\"levelName\":\"field\",\"levelOrder\":0},{\"levelCode\":\"Block_12\",\"levelName\":\"block\",\"levelOrder\":1},{\"levelCode\":\"Plot_123\",\"levelName\":\"plot\",\"levelOrder\":2}]", description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6). `levelCode` is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample** ")
-    public List<ObservationUnitLevelRelationship1> getObservationLevelRelationships() {
-        return observationLevelRelationships;
-    }
-
-    public void setObservationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-    }
-
-    public ObservationUnitObservationUnitPosition positionCoordinateX(String positionCoordinateX) {
-        this.positionCoordinateX = positionCoordinateX;
-        return this;
-    }
-
-    /**
-     * The X position coordinate for an observation unit. Different systems may use different coordinate systems.
-     *
-     * @return positionCoordinateX
-     **/
-    @Schema(example = "74", description = "The X position coordinate for an observation unit. Different systems may use different coordinate systems.")
-    public String getPositionCoordinateX() {
-        return positionCoordinateX;
-    }
-
-    public void setPositionCoordinateX(String positionCoordinateX) {
-        this.positionCoordinateX = positionCoordinateX;
-    }
-
-    public ObservationUnitObservationUnitPosition positionCoordinateXType(PositionCoordinateXTypeEnum positionCoordinateXType) {
-        this.positionCoordinateXType = positionCoordinateXType;
-        return this;
-    }
-
-    /**
-     * The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   PLANTED_ROW - The physical planted row number   PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column
-     *
-     * @return positionCoordinateXType
-     **/
-    @Schema(example = "GRID_COL", description = "The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See 'Location Coordinate Encoding' for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See 'Location Coordinate Encoding' for details   PLANTED_ROW - The physical planted row number   PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column ")
-    public PositionCoordinateXTypeEnum getPositionCoordinateXType() {
-        return positionCoordinateXType;
-    }
-
-    public void setPositionCoordinateXType(PositionCoordinateXTypeEnum positionCoordinateXType) {
-        this.positionCoordinateXType = positionCoordinateXType;
-    }
-
-    public ObservationUnitObservationUnitPosition positionCoordinateY(String positionCoordinateY) {
-        this.positionCoordinateY = positionCoordinateY;
-        return this;
-    }
-
-    /**
-     * The Y position coordinate for an observation unit. Different systems may use different coordinate systems.
-     *
-     * @return positionCoordinateY
-     **/
-    @Schema(example = "03", description = "The Y position coordinate for an observation unit. Different systems may use different coordinate systems.")
-    public String getPositionCoordinateY() {
-        return positionCoordinateY;
-    }
-
-    public void setPositionCoordinateY(String positionCoordinateY) {
-        this.positionCoordinateY = positionCoordinateY;
-    }
-
-    public ObservationUnitObservationUnitPosition positionCoordinateYType(PositionCoordinateYTypeEnum positionCoordinateYType) {
-        this.positionCoordinateYType = positionCoordinateYType;
-        return this;
-    }
-
-    /**
-     * The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   PLANTED_ROW - The physical planted row number    PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column
-     *
-     * @return positionCoordinateYType
-     **/
-    @Schema(example = "GRID_ROW", description = "The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See 'Location Coordinate Encoding' for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See 'Location Coordinate Encoding' for details   PLANTED_ROW - The physical planted row number    PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column ")
-    public PositionCoordinateYTypeEnum getPositionCoordinateYType() {
-        return positionCoordinateYType;
-    }
-
-    public void setPositionCoordinateYType(PositionCoordinateYTypeEnum positionCoordinateYType) {
-        this.positionCoordinateYType = positionCoordinateYType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitObservationUnitPosition observationUnitObservationUnitPosition = (ObservationUnitObservationUnitPosition) o;
-        return Objects.equals(this.entryType, observationUnitObservationUnitPosition.entryType) &&
-                Objects.equals(this.geoCoordinates, observationUnitObservationUnitPosition.geoCoordinates) &&
-                Objects.equals(this.observationLevel, observationUnitObservationUnitPosition.observationLevel) &&
-                Objects.equals(this.observationLevelRelationships, observationUnitObservationUnitPosition.observationLevelRelationships) &&
-                Objects.equals(this.positionCoordinateX, observationUnitObservationUnitPosition.positionCoordinateX) &&
-                Objects.equals(this.positionCoordinateXType, observationUnitObservationUnitPosition.positionCoordinateXType) &&
-                Objects.equals(this.positionCoordinateY, observationUnitObservationUnitPosition.positionCoordinateY) &&
-                Objects.equals(this.positionCoordinateYType, observationUnitObservationUnitPosition.positionCoordinateYType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(entryType, geoCoordinates, observationLevel, observationLevelRelationships, positionCoordinateX, positionCoordinateXType, positionCoordinateY, positionCoordinateYType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitObservationUnitPosition {\n");
-
-        sb.append("    entryType: ").append(toIndentedString(entryType)).append("\n");
-        sb.append("    geoCoordinates: ").append(toIndentedString(geoCoordinates)).append("\n");
-        sb.append("    observationLevel: ").append(toIndentedString(observationLevel)).append("\n");
-        sb.append("    observationLevelRelationships: ").append(toIndentedString(observationLevelRelationships)).append("\n");
-        sb.append("    positionCoordinateX: ").append(toIndentedString(positionCoordinateX)).append("\n");
-        sb.append("    positionCoordinateXType: ").append(toIndentedString(positionCoordinateXType)).append("\n");
-        sb.append("    positionCoordinateY: ").append(toIndentedString(positionCoordinateY)).append("\n");
-        sb.append("    positionCoordinateYType: ").append(toIndentedString(positionCoordinateYType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitObservations.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitObservations.java
deleted file mode 100644
index 47a20888..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitObservations.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * ObservationUnitObservations
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitObservations {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("collector")
-    private String collector = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("geoCoordinates")
-    private GeoJSON geoCoordinates = null;
-
-    @SerializedName("germplasmDbId")
-    private String germplasmDbId = null;
-
-    @SerializedName("germplasmName")
-    private String germplasmName = null;
-
-    @SerializedName("observationDbId")
-    private String observationDbId = null;
-
-    @SerializedName("observationTimeStamp")
-    private OffsetDateTime observationTimeStamp = null;
-
-    @SerializedName("observationUnitDbId")
-    private String observationUnitDbId = null;
-
-    @SerializedName("observationUnitName")
-    private String observationUnitName = null;
-
-    @SerializedName("observationVariableDbId")
-    private String observationVariableDbId = null;
-
-    @SerializedName("observationVariableName")
-    private String observationVariableName = null;
-
-    @SerializedName("season")
-    private ObservationSeason season = null;
-
-    @SerializedName("studyDbId")
-    private String studyDbId = null;
-
-    @SerializedName("uploadedBy")
-    private String uploadedBy = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    public ObservationUnitObservations additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationUnitObservations putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationUnitObservations collector(String collector) {
-        this.collector = collector;
-        return this;
-    }
-
-    /**
-     * The name or identifier of the entity which collected the observation
-     *
-     * @return collector
-     **/
-    @Schema(example = "917d3ae0", description = "The name or identifier of the entity which collected the observation")
-    public String getCollector() {
-        return collector;
-    }
-
-    public void setCollector(String collector) {
-        this.collector = collector;
-    }
-
-    public ObservationUnitObservations externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationUnitObservations addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationUnitObservations geoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-        return this;
-    }
-
-    /**
-     * Get geoCoordinates
-     *
-     * @return geoCoordinates
-     **/
-    @Schema(description = "")
-    public GeoJSON getGeoCoordinates() {
-        return geoCoordinates;
-    }
-
-    public void setGeoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-    }
-
-    public ObservationUnitObservations germplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a germplasm
-     *
-     * @return germplasmDbId
-     **/
-    @Schema(example = "2408ab11", description = "The ID which uniquely identifies a germplasm")
-    public String getGermplasmDbId() {
-        return germplasmDbId;
-    }
-
-    public void setGermplasmDbId(String germplasmDbId) {
-        this.germplasmDbId = germplasmDbId;
-    }
-
-    public ObservationUnitObservations germplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-        return this;
-    }
-
-    /**
-     * Name of the germplasm. It can be the preferred name and does not have to be unique.
-     *
-     * @return germplasmName
-     **/
-    @Schema(example = "A0000003", description = "Name of the germplasm. It can be the preferred name and does not have to be unique.")
-    public String getGermplasmName() {
-        return germplasmName;
-    }
-
-    public void setGermplasmName(String germplasmName) {
-        this.germplasmName = germplasmName;
-    }
-
-    public ObservationUnitObservations observationDbId(String observationDbId) {
-        this.observationDbId = observationDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation
-     *
-     * @return observationDbId
-     **/
-    @Schema(example = "ef24b615", description = "The ID which uniquely identifies an observation")
-    public String getObservationDbId() {
-        return observationDbId;
-    }
-
-    public void setObservationDbId(String observationDbId) {
-        this.observationDbId = observationDbId;
-    }
-
-    public ObservationUnitObservations observationTimeStamp(OffsetDateTime observationTimeStamp) {
-        this.observationTimeStamp = observationTimeStamp;
-        return this;
-    }
-
-    /**
-     * The date and time when this observation was made
-     *
-     * @return observationTimeStamp
-     **/
-    @Schema(description = "The date and time when this observation was made")
-    public OffsetDateTime getObservationTimeStamp() {
-        return observationTimeStamp;
-    }
-
-    public void setObservationTimeStamp(OffsetDateTime observationTimeStamp) {
-        this.observationTimeStamp = observationTimeStamp;
-    }
-
-    public ObservationUnitObservations observationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation unit
-     *
-     * @return observationUnitDbId
-     **/
-    @Schema(example = "598111d4", description = "The ID which uniquely identifies an observation unit")
-    public String getObservationUnitDbId() {
-        return observationUnitDbId;
-    }
-
-    public void setObservationUnitDbId(String observationUnitDbId) {
-        this.observationUnitDbId = observationUnitDbId;
-    }
-
-    public ObservationUnitObservations observationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-        return this;
-    }
-
-    /**
-     * A human readable name for an observation unit
-     *
-     * @return observationUnitName
-     **/
-    @Schema(example = "Plot 1", description = "A human readable name for an observation unit")
-    public String getObservationUnitName() {
-        return observationUnitName;
-    }
-
-    public void setObservationUnitName(String observationUnitName) {
-        this.observationUnitName = observationUnitName;
-    }
-
-    public ObservationUnitObservations observationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies an observation variable
-     *
-     * @return observationVariableDbId
-     **/
-    @Schema(example = "c403d107", description = "The ID which uniquely identifies an observation variable")
-    public String getObservationVariableDbId() {
-        return observationVariableDbId;
-    }
-
-    public void setObservationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-    }
-
-    public ObservationUnitObservations observationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-        return this;
-    }
-
-    /**
-     * A human readable name for an observation variable
-     *
-     * @return observationVariableName
-     **/
-    @Schema(example = "Plant Height in meters", description = "A human readable name for an observation variable")
-    public String getObservationVariableName() {
-        return observationVariableName;
-    }
-
-    public void setObservationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-    }
-
-    public ObservationUnitObservations season(ObservationSeason season) {
-        this.season = season;
-        return this;
-    }
-
-    /**
-     * Get season
-     *
-     * @return season
-     **/
-    @Schema(description = "")
-    public ObservationSeason getSeason() {
-        return season;
-    }
-
-    public void setSeason(ObservationSeason season) {
-        this.season = season;
-    }
-
-    public ObservationUnitObservations studyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a study within the given database server
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "ef2829db", description = "The ID which uniquely identifies a study within the given database server")
-    public String getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(String studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public ObservationUnitObservations uploadedBy(String uploadedBy) {
-        this.uploadedBy = uploadedBy;
-        return this;
-    }
-
-    /**
-     * The name or id of the user who uploaded the observation to the database system
-     *
-     * @return uploadedBy
-     **/
-    @Schema(example = "a2f7f60b", description = "The name or id of the user who uploaded the observation to the database system")
-    public String getUploadedBy() {
-        return uploadedBy;
-    }
-
-    public void setUploadedBy(String uploadedBy) {
-        this.uploadedBy = uploadedBy;
-    }
-
-    public ObservationUnitObservations value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * The value of the data collected as an observation
-     *
-     * @return value
-     **/
-    @Schema(example = "2.3", description = "The value of the data collected as an observation")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitObservations observationUnitObservations = (ObservationUnitObservations) o;
-        return Objects.equals(this.additionalInfo, observationUnitObservations.additionalInfo) &&
-                Objects.equals(this.collector, observationUnitObservations.collector) &&
-                Objects.equals(this.externalReferences, observationUnitObservations.externalReferences) &&
-                Objects.equals(this.geoCoordinates, observationUnitObservations.geoCoordinates) &&
-                Objects.equals(this.germplasmDbId, observationUnitObservations.germplasmDbId) &&
-                Objects.equals(this.germplasmName, observationUnitObservations.germplasmName) &&
-                Objects.equals(this.observationDbId, observationUnitObservations.observationDbId) &&
-                Objects.equals(this.observationTimeStamp, observationUnitObservations.observationTimeStamp) &&
-                Objects.equals(this.observationUnitDbId, observationUnitObservations.observationUnitDbId) &&
-                Objects.equals(this.observationUnitName, observationUnitObservations.observationUnitName) &&
-                Objects.equals(this.observationVariableDbId, observationUnitObservations.observationVariableDbId) &&
-                Objects.equals(this.observationVariableName, observationUnitObservations.observationVariableName) &&
-                Objects.equals(this.season, observationUnitObservations.season) &&
-                Objects.equals(this.studyDbId, observationUnitObservations.studyDbId) &&
-                Objects.equals(this.uploadedBy, observationUnitObservations.uploadedBy) &&
-                Objects.equals(this.value, observationUnitObservations.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, collector, externalReferences, geoCoordinates, germplasmDbId, germplasmName, observationDbId, observationTimeStamp, observationUnitDbId, observationUnitName, observationVariableDbId, observationVariableName, season, studyDbId, uploadedBy, value);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitObservations {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    collector: ").append(toIndentedString(collector)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    geoCoordinates: ").append(toIndentedString(geoCoordinates)).append("\n");
-        sb.append("    germplasmDbId: ").append(toIndentedString(germplasmDbId)).append("\n");
-        sb.append("    germplasmName: ").append(toIndentedString(germplasmName)).append("\n");
-        sb.append("    observationDbId: ").append(toIndentedString(observationDbId)).append("\n");
-        sb.append("    observationTimeStamp: ").append(toIndentedString(observationTimeStamp)).append("\n");
-        sb.append("    observationUnitDbId: ").append(toIndentedString(observationUnitDbId)).append("\n");
-        sb.append("    observationUnitName: ").append(toIndentedString(observationUnitName)).append("\n");
-        sb.append("    observationVariableDbId: ").append(toIndentedString(observationVariableDbId)).append("\n");
-        sb.append("    observationVariableName: ").append(toIndentedString(observationVariableName)).append("\n");
-        sb.append("    season: ").append(toIndentedString(season)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    uploadedBy: ").append(toIndentedString(uploadedBy)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitPosition.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitPosition.java
deleted file mode 100644
index 20af7f86..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitPosition.java
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * All positional and layout information related to this Observation Unit   MIAPPE V1.1 (DM-73) Spatial distribution - Type and value of a spatial coordinate (georeference or relative)  or level of observation (plot 45, subblock 7, block 2) provided as a key-value pair of the form type:value.  Levels of observation must be consistent with those listed in the Study section.
- */
-@Schema(description = "All positional and layout information related to this Observation Unit   MIAPPE V1.1 (DM-73) Spatial distribution - Type and value of a spatial coordinate (georeference or relative)  or level of observation (plot 45, subblock 7, block 2) provided as a key-value pair of the form type:value.  Levels of observation must be consistent with those listed in the Study section.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitPosition {
-    /**
-     * The type of entry for this observation unit. ex. \&quot;CHECK\&quot;, \&quot;TEST\&quot;, \&quot;FILLER\&quot;
-     */
-    @JsonAdapter(EntryTypeEnum.Adapter.class)
-    public enum EntryTypeEnum {
-        CHECK("CHECK"),
-        TEST("TEST"),
-        FILLER("FILLER");
-
-        private String value;
-
-        EntryTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static EntryTypeEnum fromValue(String input) {
-            for (EntryTypeEnum b : EntryTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<EntryTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final EntryTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public EntryTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return EntryTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("entryType")
-    private EntryTypeEnum entryType = null;
-
-    @SerializedName("geoCoordinates")
-    private GeoJSON geoCoordinates = null;
-
-    @SerializedName("observationLevel")
-    private ObservationUnitLevel2 observationLevel = null;
-
-    @SerializedName("observationLevelRelationships")
-    private List<ObservationUnitLevelRelationship1> observationLevelRelationships = null;
-
-    @SerializedName("positionCoordinateX")
-    private String positionCoordinateX = null;
-
-    /**
-     * The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   PLANTED_ROW - The physical planted row number   PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column
-     */
-    @JsonAdapter(PositionCoordinateXTypeEnum.Adapter.class)
-    public enum PositionCoordinateXTypeEnum {
-        LONGITUDE("LONGITUDE"),
-        LATITUDE("LATITUDE"),
-        PLANTED_ROW("PLANTED_ROW"),
-        PLANTED_INDIVIDUAL("PLANTED_INDIVIDUAL"),
-        GRID_ROW("GRID_ROW"),
-        GRID_COL("GRID_COL"),
-        MEASURED_ROW("MEASURED_ROW"),
-        MEASURED_COL("MEASURED_COL");
-
-        private String value;
-
-        PositionCoordinateXTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static PositionCoordinateXTypeEnum fromValue(String input) {
-            for (PositionCoordinateXTypeEnum b : PositionCoordinateXTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<PositionCoordinateXTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final PositionCoordinateXTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public PositionCoordinateXTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return PositionCoordinateXTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("positionCoordinateXType")
-    private PositionCoordinateXTypeEnum positionCoordinateXType = null;
-
-    @SerializedName("positionCoordinateY")
-    private String positionCoordinateY = null;
-
-    /**
-     * The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   PLANTED_ROW - The physical planted row number    PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column
-     */
-    @JsonAdapter(PositionCoordinateYTypeEnum.Adapter.class)
-    public enum PositionCoordinateYTypeEnum {
-        LONGITUDE("LONGITUDE"),
-        LATITUDE("LATITUDE"),
-        PLANTED_ROW("PLANTED_ROW"),
-        PLANTED_INDIVIDUAL("PLANTED_INDIVIDUAL"),
-        GRID_ROW("GRID_ROW"),
-        GRID_COL("GRID_COL"),
-        MEASURED_ROW("MEASURED_ROW"),
-        MEASURED_COL("MEASURED_COL");
-
-        private String value;
-
-        PositionCoordinateYTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static PositionCoordinateYTypeEnum fromValue(String input) {
-            for (PositionCoordinateYTypeEnum b : PositionCoordinateYTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<PositionCoordinateYTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final PositionCoordinateYTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public PositionCoordinateYTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return PositionCoordinateYTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("positionCoordinateYType")
-    private PositionCoordinateYTypeEnum positionCoordinateYType = null;
-
-    public ObservationUnitPosition entryType(EntryTypeEnum entryType) {
-        this.entryType = entryType;
-        return this;
-    }
-
-    /**
-     * The type of entry for this observation unit. ex. \&quot;CHECK\&quot;, \&quot;TEST\&quot;, \&quot;FILLER\&quot;
-     *
-     * @return entryType
-     **/
-    @Schema(example = "TEST", description = "The type of entry for this observation unit. ex. \"CHECK\", \"TEST\", \"FILLER\"")
-    public EntryTypeEnum getEntryType() {
-        return entryType;
-    }
-
-    public void setEntryType(EntryTypeEnum entryType) {
-        this.entryType = entryType;
-    }
-
-    public ObservationUnitPosition geoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-        return this;
-    }
-
-    /**
-     * Get geoCoordinates
-     *
-     * @return geoCoordinates
-     **/
-    @Schema(description = "")
-    public GeoJSON getGeoCoordinates() {
-        return geoCoordinates;
-    }
-
-    public void setGeoCoordinates(GeoJSON geoCoordinates) {
-        this.geoCoordinates = geoCoordinates;
-    }
-
-    public ObservationUnitPosition observationLevel(ObservationUnitLevel2 observationLevel) {
-        this.observationLevel = observationLevel;
-        return this;
-    }
-
-    /**
-     * Get observationLevel
-     *
-     * @return observationLevel
-     **/
-    @Schema(description = "")
-    public ObservationUnitLevel2 getObservationLevel() {
-        return observationLevel;
-    }
-
-    public void setObservationLevel(ObservationUnitLevel2 observationLevel) {
-        this.observationLevel = observationLevel;
-    }
-
-    public ObservationUnitPosition observationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-        return this;
-    }
-
-    public ObservationUnitPosition addObservationLevelRelationshipsItem(ObservationUnitLevelRelationship1 observationLevelRelationshipsItem) {
-        if (this.observationLevelRelationships == null) {
-            this.observationLevelRelationships = new ArrayList<ObservationUnitLevelRelationship1>();
-        }
-        this.observationLevelRelationships.add(observationLevelRelationshipsItem);
-        return this;
-    }
-
-    /**
-     * Observation levels indicate the granularity level at which the measurements are taken. &#x60;levelName&#x60;  defines the level, &#x60;levelOrder&#x60; defines where that level exists in the hierarchy of levels.  &#x60;levelOrder&#x60;s lower numbers are at the top of the hierarchy (ie field &gt; 0) and higher numbers are  at the bottom of the hierarchy (ie plant &gt; 6). &#x60;levelCode&#x60; is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the &lt;a target&#x3D;\&quot;_blank\&quot; href&#x3D;\&quot;https://wiki.brapi.org/index.php/Observation_Levels\&quot;&gt;Observation Levels documentation&lt;/a&gt;.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample**
-     *
-     * @return observationLevelRelationships
-     **/
-    @Schema(example = "[{\"levelCode\":\"Field_1\",\"levelName\":\"field\",\"levelOrder\":0},{\"levelCode\":\"Block_12\",\"levelName\":\"block\",\"levelOrder\":1},{\"levelCode\":\"Plot_123\",\"levelName\":\"plot\",\"levelOrder\":2}]", description = "Observation levels indicate the granularity level at which the measurements are taken. `levelName`  defines the level, `levelOrder` defines where that level exists in the hierarchy of levels.  `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are  at the bottom of the hierarchy (ie plant > 6). `levelCode` is an ID code for this level tag. Identify  this observation unit by each level of the hierarchy where it exists.   For more information on Observation Levels, please review the <a target=\"_blank\" href=\"https://wiki.brapi.org/index.php/Observation_Levels\">Observation Levels documentation</a>.   **Standard Level Names: study, field, entry, rep, block, sub-block, plot, sub-plot, plant, pot, sample** ")
-    public List<ObservationUnitLevelRelationship1> getObservationLevelRelationships() {
-        return observationLevelRelationships;
-    }
-
-    public void setObservationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-    }
-
-    public ObservationUnitPosition positionCoordinateX(String positionCoordinateX) {
-        this.positionCoordinateX = positionCoordinateX;
-        return this;
-    }
-
-    /**
-     * The X position coordinate for an observation unit. Different systems may use different coordinate systems.
-     *
-     * @return positionCoordinateX
-     **/
-    @Schema(example = "74", description = "The X position coordinate for an observation unit. Different systems may use different coordinate systems.")
-    public String getPositionCoordinateX() {
-        return positionCoordinateX;
-    }
-
-    public void setPositionCoordinateX(String positionCoordinateX) {
-        this.positionCoordinateX = positionCoordinateX;
-    }
-
-    public ObservationUnitPosition positionCoordinateXType(PositionCoordinateXTypeEnum positionCoordinateXType) {
-        this.positionCoordinateXType = positionCoordinateXType;
-        return this;
-    }
-
-    /**
-     * The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   PLANTED_ROW - The physical planted row number   PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column
-     *
-     * @return positionCoordinateXType
-     **/
-    @Schema(example = "GRID_COL", description = "The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See 'Location Coordinate Encoding' for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See 'Location Coordinate Encoding' for details   PLANTED_ROW - The physical planted row number   PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column ")
-    public PositionCoordinateXTypeEnum getPositionCoordinateXType() {
-        return positionCoordinateXType;
-    }
-
-    public void setPositionCoordinateXType(PositionCoordinateXTypeEnum positionCoordinateXType) {
-        this.positionCoordinateXType = positionCoordinateXType;
-    }
-
-    public ObservationUnitPosition positionCoordinateY(String positionCoordinateY) {
-        this.positionCoordinateY = positionCoordinateY;
-        return this;
-    }
-
-    /**
-     * The Y position coordinate for an observation unit. Different systems may use different coordinate systems.
-     *
-     * @return positionCoordinateY
-     **/
-    @Schema(example = "03", description = "The Y position coordinate for an observation unit. Different systems may use different coordinate systems.")
-    public String getPositionCoordinateY() {
-        return positionCoordinateY;
-    }
-
-    public void setPositionCoordinateY(String positionCoordinateY) {
-        this.positionCoordinateY = positionCoordinateY;
-    }
-
-    public ObservationUnitPosition positionCoordinateYType(PositionCoordinateYTypeEnum positionCoordinateYType) {
-        this.positionCoordinateYType = positionCoordinateYType;
-        return this;
-    }
-
-    /**
-     * The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See &#x27;Location Coordinate Encoding&#x27; for details   PLANTED_ROW - The physical planted row number    PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column
-     *
-     * @return positionCoordinateYType
-     **/
-    @Schema(example = "GRID_ROW", description = "The type of positional coordinate used. Must be one of the following values   LONGITUDE - ISO 6709 standard, WGS84 geodetic datum. See 'Location Coordinate Encoding' for details   LATITUDE - ISO 6709 standard, WGS84 geodetic datum. See 'Location Coordinate Encoding' for details   PLANTED_ROW - The physical planted row number    PLANTED_INDIVIDUAL - The physical counted number, could be independant or within a planted row   GRID_ROW - The row index number of a square grid overlay   GRID_COL - The column index number of a square grid overlay   MEASURED_ROW - The distance in meters from a defined 0-th row   MEASURED_COL - The distance in meters from a defined 0-th column ")
-    public PositionCoordinateYTypeEnum getPositionCoordinateYType() {
-        return positionCoordinateYType;
-    }
-
-    public void setPositionCoordinateYType(PositionCoordinateYTypeEnum positionCoordinateYType) {
-        this.positionCoordinateYType = positionCoordinateYType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitPosition observationUnitPosition = (ObservationUnitPosition) o;
-        return Objects.equals(this.entryType, observationUnitPosition.entryType) &&
-                Objects.equals(this.geoCoordinates, observationUnitPosition.geoCoordinates) &&
-                Objects.equals(this.observationLevel, observationUnitPosition.observationLevel) &&
-                Objects.equals(this.observationLevelRelationships, observationUnitPosition.observationLevelRelationships) &&
-                Objects.equals(this.positionCoordinateX, observationUnitPosition.positionCoordinateX) &&
-                Objects.equals(this.positionCoordinateXType, observationUnitPosition.positionCoordinateXType) &&
-                Objects.equals(this.positionCoordinateY, observationUnitPosition.positionCoordinateY) &&
-                Objects.equals(this.positionCoordinateYType, observationUnitPosition.positionCoordinateYType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(entryType, geoCoordinates, observationLevel, observationLevelRelationships, positionCoordinateX, positionCoordinateXType, positionCoordinateY, positionCoordinateYType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitPosition {\n");
-
-        sb.append("    entryType: ").append(toIndentedString(entryType)).append("\n");
-        sb.append("    geoCoordinates: ").append(toIndentedString(geoCoordinates)).append("\n");
-        sb.append("    observationLevel: ").append(toIndentedString(observationLevel)).append("\n");
-        sb.append("    observationLevelRelationships: ").append(toIndentedString(observationLevelRelationships)).append("\n");
-        sb.append("    positionCoordinateX: ").append(toIndentedString(positionCoordinateX)).append("\n");
-        sb.append("    positionCoordinateXType: ").append(toIndentedString(positionCoordinateXType)).append("\n");
-        sb.append("    positionCoordinateY: ").append(toIndentedString(positionCoordinateY)).append("\n");
-        sb.append("    positionCoordinateYType: ").append(toIndentedString(positionCoordinateYType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitSearchRequest.java
deleted file mode 100644
index 8396654c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitSearchRequest.java
+++ /dev/null
@@ -1,842 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationUnitSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitSearchRequest {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("includeObservations")
-    private Boolean includeObservations = null;
-
-    @SerializedName("locationDbIds")
-    private List<String> locationDbIds = null;
-
-    @SerializedName("locationNames")
-    private List<String> locationNames = null;
-
-    @SerializedName("observationLevelRelationships")
-    private List<ObservationUnitLevelRelationship1> observationLevelRelationships = null;
-
-    @SerializedName("observationLevels")
-    private List<ObservationUnitLevel1> observationLevels = null;
-
-    @SerializedName("observationUnitDbIds")
-    private List<String> observationUnitDbIds = null;
-
-    @SerializedName("observationUnitNames")
-    private List<String> observationUnitNames = null;
-
-    @SerializedName("observationVariableDbIds")
-    private List<String> observationVariableDbIds = null;
-
-    @SerializedName("observationVariableNames")
-    private List<String> observationVariableNames = null;
-
-    @SerializedName("observationVariablePUIs")
-    private List<String> observationVariablePUIs = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("seasonDbIds")
-    private List<String> seasonDbIds = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public ObservationUnitSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public ObservationUnitSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public ObservationUnitSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public ObservationUnitSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public ObservationUnitSearchRequest germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public ObservationUnitSearchRequest germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public ObservationUnitSearchRequest includeObservations(Boolean includeObservations) {
-        this.includeObservations = includeObservations;
-        return this;
-    }
-
-    /**
-     * Use this parameter to include a list of observations embedded in each ObservationUnit object.   CAUTION - Use this parameter at your own risk. It may return large, unpaginated lists of observation data. Only set this value to True if you are sure you need to.
-     *
-     * @return includeObservations
-     **/
-    @Schema(example = "false", description = "Use this parameter to include a list of observations embedded in each ObservationUnit object.   CAUTION - Use this parameter at your own risk. It may return large, unpaginated lists of observation data. Only set this value to True if you are sure you need to.")
-    public Boolean isIncludeObservations() {
-        return includeObservations;
-    }
-
-    public void setIncludeObservations(Boolean includeObservations) {
-        this.includeObservations = includeObservations;
-    }
-
-    public ObservationUnitSearchRequest locationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addLocationDbIdsItem(String locationDbIdsItem) {
-        if (this.locationDbIds == null) {
-            this.locationDbIds = new ArrayList<String>();
-        }
-        this.locationDbIds.add(locationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The location ids to search for
-     *
-     * @return locationDbIds
-     **/
-    @Schema(example = "[\"b28911cf\",\"5071d1e4\"]", description = "The location ids to search for")
-    public List<String> getLocationDbIds() {
-        return locationDbIds;
-    }
-
-    public void setLocationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-    }
-
-    public ObservationUnitSearchRequest locationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addLocationNamesItem(String locationNamesItem) {
-        if (this.locationNames == null) {
-            this.locationNames = new ArrayList<String>();
-        }
-        this.locationNames.add(locationNamesItem);
-        return this;
-    }
-
-    /**
-     * A human readable names to search for
-     *
-     * @return locationNames
-     **/
-    @Schema(example = "[\"Location Alpha\",\"The Large Hadron Collider\"]", description = "A human readable names to search for")
-    public List<String> getLocationNames() {
-        return locationNames;
-    }
-
-    public void setLocationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-    }
-
-    public ObservationUnitSearchRequest observationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addObservationLevelRelationshipsItem(ObservationUnitLevelRelationship1 observationLevelRelationshipsItem) {
-        if (this.observationLevelRelationships == null) {
-            this.observationLevelRelationships = new ArrayList<ObservationUnitLevelRelationship1>();
-        }
-        this.observationLevelRelationships.add(observationLevelRelationshipsItem);
-        return this;
-    }
-
-    /**
-     * Searches for values in ObservationUnit-&gt;observationUnitPosition-&gt;observationLevelRelationships
-     *
-     * @return observationLevelRelationships
-     **/
-    @Schema(example = "[{\"levelCode\":\"Field_1\",\"levelName\":\"field\"}]", description = "Searches for values in ObservationUnit->observationUnitPosition->observationLevelRelationships")
-    public List<ObservationUnitLevelRelationship1> getObservationLevelRelationships() {
-        return observationLevelRelationships;
-    }
-
-    public void setObservationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-    }
-
-    public ObservationUnitSearchRequest observationLevels(List<ObservationUnitLevel1> observationLevels) {
-        this.observationLevels = observationLevels;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addObservationLevelsItem(ObservationUnitLevel1 observationLevelsItem) {
-        if (this.observationLevels == null) {
-            this.observationLevels = new ArrayList<ObservationUnitLevel1>();
-        }
-        this.observationLevels.add(observationLevelsItem);
-        return this;
-    }
-
-    /**
-     * Searches for values in ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel
-     *
-     * @return observationLevels
-     **/
-    @Schema(example = "[{\"levelCode\":\"Plot_123\",\"levelName\":\"plot\"},{\"levelCode\":\"Plot_456\",\"levelName\":\"plot\"},{\"levelCode\":\"Plot_789\",\"levelName\":\"plot\"}]", description = "Searches for values in ObservationUnit->observationUnitPosition->observationLevel")
-    public List<ObservationUnitLevel1> getObservationLevels() {
-        return observationLevels;
-    }
-
-    public void setObservationLevels(List<ObservationUnitLevel1> observationLevels) {
-        this.observationLevels = observationLevels;
-    }
-
-    public ObservationUnitSearchRequest observationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-        if (this.observationUnitDbIds == null) {
-            this.observationUnitDbIds = new ArrayList<String>();
-        }
-        this.observationUnitDbIds.add(observationUnitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique id of an observation unit
-     *
-     * @return observationUnitDbIds
-     **/
-    @Schema(example = "[\"66bab7e3\",\"0e5e7f99\"]", description = "The unique id of an observation unit")
-    public List<String> getObservationUnitDbIds() {
-        return observationUnitDbIds;
-    }
-
-    public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-    }
-
-    public ObservationUnitSearchRequest observationUnitNames(List<String> observationUnitNames) {
-        this.observationUnitNames = observationUnitNames;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addObservationUnitNamesItem(String observationUnitNamesItem) {
-        if (this.observationUnitNames == null) {
-            this.observationUnitNames = new ArrayList<String>();
-        }
-        this.observationUnitNames.add(observationUnitNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable identifier for an Observation Unit
-     *
-     * @return observationUnitNames
-     **/
-    @Schema(example = "[\"FieldA_PlotB\",\"SpecialPlantName\"]", description = "The human readable identifier for an Observation Unit")
-    public List<String> getObservationUnitNames() {
-        return observationUnitNames;
-    }
-
-    public void setObservationUnitNames(List<String> observationUnitNames) {
-        this.observationUnitNames = observationUnitNames;
-    }
-
-    public ObservationUnitSearchRequest observationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-        if (this.observationVariableDbIds == null) {
-            this.observationVariableDbIds = new ArrayList<String>();
-        }
-        this.observationVariableDbIds.add(observationVariableDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The DbIds of Variables to search for
-     *
-     * @return observationVariableDbIds
-     **/
-    @Schema(example = "[\"a646187d\",\"6d23513b\"]", description = "The DbIds of Variables to search for")
-    public List<String> getObservationVariableDbIds() {
-        return observationVariableDbIds;
-    }
-
-    public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-    }
-
-    public ObservationUnitSearchRequest observationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addObservationVariableNamesItem(String observationVariableNamesItem) {
-        if (this.observationVariableNames == null) {
-            this.observationVariableNames = new ArrayList<String>();
-        }
-        this.observationVariableNames.add(observationVariableNamesItem);
-        return this;
-    }
-
-    /**
-     * The names of Variables to search for
-     *
-     * @return observationVariableNames
-     **/
-    @Schema(example = "[\"Plant Height in meters\",\"Wheat rust score 1-5\"]", description = "The names of Variables to search for")
-    public List<String> getObservationVariableNames() {
-        return observationVariableNames;
-    }
-
-    public void setObservationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-    }
-
-    public ObservationUnitSearchRequest observationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addObservationVariablePUIsItem(String observationVariablePUIsItem) {
-        if (this.observationVariablePUIs == null) {
-            this.observationVariablePUIs = new ArrayList<String>();
-        }
-        this.observationVariablePUIs.add(observationVariablePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI
-     *
-     * @return observationVariablePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008012\",\"http://my-traits.com/trait/CO_123:0007261\"]", description = "The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI")
-    public List<String> getObservationVariablePUIs() {
-        return observationVariablePUIs;
-    }
-
-    public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-    }
-
-    public ObservationUnitSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public ObservationUnitSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public ObservationUnitSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public ObservationUnitSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public ObservationUnitSearchRequest seasonDbIds(List<String> seasonDbIds) {
-        this.seasonDbIds = seasonDbIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addSeasonDbIdsItem(String seasonDbIdsItem) {
-        if (this.seasonDbIds == null) {
-            this.seasonDbIds = new ArrayList<String>();
-        }
-        this.seasonDbIds.add(seasonDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The year or Phenotyping campaign of a multi-annual study (trees, grape, ...)
-     *
-     * @return seasonDbIds
-     **/
-    @Schema(example = "[\"Spring 2018\",\"Season A\"]", description = "The year or Phenotyping campaign of a multi-annual study (trees, grape, ...)")
-    public List<String> getSeasonDbIds() {
-        return seasonDbIds;
-    }
-
-    public void setSeasonDbIds(List<String> seasonDbIds) {
-        this.seasonDbIds = seasonDbIds;
-    }
-
-    public ObservationUnitSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public ObservationUnitSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public ObservationUnitSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public ObservationUnitSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public ObservationUnitSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitSearchRequest observationUnitSearchRequest = (ObservationUnitSearchRequest) o;
-        return Objects.equals(this.commonCropNames, observationUnitSearchRequest.commonCropNames) &&
-                Objects.equals(this.externalReferenceIDs, observationUnitSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, observationUnitSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, observationUnitSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.germplasmDbIds, observationUnitSearchRequest.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, observationUnitSearchRequest.germplasmNames) &&
-                Objects.equals(this.includeObservations, observationUnitSearchRequest.includeObservations) &&
-                Objects.equals(this.locationDbIds, observationUnitSearchRequest.locationDbIds) &&
-                Objects.equals(this.locationNames, observationUnitSearchRequest.locationNames) &&
-                Objects.equals(this.observationLevelRelationships, observationUnitSearchRequest.observationLevelRelationships) &&
-                Objects.equals(this.observationLevels, observationUnitSearchRequest.observationLevels) &&
-                Objects.equals(this.observationUnitDbIds, observationUnitSearchRequest.observationUnitDbIds) &&
-                Objects.equals(this.observationUnitNames, observationUnitSearchRequest.observationUnitNames) &&
-                Objects.equals(this.observationVariableDbIds, observationUnitSearchRequest.observationVariableDbIds) &&
-                Objects.equals(this.observationVariableNames, observationUnitSearchRequest.observationVariableNames) &&
-                Objects.equals(this.observationVariablePUIs, observationUnitSearchRequest.observationVariablePUIs) &&
-                Objects.equals(this.page, observationUnitSearchRequest.page) &&
-                Objects.equals(this.pageSize, observationUnitSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, observationUnitSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, observationUnitSearchRequest.programNames) &&
-                Objects.equals(this.seasonDbIds, observationUnitSearchRequest.seasonDbIds) &&
-                Objects.equals(this.studyDbIds, observationUnitSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, observationUnitSearchRequest.studyNames) &&
-                Objects.equals(this.trialDbIds, observationUnitSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, observationUnitSearchRequest.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds, germplasmNames, includeObservations, locationDbIds, locationNames, observationLevelRelationships, observationLevels, observationUnitDbIds, observationUnitNames, observationVariableDbIds, observationVariableNames, observationVariablePUIs, page, pageSize, programDbIds, programNames, seasonDbIds, studyDbIds, studyNames, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitSearchRequest {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    includeObservations: ").append(toIndentedString(includeObservations)).append("\n");
-        sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-        sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-        sb.append("    observationLevelRelationships: ").append(toIndentedString(observationLevelRelationships)).append("\n");
-        sb.append("    observationLevels: ").append(toIndentedString(observationLevels)).append("\n");
-        sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-        sb.append("    observationUnitNames: ").append(toIndentedString(observationUnitNames)).append("\n");
-        sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-        sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
-        sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    seasonDbIds: ").append(toIndentedString(seasonDbIds)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitSingleResponse.java
deleted file mode 100644
index dc75df80..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ObservationUnitSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationUnit result = null;
-
-    public ObservationUnitSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationUnitSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationUnitSingleResponse result(ObservationUnit result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationUnit getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationUnit result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitSingleResponse observationUnitSingleResponse = (ObservationUnitSingleResponse) o;
-        return Objects.equals(this._atContext, observationUnitSingleResponse._atContext) &&
-                Objects.equals(this.metadata, observationUnitSingleResponse.metadata) &&
-                Objects.equals(this.result, observationUnitSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitTable.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitTable.java
deleted file mode 100644
index 99f535f5..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitTable.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationUnitTable
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitTable {
-    @SerializedName("data")
-    private List<List<String>> data = null;
-
-    /**
-     * valid header fields
-     */
-    @JsonAdapter(HeaderRowEnum.Adapter.class)
-    public enum HeaderRowEnum {
-        OBSERVATIONUNITDBID("observationUnitDbId"),
-        OBSERVATIONUNITNAME("observationUnitName"),
-        STUDYDBID("studyDbId"),
-        STUDYNAME("studyName"),
-        GERMPLASMDBID("germplasmDbId"),
-        GERMPLASMNAME("germplasmName"),
-        POSITIONCOORDINATEX("positionCoordinateX"),
-        POSITIONCOORDINATEY("positionCoordinateY"),
-        YEAR("year"),
-        FIELD("field"),
-        PLOT("plot"),
-        SUB_PLOT("sub-plot"),
-        PLANT("plant"),
-        POT("pot"),
-        BLOCK("block"),
-        ENTRY("entry"),
-        REP("rep");
-
-        private String value;
-
-        HeaderRowEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static HeaderRowEnum fromValue(String input) {
-            for (HeaderRowEnum b : HeaderRowEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<HeaderRowEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final HeaderRowEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public HeaderRowEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return HeaderRowEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("headerRow")
-    private List<HeaderRowEnum> headerRow = null;
-
-    @SerializedName("observationVariables")
-    private List<ObservationTableObservationVariables> observationVariables = null;
-
-    public ObservationUnitTable data(List<List<String>> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ObservationUnitTable addDataItem(List<String> dataItem) {
-        if (this.data == null) {
-            this.data = new ArrayList<List<String>>();
-        }
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The 2D matrix of observation data. ObservationVariables and other metadata are the columns, ObservationUnits are the rows.
-     *
-     * @return data
-     **/
-    @Schema(example = "[[\"f3a8a3db\",\"Plant Alpha\",\"0fe3e48b\",\"2017 Plant Study\",\"06307ec0\",\"A0043001\",\"76.50106681\",\"42.44409301\",\"2017\",\"Field_1\",\"Plot_11\",\"SubPlot_111\",\"Plant_1111\",\"Pot_1111\",\"Block_11\",\"Entry_11\",\"Rep_11\",\"25.3\",\"3\",\"50.75\"],[\"05d1b011\",\"Plant Beta\",\"0fe3e48b\",\"2017 Plant Study\",\"59d435cd\",\"A0043002\",\"76.50106683\",\"42.44409301\",\"2017\",\"Field_1\",\"Plot_11\",\"SubPlot_112\",\"Plant_1122\",\"Pot_1122\",\"Block_11\",\"Entry_11\",\"Rep_12\",\"27.9\",\"1\",\"45.345\"],[\"67e2d87c\",\"Plant Gamma\",\"0fe3e48b\",\"2017 Plant Study\",\"06307ec0\",\"A0043001\",\"76.50106681\",\"42.44409356\",\"2017\",\"Field_1\",\"Plot_12\",\"SubPlot_123\",\"Plant_1233\",\"Pot_1233\",\"Block_12\",\"Entry_12\",\"Rep_11\",\"25.5\",\"3\",\"50.76\"],[\"d98d0d4c\",\"Plant Epsilon\",\"0fe3e48b\",\"2017 Plant Study\",\"59d435cd\",\"A0043002\",\"76.50106683\",\"42.44409356\",\"2017\",\"Field_1\",\"Plot_12\",\"SubPlot_124\",\"Plant_1244\",\"Pot_1244\",\"Block_12\",\"Entry_12\",\"Rep_12\",\"28.9\",\"0\",\"46.5\"]]", description = "The 2D matrix of observation data. ObservationVariables and other metadata are the columns, ObservationUnits are the rows.")
-    public List<List<String>> getData() {
-        return data;
-    }
-
-    public void setData(List<List<String>> data) {
-        this.data = data;
-    }
-
-    public ObservationUnitTable headerRow(List<HeaderRowEnum> headerRow) {
-        this.headerRow = headerRow;
-        return this;
-    }
-
-    public ObservationUnitTable addHeaderRowItem(HeaderRowEnum headerRowItem) {
-        if (this.headerRow == null) {
-            this.headerRow = new ArrayList<HeaderRowEnum>();
-        }
-        this.headerRow.add(headerRowItem);
-        return this;
-    }
-
-    /**
-     * &lt;p&gt;The table is REQUIRED to have the following columns&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitDbId - Each row is related to one Observation Unit&lt;/li&gt;   &lt;li&gt;At least one column with an observationVariableDbId&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table may have any or all of the following OPTIONAL columns. Included columns are decided by the server developer&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;observationUnitName&lt;/li&gt;   &lt;li&gt;studyDbId&lt;/li&gt;   &lt;li&gt;studyName&lt;/li&gt;   &lt;li&gt;germplasmDbId&lt;/li&gt;   &lt;li&gt;germplasmName&lt;/li&gt;   &lt;li&gt;positionCoordinateX&lt;/li&gt;   &lt;li&gt;positionCoordinateY&lt;/li&gt;   &lt;li&gt;year&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The table also may have any number of Observation Unit Hierarchy Level columns. For example:&lt;/p&gt; &lt;ul&gt;   &lt;li&gt;field&lt;/li&gt;   &lt;li&gt;plot&lt;/li&gt;   &lt;li&gt;sub-plot&lt;/li&gt;   &lt;li&gt;plant&lt;/li&gt;   &lt;li&gt;pot&lt;/li&gt;   &lt;li&gt;block&lt;/li&gt;   &lt;li&gt;entry&lt;/li&gt;   &lt;li&gt;rep&lt;/li&gt; &lt;/ul&gt; &lt;p&gt;The JSON representation provides a pair of extra arrays for defining the headers of the table.  The first array \&quot;headerRow\&quot; will always contain \&quot;observationUnitDbId\&quot; and any or all of the OPTIONAL column header names.  The second array \&quot;observationVariables\&quot; contains the names and DbIds for the Observation Variables represented in the table.  By appending the two arrays, you can construct the complete header row of the table. &lt;/p&gt;
-     *
-     * @return headerRow
-     **/
-    @Schema(example = "[\"observationUnitDbId\",\"observationUnitName\",\"studyDbId\",\"studyName\",\"germplasmDbId\",\"germplasmName\",\"positionCoordinateX\",\"positionCoordinateY\",\"year\",\"field\",\"plot\",\"sub-plot\",\"plant\",\"pot\",\"block\",\"entry\",\"rep\"]", description = "<p>The table is REQUIRED to have the following columns</p> <ul>   <li>observationUnitDbId - Each row is related to one Observation Unit</li>   <li>At least one column with an observationVariableDbId</li> </ul> <p>The table may have any or all of the following OPTIONAL columns. Included columns are decided by the server developer</p> <ul>   <li>observationUnitName</li>   <li>studyDbId</li>   <li>studyName</li>   <li>germplasmDbId</li>   <li>germplasmName</li>   <li>positionCoordinateX</li>   <li>positionCoordinateY</li>   <li>year</li> </ul> <p>The table also may have any number of Observation Unit Hierarchy Level columns. For example:</p> <ul>   <li>field</li>   <li>plot</li>   <li>sub-plot</li>   <li>plant</li>   <li>pot</li>   <li>block</li>   <li>entry</li>   <li>rep</li> </ul> <p>The JSON representation provides a pair of extra arrays for defining the headers of the table.  The first array \"headerRow\" will always contain \"observationUnitDbId\" and any or all of the OPTIONAL column header names.  The second array \"observationVariables\" contains the names and DbIds for the Observation Variables represented in the table.  By appending the two arrays, you can construct the complete header row of the table. </p>")
-    public List<HeaderRowEnum> getHeaderRow() {
-        return headerRow;
-    }
-
-    public void setHeaderRow(List<HeaderRowEnum> headerRow) {
-        this.headerRow = headerRow;
-    }
-
-    public ObservationUnitTable observationVariables(List<ObservationTableObservationVariables> observationVariables) {
-        this.observationVariables = observationVariables;
-        return this;
-    }
-
-    public ObservationUnitTable addObservationVariablesItem(ObservationTableObservationVariables observationVariablesItem) {
-        if (this.observationVariables == null) {
-            this.observationVariables = new ArrayList<ObservationTableObservationVariables>();
-        }
-        this.observationVariables.add(observationVariablesItem);
-        return this;
-    }
-
-    /**
-     * The list of observation variables which have values recorded for them in the data matrix. Append to the &#x27;headerRow&#x27; for complete header row of the table.
-     *
-     * @return observationVariables
-     **/
-    @Schema(example = "[{\"observationVariableDbId\":\"367aa1a9\",\"observationVariableName\":\"Plant height\"},{\"observationVariableDbId\":\"2acb934c\",\"observationVariableName\":\"Carotenoid\"},{\"observationVariableDbId\":\"85a21ce1\",\"observationVariableName\":\"Root color\"},{\"observationVariableDbId\":\"46f590e5\",\"observationVariableName\":\"Virus severity\"}]", description = "The list of observation variables which have values recorded for them in the data matrix. Append to the 'headerRow' for complete header row of the table.")
-    public List<ObservationTableObservationVariables> getObservationVariables() {
-        return observationVariables;
-    }
-
-    public void setObservationVariables(List<ObservationTableObservationVariables> observationVariables) {
-        this.observationVariables = observationVariables;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitTable observationUnitTable = (ObservationUnitTable) o;
-        return Objects.equals(this.data, observationUnitTable.data) &&
-                Objects.equals(this.headerRow, observationUnitTable.headerRow) &&
-                Objects.equals(this.observationVariables, observationUnitTable.observationVariables);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data, headerRow, observationVariables);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitTable {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("    headerRow: ").append(toIndentedString(headerRow)).append("\n");
-        sb.append("    observationVariables: ").append(toIndentedString(observationVariables)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitTableResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitTableResponse.java
deleted file mode 100644
index 9cb5cbd8..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitTableResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ObservationUnitTableResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitTableResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationUnitTable result = null;
-
-    public ObservationUnitTableResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationUnitTableResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationUnitTableResponse result(ObservationUnitTable result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationUnitTable getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationUnitTable result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitTableResponse observationUnitTableResponse = (ObservationUnitTableResponse) o;
-        return Objects.equals(this._atContext, observationUnitTableResponse._atContext) &&
-                Objects.equals(this.metadata, observationUnitTableResponse.metadata) &&
-                Objects.equals(this.result, observationUnitTableResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitTableResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitTreatments.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitTreatments.java
deleted file mode 100644
index c82131eb..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationUnitTreatments.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationUnitTreatments
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationUnitTreatments {
-    @SerializedName("factor")
-    private String factor = null;
-
-    @SerializedName("modality")
-    private String modality = null;
-
-    public ObservationUnitTreatments factor(String factor) {
-        this.factor = factor;
-        return this;
-    }
-
-    /**
-     * The type of treatment/factor. ex. &#x27;fertilizer&#x27;, &#x27;inoculation&#x27;, &#x27;irrigation&#x27;, etc  MIAPPE V1.1 (DM-61) Experimental Factor type - Name/Acronym of the experimental factor.
-     *
-     * @return factor
-     **/
-    @Schema(example = "fertilizer", description = "The type of treatment/factor. ex. 'fertilizer', 'inoculation', 'irrigation', etc  MIAPPE V1.1 (DM-61) Experimental Factor type - Name/Acronym of the experimental factor.")
-    public String getFactor() {
-        return factor;
-    }
-
-    public void setFactor(String factor) {
-        this.factor = factor;
-    }
-
-    public ObservationUnitTreatments modality(String modality) {
-        this.modality = modality;
-        return this;
-    }
-
-    /**
-     * The treatment/factor description. ex. &#x27;low fertilizer&#x27;, &#x27;yellow rust inoculation&#x27;, &#x27;high water&#x27;, etc  MIAPPE V1.1 (DM-62) Experimental Factor description - Free text description of the experimental factor. This includes all relevant treatments planned and protocol planned for all the plants targeted by a given experimental factor.
-     *
-     * @return modality
-     **/
-    @Schema(example = "low fertilizer", description = "The treatment/factor description. ex. 'low fertilizer', 'yellow rust inoculation', 'high water', etc  MIAPPE V1.1 (DM-62) Experimental Factor description - Free text description of the experimental factor. This includes all relevant treatments planned and protocol planned for all the plants targeted by a given experimental factor. ")
-    public String getModality() {
-        return modality;
-    }
-
-    public void setModality(String modality) {
-        this.modality = modality;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationUnitTreatments observationUnitTreatments = (ObservationUnitTreatments) o;
-        return Objects.equals(this.factor, observationUnitTreatments.factor) &&
-                Objects.equals(this.modality, observationUnitTreatments.modality);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(factor, modality);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationUnitTreatments {\n");
-
-        sb.append("    factor: ").append(toIndentedString(factor)).append("\n");
-        sb.append("    modality: ").append(toIndentedString(modality)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariable.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariable.java
deleted file mode 100644
index fe67f87b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariable.java
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * ObservationVariable
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariable {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("contextOfUse")
-    private List<String> contextOfUse = null;
-
-    @SerializedName("defaultValue")
-    private String defaultValue = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("growthStage")
-    private String growthStage = null;
-
-    @SerializedName("institution")
-    private String institution = null;
-
-    @SerializedName("language")
-    private String language = null;
-
-    @SerializedName("method")
-    private ObservationVariableMethod method = null;
-
-    @SerializedName("observationVariableDbId")
-    private String observationVariableDbId = null;
-
-    @SerializedName("observationVariableName")
-    private String observationVariableName = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    @SerializedName("scale")
-    private ObservationVariableScale scale = null;
-
-    @SerializedName("scientist")
-    private String scientist = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("submissionTimestamp")
-    private OffsetDateTime submissionTimestamp = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("trait")
-    private ObservationVariableTrait trait = null;
-
-    public ObservationVariable additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationVariable putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationVariable commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Crop name (examples: \&quot;Maize\&quot;, \&quot;Wheat\&quot;)
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Maize", description = "Crop name (examples: \"Maize\", \"Wheat\")")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public ObservationVariable contextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-        return this;
-    }
-
-    public ObservationVariable addContextOfUseItem(String contextOfUseItem) {
-        if (this.contextOfUse == null) {
-            this.contextOfUse = new ArrayList<String>();
-        }
-        this.contextOfUse.add(contextOfUseItem);
-        return this;
-    }
-
-    /**
-     * Indication of how trait is routinely used. (examples: [\&quot;Trial evaluation\&quot;, \&quot;Nursery evaluation\&quot;])
-     *
-     * @return contextOfUse
-     **/
-    @Schema(example = "[\"Trial evaluation\",\"Nursery evaluation\"]", description = "Indication of how trait is routinely used. (examples: [\"Trial evaluation\", \"Nursery evaluation\"])")
-    public List<String> getContextOfUse() {
-        return contextOfUse;
-    }
-
-    public void setContextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-    }
-
-    public ObservationVariable defaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-        return this;
-    }
-
-    /**
-     * Variable default value. (examples: \&quot;red\&quot;, \&quot;2.3\&quot;, etc.)
-     *
-     * @return defaultValue
-     **/
-    @Schema(example = "2.0", description = "Variable default value. (examples: \"red\", \"2.3\", etc.)")
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    public void setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    public ObservationVariable documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/documentation.html", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public ObservationVariable externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationVariable addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationVariable growthStage(String growthStage) {
-        this.growthStage = growthStage;
-        return this;
-    }
-
-    /**
-     * Growth stage at which measurement is made (examples: \&quot;flowering\&quot;)
-     *
-     * @return growthStage
-     **/
-    @Schema(example = "flowering", description = "Growth stage at which measurement is made (examples: \"flowering\")")
-    public String getGrowthStage() {
-        return growthStage;
-    }
-
-    public void setGrowthStage(String growthStage) {
-        this.growthStage = growthStage;
-    }
-
-    public ObservationVariable institution(String institution) {
-        this.institution = institution;
-        return this;
-    }
-
-    /**
-     * Name of institution submitting the variable
-     *
-     * @return institution
-     **/
-    @Schema(example = "The BrAPI Institute", description = "Name of institution submitting the variable")
-    public String getInstitution() {
-        return institution;
-    }
-
-    public void setInstitution(String institution) {
-        this.institution = institution;
-    }
-
-    public ObservationVariable language(String language) {
-        this.language = language;
-        return this;
-    }
-
-    /**
-     * 2 letter ISO 639-1 code for the language of submission of the variable.
-     *
-     * @return language
-     **/
-    @Schema(example = "en", description = "2 letter ISO 639-1 code for the language of submission of the variable.")
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public ObservationVariable method(ObservationVariableMethod method) {
-        this.method = method;
-        return this;
-    }
-
-    /**
-     * Get method
-     *
-     * @return method
-     **/
-    @Schema(description = "")
-    public ObservationVariableMethod getMethod() {
-        return method;
-    }
-
-    public void setMethod(ObservationVariableMethod method) {
-        this.method = method;
-    }
-
-    public ObservationVariable observationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-        return this;
-    }
-
-    /**
-     * Variable unique identifier  MIAPPE V1.1 (DM-83) Variable ID - Code used to identify the variable in the data file. We recommend using a variable definition from the Crop Ontology where possible. Otherwise, the Crop Ontology naming convention is recommended: &lt;trait abbreviation&gt;_&lt;method abbreviation&gt;_&lt;scale abbreviation&gt;). A variable ID must be unique within a given investigation.
-     *
-     * @return observationVariableDbId
-     **/
-    @Schema(example = "b9b7edd1", description = "Variable unique identifier  MIAPPE V1.1 (DM-83) Variable ID - Code used to identify the variable in the data file. We recommend using a variable definition from the Crop Ontology where possible. Otherwise, the Crop Ontology naming convention is recommended: <trait abbreviation>_<method abbreviation>_<scale abbreviation>). A variable ID must be unique within a given investigation.")
-    public String getObservationVariableDbId() {
-        return observationVariableDbId;
-    }
-
-    public void setObservationVariableDbId(String observationVariableDbId) {
-        this.observationVariableDbId = observationVariableDbId;
-    }
-
-    public ObservationVariable observationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-        return this;
-    }
-
-    /**
-     * Variable name (usually a short name)  MIAPPE V1.1 (DM-84) Variable name - Name of the variable.
-     *
-     * @return observationVariableName
-     **/
-    @Schema(example = "Variable Name", description = "Variable name (usually a short name)  MIAPPE V1.1 (DM-84) Variable name - Name of the variable.")
-    public String getObservationVariableName() {
-        return observationVariableName;
-    }
-
-    public void setObservationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-    }
-
-    public ObservationVariable ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public ObservationVariable scale(ObservationVariableScale scale) {
-        this.scale = scale;
-        return this;
-    }
-
-    /**
-     * Get scale
-     *
-     * @return scale
-     **/
-    @Schema(description = "")
-    public ObservationVariableScale getScale() {
-        return scale;
-    }
-
-    public void setScale(ObservationVariableScale scale) {
-        this.scale = scale;
-    }
-
-    public ObservationVariable scientist(String scientist) {
-        this.scientist = scientist;
-        return this;
-    }
-
-    /**
-     * Name of scientist submitting the variable.
-     *
-     * @return scientist
-     **/
-    @Schema(example = "Dr. Bob Robertson", description = "Name of scientist submitting the variable.")
-    public String getScientist() {
-        return scientist;
-    }
-
-    public void setScientist(String scientist) {
-        this.scientist = scientist;
-    }
-
-    public ObservationVariable status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Variable status. (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Variable status. (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public ObservationVariable submissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-        return this;
-    }
-
-    /**
-     * Timestamp when the Variable was added (ISO 8601)
-     *
-     * @return submissionTimestamp
-     **/
-    @Schema(description = "Timestamp when the Variable was added (ISO 8601)")
-    public OffsetDateTime getSubmissionTimestamp() {
-        return submissionTimestamp;
-    }
-
-    public void setSubmissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-    }
-
-    public ObservationVariable synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public ObservationVariable addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other variable names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Maize Height\",\"Stalk Height\",\"Corn Height\"]", description = "Other variable names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public ObservationVariable trait(ObservationVariableTrait trait) {
-        this.trait = trait;
-        return this;
-    }
-
-    /**
-     * Get trait
-     *
-     * @return trait
-     **/
-    @Schema(description = "")
-    public ObservationVariableTrait getTrait() {
-        return trait;
-    }
-
-    public void setTrait(ObservationVariableTrait trait) {
-        this.trait = trait;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariable observationVariable = (ObservationVariable) o;
-        return Objects.equals(this.additionalInfo, observationVariable.additionalInfo) &&
-                Objects.equals(this.commonCropName, observationVariable.commonCropName) &&
-                Objects.equals(this.contextOfUse, observationVariable.contextOfUse) &&
-                Objects.equals(this.defaultValue, observationVariable.defaultValue) &&
-                Objects.equals(this.documentationURL, observationVariable.documentationURL) &&
-                Objects.equals(this.externalReferences, observationVariable.externalReferences) &&
-                Objects.equals(this.growthStage, observationVariable.growthStage) &&
-                Objects.equals(this.institution, observationVariable.institution) &&
-                Objects.equals(this.language, observationVariable.language) &&
-                Objects.equals(this.method, observationVariable.method) &&
-                Objects.equals(this.observationVariableDbId, observationVariable.observationVariableDbId) &&
-                Objects.equals(this.observationVariableName, observationVariable.observationVariableName) &&
-                Objects.equals(this.ontologyReference, observationVariable.ontologyReference) &&
-                Objects.equals(this.scale, observationVariable.scale) &&
-                Objects.equals(this.scientist, observationVariable.scientist) &&
-                Objects.equals(this.status, observationVariable.status) &&
-                Objects.equals(this.submissionTimestamp, observationVariable.submissionTimestamp) &&
-                Objects.equals(this.synonyms, observationVariable.synonyms) &&
-                Objects.equals(this.trait, observationVariable.trait);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, commonCropName, contextOfUse, defaultValue, documentationURL, externalReferences, growthStage, institution, language, method, observationVariableDbId, observationVariableName, ontologyReference, scale, scientist, status, submissionTimestamp, synonyms, trait);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariable {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    contextOfUse: ").append(toIndentedString(contextOfUse)).append("\n");
-        sb.append("    defaultValue: ").append(toIndentedString(defaultValue)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    growthStage: ").append(toIndentedString(growthStage)).append("\n");
-        sb.append("    institution: ").append(toIndentedString(institution)).append("\n");
-        sb.append("    language: ").append(toIndentedString(language)).append("\n");
-        sb.append("    method: ").append(toIndentedString(method)).append("\n");
-        sb.append("    observationVariableDbId: ").append(toIndentedString(observationVariableDbId)).append("\n");
-        sb.append("    observationVariableName: ").append(toIndentedString(observationVariableName)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scale: ").append(toIndentedString(scale)).append("\n");
-        sb.append("    scientist: ").append(toIndentedString(scientist)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    submissionTimestamp: ").append(toIndentedString(submissionTimestamp)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    trait: ").append(toIndentedString(trait)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableListResponse.java
deleted file mode 100644
index 6c2dcac5..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ObservationVariableListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationVariableListResponseResult result = null;
-
-    public ObservationVariableListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationVariableListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationVariableListResponse result(ObservationVariableListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationVariableListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationVariableListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableListResponse observationVariableListResponse = (ObservationVariableListResponse) o;
-        return Objects.equals(this._atContext, observationVariableListResponse._atContext) &&
-                Objects.equals(this.metadata, observationVariableListResponse.metadata) &&
-                Objects.equals(this.result, observationVariableListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableListResponseResult.java
deleted file mode 100644
index 7bb657d7..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationVariableListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableListResponseResult {
-    @SerializedName("data")
-    private List<ObservationVariable> data = new ArrayList<ObservationVariable>();
-
-    public ObservationVariableListResponseResult data(List<ObservationVariable> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ObservationVariableListResponseResult addDataItem(ObservationVariable dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<ObservationVariable> getData() {
-        return data;
-    }
-
-    public void setData(List<ObservationVariable> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableListResponseResult observationVariableListResponseResult = (ObservationVariableListResponseResult) o;
-        return Objects.equals(this.data, observationVariableListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableMethod.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableMethod.java
deleted file mode 100644
index b2e232a8..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableMethod.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A description of the way an Observation should be collected.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Method \&quot;estimation\&quot; or \&quot;drone image processing\&quot;.
- */
-@Schema(description = "A description of the way an Observation should be collected.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Method \"estimation\" or \"drone image processing\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableMethod {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("bibliographicalReference")
-    private String bibliographicalReference = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("formula")
-    private String formula = null;
-
-    @SerializedName("methodClass")
-    private String methodClass = null;
-
-    @SerializedName("methodDbId")
-    private String methodDbId = null;
-
-    @SerializedName("methodName")
-    private String methodName = null;
-
-    @SerializedName("methodPUI")
-    private String methodPUI = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    public ObservationVariableMethod additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationVariableMethod putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationVariableMethod bibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-        return this;
-    }
-
-    /**
-     * Bibliographical reference describing the method. &lt;br/&gt;MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.
-     *
-     * @return bibliographicalReference
-     **/
-    @Schema(example = "Smith, 1893, Really Cool Paper, Popular Journal", description = "Bibliographical reference describing the method. <br/>MIAPPE V1.1 (DM-91) Reference associated to the method - URI/DOI of reference describing the method.")
-    public String getBibliographicalReference() {
-        return bibliographicalReference;
-    }
-
-    public void setBibliographicalReference(String bibliographicalReference) {
-        this.bibliographicalReference = bibliographicalReference;
-    }
-
-    public ObservationVariableMethod description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Method description &lt;br/&gt;MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)
-     *
-     * @return description
-     **/
-    @Schema(example = "A measuring tape was used", description = "Method description <br/>MIAPPE V1.1 (DM-90) Method description - Textual description of the method, which may extend a method defined in an external reference with specific parameters, e.g. growth stage, inoculation precise organ (leaf number)")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public ObservationVariableMethod externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationVariableMethod addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationVariableMethod formula(String formula) {
-        this.formula = formula;
-        return this;
-    }
-
-    /**
-     * For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation
-     *
-     * @return formula
-     **/
-    @Schema(example = "a^2 + b^2 = c^2", description = "For computational methods i.e., when the method consists in assessing the trait by computing measurements, write the generic formula used for the calculation")
-    public String getFormula() {
-        return formula;
-    }
-
-    public void setFormula(String formula) {
-        this.formula = formula;
-    }
-
-    public ObservationVariableMethod methodClass(String methodClass) {
-        this.methodClass = methodClass;
-        return this;
-    }
-
-    /**
-     * Method class (examples: \&quot;Measurement\&quot;, \&quot;Counting\&quot;, \&quot;Estimation\&quot;, \&quot;Computation\&quot;, etc.)
-     *
-     * @return methodClass
-     **/
-    @Schema(example = "Measurement", description = "Method class (examples: \"Measurement\", \"Counting\", \"Estimation\", \"Computation\", etc.)")
-    public String getMethodClass() {
-        return methodClass;
-    }
-
-    public void setMethodClass(String methodClass) {
-        this.methodClass = methodClass;
-    }
-
-    public ObservationVariableMethod methodDbId(String methodDbId) {
-        this.methodDbId = methodDbId;
-        return this;
-    }
-
-    /**
-     * Method unique identifier
-     *
-     * @return methodDbId
-     **/
-    @Schema(example = "0adb2764", description = "Method unique identifier")
-    public String getMethodDbId() {
-        return methodDbId;
-    }
-
-    public void setMethodDbId(String methodDbId) {
-        this.methodDbId = methodDbId;
-    }
-
-    public ObservationVariableMethod methodName(String methodName) {
-        this.methodName = methodName;
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodName
-     **/
-    @Schema(example = "Measuring Tape", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public String getMethodName() {
-        return methodName;
-    }
-
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
-    public ObservationVariableMethod methodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000212", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public String getMethodPUI() {
-        return methodPUI;
-    }
-
-    public void setMethodPUI(String methodPUI) {
-        this.methodPUI = methodPUI;
-    }
-
-    public ObservationVariableMethod ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableMethod observationVariableMethod = (ObservationVariableMethod) o;
-        return Objects.equals(this.additionalInfo, observationVariableMethod.additionalInfo) &&
-                Objects.equals(this.bibliographicalReference, observationVariableMethod.bibliographicalReference) &&
-                Objects.equals(this.description, observationVariableMethod.description) &&
-                Objects.equals(this.externalReferences, observationVariableMethod.externalReferences) &&
-                Objects.equals(this.formula, observationVariableMethod.formula) &&
-                Objects.equals(this.methodClass, observationVariableMethod.methodClass) &&
-                Objects.equals(this.methodDbId, observationVariableMethod.methodDbId) &&
-                Objects.equals(this.methodName, observationVariableMethod.methodName) &&
-                Objects.equals(this.methodPUI, observationVariableMethod.methodPUI) &&
-                Objects.equals(this.ontologyReference, observationVariableMethod.ontologyReference);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, bibliographicalReference, description, externalReferences, formula, methodClass, methodDbId, methodName, methodPUI, ontologyReference);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableMethod {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    bibliographicalReference: ").append(toIndentedString(bibliographicalReference)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    formula: ").append(toIndentedString(formula)).append("\n");
-        sb.append("    methodClass: ").append(toIndentedString(methodClass)).append("\n");
-        sb.append("    methodDbId: ").append(toIndentedString(methodDbId)).append("\n");
-        sb.append("    methodName: ").append(toIndentedString(methodName)).append("\n");
-        sb.append("    methodPUI: ").append(toIndentedString(methodPUI)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableNewRequest.java
deleted file mode 100644
index 4adf5df9..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableNewRequest.java
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * ObservationVariableNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("contextOfUse")
-    private List<String> contextOfUse = null;
-
-    @SerializedName("defaultValue")
-    private String defaultValue = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("growthStage")
-    private String growthStage = null;
-
-    @SerializedName("institution")
-    private String institution = null;
-
-    @SerializedName("language")
-    private String language = null;
-
-    @SerializedName("method")
-    private ObservationVariableMethod method = null;
-
-    @SerializedName("observationVariableName")
-    private String observationVariableName = null;
-
-    @SerializedName("observationVariablePUI")
-    private String observationVariablePUI = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    @SerializedName("scale")
-    private ObservationVariableScale scale = null;
-
-    @SerializedName("scientist")
-    private String scientist = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("submissionTimestamp")
-    private OffsetDateTime submissionTimestamp = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("trait")
-    private ObservationVariableTrait trait = null;
-
-    public ObservationVariableNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationVariableNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationVariableNewRequest commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Crop name (examples: \&quot;Maize\&quot;, \&quot;Wheat\&quot;)
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Maize", description = "Crop name (examples: \"Maize\", \"Wheat\")")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public ObservationVariableNewRequest contextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-        return this;
-    }
-
-    public ObservationVariableNewRequest addContextOfUseItem(String contextOfUseItem) {
-        if (this.contextOfUse == null) {
-            this.contextOfUse = new ArrayList<String>();
-        }
-        this.contextOfUse.add(contextOfUseItem);
-        return this;
-    }
-
-    /**
-     * Indication of how trait is routinely used. (examples: [\&quot;Trial evaluation\&quot;, \&quot;Nursery evaluation\&quot;])
-     *
-     * @return contextOfUse
-     **/
-    @Schema(example = "[\"Trial evaluation\",\"Nursery evaluation\"]", description = "Indication of how trait is routinely used. (examples: [\"Trial evaluation\", \"Nursery evaluation\"])")
-    public List<String> getContextOfUse() {
-        return contextOfUse;
-    }
-
-    public void setContextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-    }
-
-    public ObservationVariableNewRequest defaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-        return this;
-    }
-
-    /**
-     * Variable default value. (examples: \&quot;red\&quot;, \&quot;2.3\&quot;, etc.)
-     *
-     * @return defaultValue
-     **/
-    @Schema(example = "2.0", description = "Variable default value. (examples: \"red\", \"2.3\", etc.)")
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    public void setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    public ObservationVariableNewRequest documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/documentation.html", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public ObservationVariableNewRequest externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationVariableNewRequest addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationVariableNewRequest growthStage(String growthStage) {
-        this.growthStage = growthStage;
-        return this;
-    }
-
-    /**
-     * Growth stage at which measurement is made (examples: \&quot;flowering\&quot;)
-     *
-     * @return growthStage
-     **/
-    @Schema(example = "flowering", description = "Growth stage at which measurement is made (examples: \"flowering\")")
-    public String getGrowthStage() {
-        return growthStage;
-    }
-
-    public void setGrowthStage(String growthStage) {
-        this.growthStage = growthStage;
-    }
-
-    public ObservationVariableNewRequest institution(String institution) {
-        this.institution = institution;
-        return this;
-    }
-
-    /**
-     * Name of institution submitting the variable
-     *
-     * @return institution
-     **/
-    @Schema(example = "The BrAPI Institute", description = "Name of institution submitting the variable")
-    public String getInstitution() {
-        return institution;
-    }
-
-    public void setInstitution(String institution) {
-        this.institution = institution;
-    }
-
-    public ObservationVariableNewRequest language(String language) {
-        this.language = language;
-        return this;
-    }
-
-    /**
-     * 2 letter ISO 639-1 code for the language of submission of the variable.
-     *
-     * @return language
-     **/
-    @Schema(example = "en", description = "2 letter ISO 639-1 code for the language of submission of the variable.")
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public ObservationVariableNewRequest method(ObservationVariableMethod method) {
-        this.method = method;
-        return this;
-    }
-
-    /**
-     * Get method
-     *
-     * @return method
-     **/
-    @Schema(description = "")
-    public ObservationVariableMethod getMethod() {
-        return method;
-    }
-
-    public void setMethod(ObservationVariableMethod method) {
-        this.method = method;
-    }
-
-    public ObservationVariableNewRequest observationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-        return this;
-    }
-
-    /**
-     * Human readable name of an Observation Variable
-     *
-     * @return observationVariableName
-     **/
-    @Schema(example = "Variable Name", description = "Human readable name of an Observation Variable")
-    public String getObservationVariableName() {
-        return observationVariableName;
-    }
-
-    public void setObservationVariableName(String observationVariableName) {
-        this.observationVariableName = observationVariableName;
-    }
-
-    public ObservationVariableNewRequest observationVariablePUI(String observationVariablePUI) {
-        this.observationVariablePUI = observationVariablePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Observation Variable, usually in the form of a URI
-     *
-     * @return observationVariablePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0009012", description = "The Permanent Unique Identifier of a Observation Variable, usually in the form of a URI")
-    public String getObservationVariablePUI() {
-        return observationVariablePUI;
-    }
-
-    public void setObservationVariablePUI(String observationVariablePUI) {
-        this.observationVariablePUI = observationVariablePUI;
-    }
-
-    public ObservationVariableNewRequest ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public ObservationVariableNewRequest scale(ObservationVariableScale scale) {
-        this.scale = scale;
-        return this;
-    }
-
-    /**
-     * Get scale
-     *
-     * @return scale
-     **/
-    @Schema(description = "")
-    public ObservationVariableScale getScale() {
-        return scale;
-    }
-
-    public void setScale(ObservationVariableScale scale) {
-        this.scale = scale;
-    }
-
-    public ObservationVariableNewRequest scientist(String scientist) {
-        this.scientist = scientist;
-        return this;
-    }
-
-    /**
-     * Name of scientist submitting the variable.
-     *
-     * @return scientist
-     **/
-    @Schema(example = "Dr. Bob Robertson", description = "Name of scientist submitting the variable.")
-    public String getScientist() {
-        return scientist;
-    }
-
-    public void setScientist(String scientist) {
-        this.scientist = scientist;
-    }
-
-    public ObservationVariableNewRequest status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Variable status. (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Variable status. (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public ObservationVariableNewRequest submissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-        return this;
-    }
-
-    /**
-     * Timestamp when the Variable was added (ISO 8601)
-     *
-     * @return submissionTimestamp
-     **/
-    @Schema(description = "Timestamp when the Variable was added (ISO 8601)")
-    public OffsetDateTime getSubmissionTimestamp() {
-        return submissionTimestamp;
-    }
-
-    public void setSubmissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-    }
-
-    public ObservationVariableNewRequest synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public ObservationVariableNewRequest addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other variable names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Maize Height\",\"Stalk Height\",\"Corn Height\"]", description = "Other variable names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public ObservationVariableNewRequest trait(ObservationVariableTrait trait) {
-        this.trait = trait;
-        return this;
-    }
-
-    /**
-     * Get trait
-     *
-     * @return trait
-     **/
-    @Schema(description = "")
-    public ObservationVariableTrait getTrait() {
-        return trait;
-    }
-
-    public void setTrait(ObservationVariableTrait trait) {
-        this.trait = trait;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableNewRequest observationVariableNewRequest = (ObservationVariableNewRequest) o;
-        return Objects.equals(this.additionalInfo, observationVariableNewRequest.additionalInfo) &&
-                Objects.equals(this.commonCropName, observationVariableNewRequest.commonCropName) &&
-                Objects.equals(this.contextOfUse, observationVariableNewRequest.contextOfUse) &&
-                Objects.equals(this.defaultValue, observationVariableNewRequest.defaultValue) &&
-                Objects.equals(this.documentationURL, observationVariableNewRequest.documentationURL) &&
-                Objects.equals(this.externalReferences, observationVariableNewRequest.externalReferences) &&
-                Objects.equals(this.growthStage, observationVariableNewRequest.growthStage) &&
-                Objects.equals(this.institution, observationVariableNewRequest.institution) &&
-                Objects.equals(this.language, observationVariableNewRequest.language) &&
-                Objects.equals(this.method, observationVariableNewRequest.method) &&
-                Objects.equals(this.observationVariableName, observationVariableNewRequest.observationVariableName) &&
-                Objects.equals(this.observationVariablePUI, observationVariableNewRequest.observationVariablePUI) &&
-                Objects.equals(this.ontologyReference, observationVariableNewRequest.ontologyReference) &&
-                Objects.equals(this.scale, observationVariableNewRequest.scale) &&
-                Objects.equals(this.scientist, observationVariableNewRequest.scientist) &&
-                Objects.equals(this.status, observationVariableNewRequest.status) &&
-                Objects.equals(this.submissionTimestamp, observationVariableNewRequest.submissionTimestamp) &&
-                Objects.equals(this.synonyms, observationVariableNewRequest.synonyms) &&
-                Objects.equals(this.trait, observationVariableNewRequest.trait);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, commonCropName, contextOfUse, defaultValue, documentationURL, externalReferences, growthStage, institution, language, method, observationVariableName, observationVariablePUI, ontologyReference, scale, scientist, status, submissionTimestamp, synonyms, trait);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    contextOfUse: ").append(toIndentedString(contextOfUse)).append("\n");
-        sb.append("    defaultValue: ").append(toIndentedString(defaultValue)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    growthStage: ").append(toIndentedString(growthStage)).append("\n");
-        sb.append("    institution: ").append(toIndentedString(institution)).append("\n");
-        sb.append("    language: ").append(toIndentedString(language)).append("\n");
-        sb.append("    method: ").append(toIndentedString(method)).append("\n");
-        sb.append("    observationVariableName: ").append(toIndentedString(observationVariableName)).append("\n");
-        sb.append("    observationVariablePUI: ").append(toIndentedString(observationVariablePUI)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scale: ").append(toIndentedString(scale)).append("\n");
-        sb.append("    scientist: ").append(toIndentedString(scientist)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    submissionTimestamp: ").append(toIndentedString(submissionTimestamp)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    trait: ").append(toIndentedString(trait)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableScale.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableScale.java
deleted file mode 100644
index 832e9c18..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableScale.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * A Scale describes the units and acceptable values for an ObservationVariable.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Scale \&quot;inches\&quot; or \&quot;pixels\&quot;.
- */
-@Schema(description = "A Scale describes the units and acceptable values for an ObservationVariable.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Scale \"inches\" or \"pixels\".")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableScale {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypeEnum.Adapter.class)
-    public enum DataTypeEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypeEnum fromValue(String input) {
-            for (DataTypeEnum b : DataTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataType")
-    private DataTypeEnum dataType = null;
-
-    @SerializedName("decimalPlaces")
-    private Integer decimalPlaces = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    @SerializedName("scaleDbId")
-    private String scaleDbId = null;
-
-    @SerializedName("scaleName")
-    private String scaleName = null;
-
-    @SerializedName("scalePUI")
-    private String scalePUI = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    @SerializedName("validValues")
-    private ObservationVariableScaleValidValues validValues = null;
-
-    public ObservationVariableScale additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationVariableScale putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationVariableScale dataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-        return this;
-    }
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     *
-     * @return dataType
-     **/
-    @Schema(example = "Numerical", description = "<p>Class of the scale, entries can be</p> <p>\"Code\" -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \"75VD\" means \"75 %\" of the plant is infected and the plant is very delayed.</p> <p>\"Date\" - The date class is for events expressed in a time format, See ISO 8601</p> <p>\"Duration\" - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months</p> <p>\"Nominal\" - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories</p> <p>\"Numerical\" - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches</p> <p>\"Ordinal\" - Ordinal scales are scales composed of ordered categories</p> <p>\"Text\" - A free text is used to express the trait.</p>")
-    public DataTypeEnum getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-    }
-
-    public ObservationVariableScale decimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-        return this;
-    }
-
-    /**
-     * For numerical, number of decimal places to be reported
-     *
-     * @return decimalPlaces
-     **/
-    @Schema(example = "2", description = "For numerical, number of decimal places to be reported")
-    public Integer getDecimalPlaces() {
-        return decimalPlaces;
-    }
-
-    public void setDecimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-    }
-
-    public ObservationVariableScale externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationVariableScale addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationVariableScale ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public ObservationVariableScale scaleDbId(String scaleDbId) {
-        this.scaleDbId = scaleDbId;
-        return this;
-    }
-
-    /**
-     * Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.
-     *
-     * @return scaleDbId
-     **/
-    @Schema(example = "af730171", description = "Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.")
-    public String getScaleDbId() {
-        return scaleDbId;
-    }
-
-    public void setScaleDbId(String scaleDbId) {
-        this.scaleDbId = scaleDbId;
-    }
-
-    public ObservationVariableScale scaleName(String scaleName) {
-        this.scaleName = scaleName;
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleName
-     **/
-    @Schema(example = "Meters", description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public String getScaleName() {
-        return scaleName;
-    }
-
-    public void setScaleName(String scaleName) {
-        this.scaleName = scaleName;
-    }
-
-    public ObservationVariableScale scalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000112", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public String getScalePUI() {
-        return scalePUI;
-    }
-
-    public void setScalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-    }
-
-    public ObservationVariableScale units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when &#x60;dataType&#x60; is Numeric, but could also be included for other dataTypes when applicable.
-     *
-     * @return units
-     **/
-    @Schema(example = "m", description = "This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when `dataType` is Numeric, but could also be included for other dataTypes when applicable.")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    public ObservationVariableScale validValues(ObservationVariableScaleValidValues validValues) {
-        this.validValues = validValues;
-        return this;
-    }
-
-    /**
-     * Get validValues
-     *
-     * @return validValues
-     **/
-    @Schema(description = "")
-    public ObservationVariableScaleValidValues getValidValues() {
-        return validValues;
-    }
-
-    public void setValidValues(ObservationVariableScaleValidValues validValues) {
-        this.validValues = validValues;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableScale observationVariableScale = (ObservationVariableScale) o;
-        return Objects.equals(this.additionalInfo, observationVariableScale.additionalInfo) &&
-                Objects.equals(this.dataType, observationVariableScale.dataType) &&
-                Objects.equals(this.decimalPlaces, observationVariableScale.decimalPlaces) &&
-                Objects.equals(this.externalReferences, observationVariableScale.externalReferences) &&
-                Objects.equals(this.ontologyReference, observationVariableScale.ontologyReference) &&
-                Objects.equals(this.scaleDbId, observationVariableScale.scaleDbId) &&
-                Objects.equals(this.scaleName, observationVariableScale.scaleName) &&
-                Objects.equals(this.scalePUI, observationVariableScale.scalePUI) &&
-                Objects.equals(this.units, observationVariableScale.units) &&
-                Objects.equals(this.validValues, observationVariableScale.validValues);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, dataType, decimalPlaces, externalReferences, ontologyReference, scaleDbId, scaleName, scalePUI, units, validValues);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableScale {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
-        sb.append("    decimalPlaces: ").append(toIndentedString(decimalPlaces)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scaleDbId: ").append(toIndentedString(scaleDbId)).append("\n");
-        sb.append("    scaleName: ").append(toIndentedString(scaleName)).append("\n");
-        sb.append("    scalePUI: ").append(toIndentedString(scalePUI)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("    validValues: ").append(toIndentedString(validValues)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableScaleValidValues.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableScaleValidValues.java
deleted file mode 100644
index d167e8aa..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableScaleValidValues.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationVariableScaleValidValues
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableScaleValidValues {
-    @SerializedName("categories")
-    private List<ObservationVariableScaleValidValuesCategories> categories = null;
-
-    @SerializedName("max")
-    private Integer max = null;
-
-    @SerializedName("maximumValue")
-    private String maximumValue = null;
-
-    @SerializedName("min")
-    private Integer min = null;
-
-    @SerializedName("minimumValue")
-    private String minimumValue = null;
-
-    public ObservationVariableScaleValidValues categories(List<ObservationVariableScaleValidValuesCategories> categories) {
-        this.categories = categories;
-        return this;
-    }
-
-    public ObservationVariableScaleValidValues addCategoriesItem(ObservationVariableScaleValidValuesCategories categoriesItem) {
-        if (this.categories == null) {
-            this.categories = new ArrayList<ObservationVariableScaleValidValuesCategories>();
-        }
-        this.categories.add(categoriesItem);
-        return this;
-    }
-
-    /**
-     * List of possible values with optional labels
-     *
-     * @return categories
-     **/
-    @Schema(example = "[{\"label\":\"low\",\"value\":\"0\"},{\"label\":\"medium\",\"value\":\"5\"},{\"label\":\"high\",\"value\":\"10\"}]", description = "List of possible values with optional labels")
-    public List<ObservationVariableScaleValidValuesCategories> getCategories() {
-        return categories;
-    }
-
-    public void setCategories(List<ObservationVariableScaleValidValuesCategories> categories) {
-        this.categories = categories;
-    }
-
-    public ObservationVariableScaleValidValues max(Integer max) {
-        this.max = max;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;maximumValue&#x60;. Github issue number #450  &lt;br&gt;Maximum value for numerical scales. Typically used for data capture control and QC.
-     *
-     * @return max
-     **/
-    @Schema(example = "9999", description = "**Deprecated in v2.1** Please use `maximumValue`. Github issue number #450  <br>Maximum value for numerical scales. Typically used for data capture control and QC.")
-    public Integer getMax() {
-        return max;
-    }
-
-    public void setMax(Integer max) {
-        this.max = max;
-    }
-
-    public ObservationVariableScaleValidValues maximumValue(String maximumValue) {
-        this.maximumValue = maximumValue;
-        return this;
-    }
-
-    /**
-     * Maximum value for numerical, date, and time scales. Typically used for data capture control and QC.
-     *
-     * @return maximumValue
-     **/
-    @Schema(example = "9999", description = "Maximum value for numerical, date, and time scales. Typically used for data capture control and QC.")
-    public String getMaximumValue() {
-        return maximumValue;
-    }
-
-    public void setMaximumValue(String maximumValue) {
-        this.maximumValue = maximumValue;
-    }
-
-    public ObservationVariableScaleValidValues min(Integer min) {
-        this.min = min;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;minimumValue&#x60;. Github issue number #450  &lt;br&gt;Minimum value for numerical scales. Typically used for data capture control and QC.
-     *
-     * @return min
-     **/
-    @Schema(example = "2", description = "**Deprecated in v2.1** Please use `minimumValue`. Github issue number #450  <br>Minimum value for numerical scales. Typically used for data capture control and QC.")
-    public Integer getMin() {
-        return min;
-    }
-
-    public void setMin(Integer min) {
-        this.min = min;
-    }
-
-    public ObservationVariableScaleValidValues minimumValue(String minimumValue) {
-        this.minimumValue = minimumValue;
-        return this;
-    }
-
-    /**
-     * Minimum value for numerical, date, and time scales. Typically used for data capture control and QC.
-     *
-     * @return minimumValue
-     **/
-    @Schema(example = "2", description = "Minimum value for numerical, date, and time scales. Typically used for data capture control and QC.")
-    public String getMinimumValue() {
-        return minimumValue;
-    }
-
-    public void setMinimumValue(String minimumValue) {
-        this.minimumValue = minimumValue;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableScaleValidValues observationVariableScaleValidValues = (ObservationVariableScaleValidValues) o;
-        return Objects.equals(this.categories, observationVariableScaleValidValues.categories) &&
-                Objects.equals(this.max, observationVariableScaleValidValues.max) &&
-                Objects.equals(this.maximumValue, observationVariableScaleValidValues.maximumValue) &&
-                Objects.equals(this.min, observationVariableScaleValidValues.min) &&
-                Objects.equals(this.minimumValue, observationVariableScaleValidValues.minimumValue);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(categories, max, maximumValue, min, minimumValue);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableScaleValidValues {\n");
-
-        sb.append("    categories: ").append(toIndentedString(categories)).append("\n");
-        sb.append("    max: ").append(toIndentedString(max)).append("\n");
-        sb.append("    maximumValue: ").append(toIndentedString(maximumValue)).append("\n");
-        sb.append("    min: ").append(toIndentedString(min)).append("\n");
-        sb.append("    minimumValue: ").append(toIndentedString(minimumValue)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableScaleValidValuesCategories.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableScaleValidValuesCategories.java
deleted file mode 100644
index 8465e4f4..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableScaleValidValuesCategories.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * ObservationVariableScaleValidValuesCategories
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableScaleValidValuesCategories {
-    @SerializedName("label")
-    private String label = null;
-
-    @SerializedName("value")
-    private String value = null;
-
-    public ObservationVariableScaleValidValuesCategories label(String label) {
-        this.label = label;
-        return this;
-    }
-
-    /**
-     * A text label for a category
-     *
-     * @return label
-     **/
-    @Schema(description = "A text label for a category")
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    public ObservationVariableScaleValidValuesCategories value(String value) {
-        this.value = value;
-        return this;
-    }
-
-    /**
-     * The actual value for a category
-     *
-     * @return value
-     **/
-    @Schema(description = "The actual value for a category")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableScaleValidValuesCategories observationVariableScaleValidValuesCategories = (ObservationVariableScaleValidValuesCategories) o;
-        return Objects.equals(this.label, observationVariableScaleValidValuesCategories.label) &&
-                Objects.equals(this.value, observationVariableScaleValidValuesCategories.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(label, value);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableScaleValidValuesCategories {\n");
-
-        sb.append("    label: ").append(toIndentedString(label)).append("\n");
-        sb.append("    value: ").append(toIndentedString(value)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableSearchRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableSearchRequest.java
deleted file mode 100644
index 889b7126..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableSearchRequest.java
+++ /dev/null
@@ -1,1130 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ObservationVariableSearchRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableSearchRequest {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypesEnum.Adapter.class)
-    public enum DataTypesEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypesEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypesEnum fromValue(String input) {
-            for (DataTypesEnum b : DataTypesEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypesEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypesEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypesEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypesEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataTypes")
-    private List<DataTypesEnum> dataTypes = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("methodDbIds")
-    private List<String> methodDbIds = null;
-
-    @SerializedName("methodNames")
-    private List<String> methodNames = null;
-
-    @SerializedName("methodPUIs")
-    private List<String> methodPUIs = null;
-
-    @SerializedName("observationVariableDbIds")
-    private List<String> observationVariableDbIds = null;
-
-    @SerializedName("observationVariableNames")
-    private List<String> observationVariableNames = null;
-
-    @SerializedName("observationVariablePUIs")
-    private List<String> observationVariablePUIs = null;
-
-    @SerializedName("ontologyDbIds")
-    private List<String> ontologyDbIds = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("scaleDbIds")
-    private List<String> scaleDbIds = null;
-
-    @SerializedName("scaleNames")
-    private List<String> scaleNames = null;
-
-    @SerializedName("scalePUIs")
-    private List<String> scalePUIs = null;
-
-    @SerializedName("studyDbId")
-    private List<String> studyDbId = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("traitAttributePUIs")
-    private List<String> traitAttributePUIs = null;
-
-    @SerializedName("traitAttributes")
-    private List<String> traitAttributes = null;
-
-    @SerializedName("traitClasses")
-    private List<String> traitClasses = null;
-
-    @SerializedName("traitDbIds")
-    private List<String> traitDbIds = null;
-
-    @SerializedName("traitEntities")
-    private List<String> traitEntities = null;
-
-    @SerializedName("traitEntityPUIs")
-    private List<String> traitEntityPUIs = null;
-
-    @SerializedName("traitNames")
-    private List<String> traitNames = null;
-
-    @SerializedName("traitPUIs")
-    private List<String> traitPUIs = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public ObservationVariableSearchRequest commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public ObservationVariableSearchRequest dataTypes(List<DataTypesEnum> dataTypes) {
-        this.dataTypes = dataTypes;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addDataTypesItem(DataTypesEnum dataTypesItem) {
-        if (this.dataTypes == null) {
-            this.dataTypes = new ArrayList<DataTypesEnum>();
-        }
-        this.dataTypes.add(dataTypesItem);
-        return this;
-    }
-
-    /**
-     * List of scale data types to filter search results
-     *
-     * @return dataTypes
-     **/
-    @Schema(example = "[\"Numerical\",\"Ordinal\",\"Text\"]", description = "List of scale data types to filter search results")
-    public List<DataTypesEnum> getDataTypes() {
-        return dataTypes;
-    }
-
-    public void setDataTypes(List<DataTypesEnum> dataTypes) {
-        this.dataTypes = dataTypes;
-    }
-
-    public ObservationVariableSearchRequest externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public ObservationVariableSearchRequest externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public ObservationVariableSearchRequest externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public ObservationVariableSearchRequest methodDbIds(List<String> methodDbIds) {
-        this.methodDbIds = methodDbIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addMethodDbIdsItem(String methodDbIdsItem) {
-        if (this.methodDbIds == null) {
-            this.methodDbIds = new ArrayList<String>();
-        }
-        this.methodDbIds.add(methodDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of methods to filter search results
-     *
-     * @return methodDbIds
-     **/
-    @Schema(example = "[\"07e34f83\",\"d3d5517a\"]", description = "List of methods to filter search results")
-    public List<String> getMethodDbIds() {
-        return methodDbIds;
-    }
-
-    public void setMethodDbIds(List<String> methodDbIds) {
-        this.methodDbIds = methodDbIds;
-    }
-
-    public ObservationVariableSearchRequest methodNames(List<String> methodNames) {
-        this.methodNames = methodNames;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addMethodNamesItem(String methodNamesItem) {
-        if (this.methodNames == null) {
-            this.methodNames = new ArrayList<String>();
-        }
-        this.methodNames.add(methodNamesItem);
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodNames
-     **/
-    @Schema(example = "[\"Measuring Tape\",\"Spectrometer\"]", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public List<String> getMethodNames() {
-        return methodNames;
-    }
-
-    public void setMethodNames(List<String> methodNames) {
-        this.methodNames = methodNames;
-    }
-
-    public ObservationVariableSearchRequest methodPUIs(List<String> methodPUIs) {
-        this.methodPUIs = methodPUIs;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addMethodPUIsItem(String methodPUIsItem) {
-        if (this.methodPUIs == null) {
-            this.methodPUIs = new ArrayList<String>();
-        }
-        this.methodPUIs.add(methodPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000212\",\"http://my-traits.com/trait/CO_123:0003557\"]", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public List<String> getMethodPUIs() {
-        return methodPUIs;
-    }
-
-    public void setMethodPUIs(List<String> methodPUIs) {
-        this.methodPUIs = methodPUIs;
-    }
-
-    public ObservationVariableSearchRequest observationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-        if (this.observationVariableDbIds == null) {
-            this.observationVariableDbIds = new ArrayList<String>();
-        }
-        this.observationVariableDbIds.add(observationVariableDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The DbIds of Variables to search for
-     *
-     * @return observationVariableDbIds
-     **/
-    @Schema(example = "[\"a646187d\",\"6d23513b\"]", description = "The DbIds of Variables to search for")
-    public List<String> getObservationVariableDbIds() {
-        return observationVariableDbIds;
-    }
-
-    public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-    }
-
-    public ObservationVariableSearchRequest observationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addObservationVariableNamesItem(String observationVariableNamesItem) {
-        if (this.observationVariableNames == null) {
-            this.observationVariableNames = new ArrayList<String>();
-        }
-        this.observationVariableNames.add(observationVariableNamesItem);
-        return this;
-    }
-
-    /**
-     * The names of Variables to search for
-     *
-     * @return observationVariableNames
-     **/
-    @Schema(example = "[\"Plant Height in meters\",\"Wheat rust score 1-5\"]", description = "The names of Variables to search for")
-    public List<String> getObservationVariableNames() {
-        return observationVariableNames;
-    }
-
-    public void setObservationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-    }
-
-    public ObservationVariableSearchRequest observationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addObservationVariablePUIsItem(String observationVariablePUIsItem) {
-        if (this.observationVariablePUIs == null) {
-            this.observationVariablePUIs = new ArrayList<String>();
-        }
-        this.observationVariablePUIs.add(observationVariablePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI
-     *
-     * @return observationVariablePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008012\",\"http://my-traits.com/trait/CO_123:0007261\"]", description = "The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI")
-    public List<String> getObservationVariablePUIs() {
-        return observationVariablePUIs;
-    }
-
-    public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-    }
-
-    public ObservationVariableSearchRequest ontologyDbIds(List<String> ontologyDbIds) {
-        this.ontologyDbIds = ontologyDbIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addOntologyDbIdsItem(String ontologyDbIdsItem) {
-        if (this.ontologyDbIds == null) {
-            this.ontologyDbIds = new ArrayList<String>();
-        }
-        this.ontologyDbIds.add(ontologyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of ontology IDs to search for
-     *
-     * @return ontologyDbIds
-     **/
-    @Schema(example = "[\"f44f7b23\",\"a26b576e\"]", description = "List of ontology IDs to search for")
-    public List<String> getOntologyDbIds() {
-        return ontologyDbIds;
-    }
-
-    public void setOntologyDbIds(List<String> ontologyDbIds) {
-        this.ontologyDbIds = ontologyDbIds;
-    }
-
-    public ObservationVariableSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public ObservationVariableSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public ObservationVariableSearchRequest programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public ObservationVariableSearchRequest programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public ObservationVariableSearchRequest scaleDbIds(List<String> scaleDbIds) {
-        this.scaleDbIds = scaleDbIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addScaleDbIdsItem(String scaleDbIdsItem) {
-        if (this.scaleDbIds == null) {
-            this.scaleDbIds = new ArrayList<String>();
-        }
-        this.scaleDbIds.add(scaleDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Scale
-     *
-     * @return scaleDbIds
-     **/
-    @Schema(example = "[\"a13ecffa\",\"7e1afe4f\"]", description = "The unique identifier for a Scale")
-    public List<String> getScaleDbIds() {
-        return scaleDbIds;
-    }
-
-    public void setScaleDbIds(List<String> scaleDbIds) {
-        this.scaleDbIds = scaleDbIds;
-    }
-
-    public ObservationVariableSearchRequest scaleNames(List<String> scaleNames) {
-        this.scaleNames = scaleNames;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addScaleNamesItem(String scaleNamesItem) {
-        if (this.scaleNames == null) {
-            this.scaleNames = new ArrayList<String>();
-        }
-        this.scaleNames.add(scaleNamesItem);
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleNames
-     **/
-    @Schema(example = "[\"Meters\",\"Liters\"]", description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public List<String> getScaleNames() {
-        return scaleNames;
-    }
-
-    public void setScaleNames(List<String> scaleNames) {
-        this.scaleNames = scaleNames;
-    }
-
-    public ObservationVariableSearchRequest scalePUIs(List<String> scalePUIs) {
-        this.scalePUIs = scalePUIs;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addScalePUIsItem(String scalePUIsItem) {
-        if (this.scalePUIs == null) {
-            this.scalePUIs = new ArrayList<String>();
-        }
-        this.scalePUIs.add(scalePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000336\",\"http://my-traits.com/trait/CO_123:0000560\"]", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public List<String> getScalePUIs() {
-        return scalePUIs;
-    }
-
-    public void setScalePUIs(List<String> scalePUIs) {
-        this.scalePUIs = scalePUIs;
-    }
-
-    public ObservationVariableSearchRequest studyDbId(List<String> studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addStudyDbIdItem(String studyDbIdItem) {
-        if (this.studyDbId == null) {
-            this.studyDbId = new ArrayList<String>();
-        }
-        this.studyDbId.add(studyDbIdItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;studyDbIds&#x60;. Github issue number #483  &lt;br&gt;The unique ID of a studies to filter on
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "[\"5bcac0ae\",\"7f48e22d\"]", description = "**Deprecated in v2.1** Please use `studyDbIds`. Github issue number #483  <br>The unique ID of a studies to filter on")
-    public List<String> getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(List<String> studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public ObservationVariableSearchRequest studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public ObservationVariableSearchRequest studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public ObservationVariableSearchRequest traitAttributePUIs(List<String> traitAttributePUIs) {
-        this.traitAttributePUIs = traitAttributePUIs;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTraitAttributePUIsItem(String traitAttributePUIsItem) {
-        if (this.traitAttributePUIs == null) {
-            this.traitAttributePUIs = new ArrayList<String>();
-        }
-        this.traitAttributePUIs.add(traitAttributePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return traitAttributePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008336\",\"http://my-traits.com/trait/CO_123:0001092\"]", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public List<String> getTraitAttributePUIs() {
-        return traitAttributePUIs;
-    }
-
-    public void setTraitAttributePUIs(List<String> traitAttributePUIs) {
-        this.traitAttributePUIs = traitAttributePUIs;
-    }
-
-    public ObservationVariableSearchRequest traitAttributes(List<String> traitAttributes) {
-        this.traitAttributes = traitAttributes;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTraitAttributesItem(String traitAttributesItem) {
-        if (this.traitAttributes == null) {
-            this.traitAttributes = new ArrayList<String>();
-        }
-        this.traitAttributes.add(traitAttributesItem);
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return traitAttributes
-     **/
-    @Schema(example = "[\"Height\",\"Color\"]", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public List<String> getTraitAttributes() {
-        return traitAttributes;
-    }
-
-    public void setTraitAttributes(List<String> traitAttributes) {
-        this.traitAttributes = traitAttributes;
-    }
-
-    public ObservationVariableSearchRequest traitClasses(List<String> traitClasses) {
-        this.traitClasses = traitClasses;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTraitClassesItem(String traitClassesItem) {
-        if (this.traitClasses == null) {
-            this.traitClasses = new ArrayList<String>();
-        }
-        this.traitClasses.add(traitClassesItem);
-        return this;
-    }
-
-    /**
-     * List of trait classes to filter search results
-     *
-     * @return traitClasses
-     **/
-    @Schema(example = "[\"morphological\",\"phenological\",\"agronomical\"]", description = "List of trait classes to filter search results")
-    public List<String> getTraitClasses() {
-        return traitClasses;
-    }
-
-    public void setTraitClasses(List<String> traitClasses) {
-        this.traitClasses = traitClasses;
-    }
-
-    public ObservationVariableSearchRequest traitDbIds(List<String> traitDbIds) {
-        this.traitDbIds = traitDbIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTraitDbIdsItem(String traitDbIdsItem) {
-        if (this.traitDbIds == null) {
-            this.traitDbIds = new ArrayList<String>();
-        }
-        this.traitDbIds.add(traitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Trait
-     *
-     * @return traitDbIds
-     **/
-    @Schema(example = "[\"ef81147b\",\"78d82fad\"]", description = "The unique identifier for a Trait")
-    public List<String> getTraitDbIds() {
-        return traitDbIds;
-    }
-
-    public void setTraitDbIds(List<String> traitDbIds) {
-        this.traitDbIds = traitDbIds;
-    }
-
-    public ObservationVariableSearchRequest traitEntities(List<String> traitEntities) {
-        this.traitEntities = traitEntities;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTraitEntitiesItem(String traitEntitiesItem) {
-        if (this.traitEntities == null) {
-            this.traitEntities = new ArrayList<String>();
-        }
-        this.traitEntities.add(traitEntitiesItem);
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return traitEntities
-     **/
-    @Schema(example = "[\"Stalk\",\"Root\"]", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public List<String> getTraitEntities() {
-        return traitEntities;
-    }
-
-    public void setTraitEntities(List<String> traitEntities) {
-        this.traitEntities = traitEntities;
-    }
-
-    public ObservationVariableSearchRequest traitEntityPUIs(List<String> traitEntityPUIs) {
-        this.traitEntityPUIs = traitEntityPUIs;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTraitEntityPUIsItem(String traitEntityPUIsItem) {
-        if (this.traitEntityPUIs == null) {
-            this.traitEntityPUIs = new ArrayList<String>();
-        }
-        this.traitEntityPUIs.add(traitEntityPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return traitEntityPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0004098\",\"http://my-traits.com/trait/CO_123:0002366\"]", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public List<String> getTraitEntityPUIs() {
-        return traitEntityPUIs;
-    }
-
-    public void setTraitEntityPUIs(List<String> traitEntityPUIs) {
-        this.traitEntityPUIs = traitEntityPUIs;
-    }
-
-    public ObservationVariableSearchRequest traitNames(List<String> traitNames) {
-        this.traitNames = traitNames;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTraitNamesItem(String traitNamesItem) {
-        if (this.traitNames == null) {
-            this.traitNames = new ArrayList<String>();
-        }
-        this.traitNames.add(traitNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitNames
-     **/
-    @Schema(example = "[\"Stalk Height\",\"Root Color\"]", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public List<String> getTraitNames() {
-        return traitNames;
-    }
-
-    public void setTraitNames(List<String> traitNames) {
-        this.traitNames = traitNames;
-    }
-
-    public ObservationVariableSearchRequest traitPUIs(List<String> traitPUIs) {
-        this.traitPUIs = traitPUIs;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTraitPUIsItem(String traitPUIsItem) {
-        if (this.traitPUIs == null) {
-            this.traitPUIs = new ArrayList<String>();
-        }
-        this.traitPUIs.add(traitPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000456\",\"http://my-traits.com/trait/CO_123:0000820\"]", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public List<String> getTraitPUIs() {
-        return traitPUIs;
-    }
-
-    public void setTraitPUIs(List<String> traitPUIs) {
-        this.traitPUIs = traitPUIs;
-    }
-
-    public ObservationVariableSearchRequest trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public ObservationVariableSearchRequest trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public ObservationVariableSearchRequest addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableSearchRequest observationVariableSearchRequest = (ObservationVariableSearchRequest) o;
-        return Objects.equals(this.commonCropNames, observationVariableSearchRequest.commonCropNames) &&
-                Objects.equals(this.dataTypes, observationVariableSearchRequest.dataTypes) &&
-                Objects.equals(this.externalReferenceIDs, observationVariableSearchRequest.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, observationVariableSearchRequest.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, observationVariableSearchRequest.externalReferenceSources) &&
-                Objects.equals(this.methodDbIds, observationVariableSearchRequest.methodDbIds) &&
-                Objects.equals(this.methodNames, observationVariableSearchRequest.methodNames) &&
-                Objects.equals(this.methodPUIs, observationVariableSearchRequest.methodPUIs) &&
-                Objects.equals(this.observationVariableDbIds, observationVariableSearchRequest.observationVariableDbIds) &&
-                Objects.equals(this.observationVariableNames, observationVariableSearchRequest.observationVariableNames) &&
-                Objects.equals(this.observationVariablePUIs, observationVariableSearchRequest.observationVariablePUIs) &&
-                Objects.equals(this.ontologyDbIds, observationVariableSearchRequest.ontologyDbIds) &&
-                Objects.equals(this.page, observationVariableSearchRequest.page) &&
-                Objects.equals(this.pageSize, observationVariableSearchRequest.pageSize) &&
-                Objects.equals(this.programDbIds, observationVariableSearchRequest.programDbIds) &&
-                Objects.equals(this.programNames, observationVariableSearchRequest.programNames) &&
-                Objects.equals(this.scaleDbIds, observationVariableSearchRequest.scaleDbIds) &&
-                Objects.equals(this.scaleNames, observationVariableSearchRequest.scaleNames) &&
-                Objects.equals(this.scalePUIs, observationVariableSearchRequest.scalePUIs) &&
-                Objects.equals(this.studyDbId, observationVariableSearchRequest.studyDbId) &&
-                Objects.equals(this.studyDbIds, observationVariableSearchRequest.studyDbIds) &&
-                Objects.equals(this.studyNames, observationVariableSearchRequest.studyNames) &&
-                Objects.equals(this.traitAttributePUIs, observationVariableSearchRequest.traitAttributePUIs) &&
-                Objects.equals(this.traitAttributes, observationVariableSearchRequest.traitAttributes) &&
-                Objects.equals(this.traitClasses, observationVariableSearchRequest.traitClasses) &&
-                Objects.equals(this.traitDbIds, observationVariableSearchRequest.traitDbIds) &&
-                Objects.equals(this.traitEntities, observationVariableSearchRequest.traitEntities) &&
-                Objects.equals(this.traitEntityPUIs, observationVariableSearchRequest.traitEntityPUIs) &&
-                Objects.equals(this.traitNames, observationVariableSearchRequest.traitNames) &&
-                Objects.equals(this.traitPUIs, observationVariableSearchRequest.traitPUIs) &&
-                Objects.equals(this.trialDbIds, observationVariableSearchRequest.trialDbIds) &&
-                Objects.equals(this.trialNames, observationVariableSearchRequest.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, dataTypes, externalReferenceIDs, externalReferenceIds, externalReferenceSources, methodDbIds, methodNames, methodPUIs, observationVariableDbIds, observationVariableNames, observationVariablePUIs, ontologyDbIds, page, pageSize, programDbIds, programNames, scaleDbIds, scaleNames, scalePUIs, studyDbId, studyDbIds, studyNames, traitAttributePUIs, traitAttributes, traitClasses, traitDbIds, traitEntities, traitEntityPUIs, traitNames, traitPUIs, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableSearchRequest {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    dataTypes: ").append(toIndentedString(dataTypes)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    methodDbIds: ").append(toIndentedString(methodDbIds)).append("\n");
-        sb.append("    methodNames: ").append(toIndentedString(methodNames)).append("\n");
-        sb.append("    methodPUIs: ").append(toIndentedString(methodPUIs)).append("\n");
-        sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-        sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
-        sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
-        sb.append("    ontologyDbIds: ").append(toIndentedString(ontologyDbIds)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    scaleDbIds: ").append(toIndentedString(scaleDbIds)).append("\n");
-        sb.append("    scaleNames: ").append(toIndentedString(scaleNames)).append("\n");
-        sb.append("    scalePUIs: ").append(toIndentedString(scalePUIs)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    traitAttributePUIs: ").append(toIndentedString(traitAttributePUIs)).append("\n");
-        sb.append("    traitAttributes: ").append(toIndentedString(traitAttributes)).append("\n");
-        sb.append("    traitClasses: ").append(toIndentedString(traitClasses)).append("\n");
-        sb.append("    traitDbIds: ").append(toIndentedString(traitDbIds)).append("\n");
-        sb.append("    traitEntities: ").append(toIndentedString(traitEntities)).append("\n");
-        sb.append("    traitEntityPUIs: ").append(toIndentedString(traitEntityPUIs)).append("\n");
-        sb.append("    traitNames: ").append(toIndentedString(traitNames)).append("\n");
-        sb.append("    traitPUIs: ").append(toIndentedString(traitPUIs)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableSingleResponse.java
deleted file mode 100644
index a6707e2e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ObservationVariableSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ObservationVariable result = null;
-
-    public ObservationVariableSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ObservationVariableSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ObservationVariableSingleResponse result(ObservationVariable result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ObservationVariable getResult() {
-        return result;
-    }
-
-    public void setResult(ObservationVariable result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableSingleResponse observationVariableSingleResponse = (ObservationVariableSingleResponse) o;
-        return Objects.equals(this._atContext, observationVariableSingleResponse._atContext) &&
-                Objects.equals(this.metadata, observationVariableSingleResponse.metadata) &&
-                Objects.equals(this.result, observationVariableSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableTrait.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableTrait.java
deleted file mode 100644
index 8e01ca42..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ObservationVariableTrait.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A Trait describes what property is being observed.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Trait \&quot;Leaf length\&quot; or \&quot;Flower height\&quot;.
- */
-@Schema(description = "A Trait describes what property is being observed.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Trait \"Leaf length\" or \"Flower height\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ObservationVariableTrait {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("alternativeAbbreviations")
-    private List<String> alternativeAbbreviations = null;
-
-    @SerializedName("attribute")
-    private String attribute = null;
-
-    @SerializedName("attributePUI")
-    private String attributePUI = null;
-
-    @SerializedName("entity")
-    private String entity = null;
-
-    @SerializedName("entityPUI")
-    private String entityPUI = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("mainAbbreviation")
-    private String mainAbbreviation = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("traitClass")
-    private String traitClass = null;
-
-    @SerializedName("traitDbId")
-    private String traitDbId = null;
-
-    @SerializedName("traitDescription")
-    private String traitDescription = null;
-
-    @SerializedName("traitName")
-    private String traitName = null;
-
-    @SerializedName("traitPUI")
-    private String traitPUI = null;
-
-    public ObservationVariableTrait additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ObservationVariableTrait putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ObservationVariableTrait alternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-        return this;
-    }
-
-    public ObservationVariableTrait addAlternativeAbbreviationsItem(String alternativeAbbreviationsItem) {
-        if (this.alternativeAbbreviations == null) {
-            this.alternativeAbbreviations = new ArrayList<String>();
-        }
-        this.alternativeAbbreviations.add(alternativeAbbreviationsItem);
-        return this;
-    }
-
-    /**
-     * A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.
-     *
-     * @return alternativeAbbreviations
-     **/
-    @Schema(example = "[\"H\",\"PH\",\"H1\"]", description = "A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.")
-    public List<String> getAlternativeAbbreviations() {
-        return alternativeAbbreviations;
-    }
-
-    public void setAlternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-    }
-
-    public ObservationVariableTrait attribute(String attribute) {
-        this.attribute = attribute;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attribute
-     **/
-    @Schema(example = "height", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    public ObservationVariableTrait attributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attributePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PO:00012345", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttributePUI() {
-        return attributePUI;
-    }
-
-    public void setAttributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-    }
-
-    public ObservationVariableTrait entity(String entity) {
-        this.entity = entity;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entity
-     **/
-    @Schema(example = "Stalk", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public String getEntity() {
-        return entity;
-    }
-
-    public void setEntity(String entity) {
-        this.entity = entity;
-    }
-
-    public ObservationVariableTrait entityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A Trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the Entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entityPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PATO:00098765", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A Trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the Entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public String getEntityPUI() {
-        return entityPUI;
-    }
-
-    public void setEntityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-    }
-
-    public ObservationVariableTrait externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ObservationVariableTrait addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ObservationVariableTrait mainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Trait
-     *
-     * @return mainAbbreviation
-     **/
-    @Schema(example = "PH", description = "A shortened version of the human readable name for a Trait")
-    public String getMainAbbreviation() {
-        return mainAbbreviation;
-    }
-
-    public void setMainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-    }
-
-    public ObservationVariableTrait ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public ObservationVariableTrait status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Trait status (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Trait status (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public ObservationVariableTrait synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public ObservationVariableTrait addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other trait names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Height\",\"Plant Height\",\"Stalk Height\",\"Canopy Height\"]", description = "Other trait names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public ObservationVariableTrait traitClass(String traitClass) {
-        this.traitClass = traitClass;
-        return this;
-    }
-
-    /**
-     * A classification to describe the type of trait and the context it should be considered in. &lt;br/&gt; examples- \&quot;morphological\&quot;, \&quot;phenological\&quot;, \&quot;agronomical\&quot;, \&quot;physiological\&quot;, \&quot;abiotic stress\&quot;, \&quot;biotic stress\&quot;, \&quot;biochemical\&quot;, \&quot;quality traits\&quot;, \&quot;fertility\&quot;, etc.
-     *
-     * @return traitClass
-     **/
-    @Schema(example = "phenological", description = "A classification to describe the type of trait and the context it should be considered in. <br/> examples- \"morphological\", \"phenological\", \"agronomical\", \"physiological\", \"abiotic stress\", \"biotic stress\", \"biochemical\", \"quality traits\", \"fertility\", etc.")
-    public String getTraitClass() {
-        return traitClass;
-    }
-
-    public void setTraitClass(String traitClass) {
-        this.traitClass = traitClass;
-    }
-
-    public ObservationVariableTrait traitDbId(String traitDbId) {
-        this.traitDbId = traitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trait
-     *
-     * @return traitDbId
-     **/
-    @Schema(example = "9b2e34f5", description = "The ID which uniquely identifies a trait")
-    public String getTraitDbId() {
-        return traitDbId;
-    }
-
-    public void setTraitDbId(String traitDbId) {
-        this.traitDbId = traitDbId;
-    }
-
-    public ObservationVariableTrait traitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-        return this;
-    }
-
-    /**
-     * The description of a trait
-     *
-     * @return traitDescription
-     **/
-    @Schema(example = "The height of the plant", description = "The description of a trait")
-    public String getTraitDescription() {
-        return traitDescription;
-    }
-
-    public void setTraitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-    }
-
-    public ObservationVariableTrait traitName(String traitName) {
-        this.traitName = traitName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitName
-     **/
-    @Schema(example = "Height", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public String getTraitName() {
-        return traitName;
-    }
-
-    public void setTraitName(String traitName) {
-        this.traitName = traitName;
-    }
-
-    public ObservationVariableTrait traitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000012", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public String getTraitPUI() {
-        return traitPUI;
-    }
-
-    public void setTraitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ObservationVariableTrait observationVariableTrait = (ObservationVariableTrait) o;
-        return Objects.equals(this.additionalInfo, observationVariableTrait.additionalInfo) &&
-                Objects.equals(this.alternativeAbbreviations, observationVariableTrait.alternativeAbbreviations) &&
-                Objects.equals(this.attribute, observationVariableTrait.attribute) &&
-                Objects.equals(this.attributePUI, observationVariableTrait.attributePUI) &&
-                Objects.equals(this.entity, observationVariableTrait.entity) &&
-                Objects.equals(this.entityPUI, observationVariableTrait.entityPUI) &&
-                Objects.equals(this.externalReferences, observationVariableTrait.externalReferences) &&
-                Objects.equals(this.mainAbbreviation, observationVariableTrait.mainAbbreviation) &&
-                Objects.equals(this.ontologyReference, observationVariableTrait.ontologyReference) &&
-                Objects.equals(this.status, observationVariableTrait.status) &&
-                Objects.equals(this.synonyms, observationVariableTrait.synonyms) &&
-                Objects.equals(this.traitClass, observationVariableTrait.traitClass) &&
-                Objects.equals(this.traitDbId, observationVariableTrait.traitDbId) &&
-                Objects.equals(this.traitDescription, observationVariableTrait.traitDescription) &&
-                Objects.equals(this.traitName, observationVariableTrait.traitName) &&
-                Objects.equals(this.traitPUI, observationVariableTrait.traitPUI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, alternativeAbbreviations, attribute, attributePUI, entity, entityPUI, externalReferences, mainAbbreviation, ontologyReference, status, synonyms, traitClass, traitDbId, traitDescription, traitName, traitPUI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ObservationVariableTrait {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    alternativeAbbreviations: ").append(toIndentedString(alternativeAbbreviations)).append("\n");
-        sb.append("    attribute: ").append(toIndentedString(attribute)).append("\n");
-        sb.append("    attributePUI: ").append(toIndentedString(attributePUI)).append("\n");
-        sb.append("    entity: ").append(toIndentedString(entity)).append("\n");
-        sb.append("    entityPUI: ").append(toIndentedString(entityPUI)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    mainAbbreviation: ").append(toIndentedString(mainAbbreviation)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    traitClass: ").append(toIndentedString(traitClass)).append("\n");
-        sb.append("    traitDbId: ").append(toIndentedString(traitDbId)).append("\n");
-        sb.append("    traitDescription: ").append(toIndentedString(traitDescription)).append("\n");
-        sb.append("    traitName: ").append(toIndentedString(traitName)).append("\n");
-        sb.append("    traitPUI: ").append(toIndentedString(traitPUI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OneOfGeoJSONGeometry.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OneOfGeoJSONGeometry.java
deleted file mode 100644
index 6afb8016..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OneOfGeoJSONGeometry.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-/**
- * OneOfGeoJSONGeometry
- */
-public interface OneOfGeoJSONGeometry {
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OneOfGeoJSONSearchAreaGeometry.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OneOfGeoJSONSearchAreaGeometry.java
deleted file mode 100644
index e359429d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OneOfGeoJSONSearchAreaGeometry.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-/**
- * OneOfGeoJSONSearchAreaGeometry
- */
-public interface OneOfGeoJSONSearchAreaGeometry {
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Ontology.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Ontology.java
deleted file mode 100644
index aa9342ee..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Ontology.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Ontology
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Ontology {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("authors")
-    private String authors = null;
-
-    @SerializedName("copyright")
-    private String copyright = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("licence")
-    private String licence = null;
-
-    @SerializedName("ontologyDbId")
-    private String ontologyDbId = null;
-
-    @SerializedName("ontologyName")
-    private String ontologyName = null;
-
-    @SerializedName("version")
-    private String version = null;
-
-    public Ontology additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Ontology putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Ontology authors(String authors) {
-        this.authors = authors;
-        return this;
-    }
-
-    /**
-     * Ontology&#x27;s list of authors (no specific format)
-     *
-     * @return authors
-     **/
-    @Schema(example = "Bob Robertson, Rob Robertson", description = "Ontology's list of authors (no specific format)")
-    public String getAuthors() {
-        return authors;
-    }
-
-    public void setAuthors(String authors) {
-        this.authors = authors;
-    }
-
-    public Ontology copyright(String copyright) {
-        this.copyright = copyright;
-        return this;
-    }
-
-    /**
-     * Ontology copyright
-     *
-     * @return copyright
-     **/
-    @Schema(example = "Copyright 1987, Bob Robertson", description = "Ontology copyright")
-    public String getCopyright() {
-        return copyright;
-    }
-
-    public void setCopyright(String copyright) {
-        this.copyright = copyright;
-    }
-
-    public Ontology description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Human readable description of Ontology
-     *
-     * @return description
-     **/
-    @Schema(example = "This is an example ontology that does not exist", description = "Human readable description of Ontology")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Ontology documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/ontology", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public Ontology licence(String licence) {
-        this.licence = licence;
-        return this;
-    }
-
-    /**
-     * Ontology licence
-     *
-     * @return licence
-     **/
-    @Schema(example = "MIT Open source licence", description = "Ontology licence")
-    public String getLicence() {
-        return licence;
-    }
-
-    public void setLicence(String licence) {
-        this.licence = licence;
-    }
-
-    public Ontology ontologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-        return this;
-    }
-
-    /**
-     * Ontology database unique identifier
-     *
-     * @return ontologyDbId
-     **/
-    @Schema(example = "18e186cd", description = "Ontology database unique identifier")
-    public String getOntologyDbId() {
-        return ontologyDbId;
-    }
-
-    public void setOntologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-    }
-
-    public Ontology ontologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-        return this;
-    }
-
-    /**
-     * Ontology name
-     *
-     * @return ontologyName
-     **/
-    @Schema(example = "The Official Ontology", description = "Ontology name")
-    public String getOntologyName() {
-        return ontologyName;
-    }
-
-    public void setOntologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-    }
-
-    public Ontology version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    /**
-     * Ontology version (no specific format)
-     *
-     * @return version
-     **/
-    @Schema(example = "V1.3.2", description = "Ontology version (no specific format)")
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Ontology ontology = (Ontology) o;
-        return Objects.equals(this.additionalInfo, ontology.additionalInfo) &&
-                Objects.equals(this.authors, ontology.authors) &&
-                Objects.equals(this.copyright, ontology.copyright) &&
-                Objects.equals(this.description, ontology.description) &&
-                Objects.equals(this.documentationURL, ontology.documentationURL) &&
-                Objects.equals(this.licence, ontology.licence) &&
-                Objects.equals(this.ontologyDbId, ontology.ontologyDbId) &&
-                Objects.equals(this.ontologyName, ontology.ontologyName) &&
-                Objects.equals(this.version, ontology.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, authors, copyright, description, documentationURL, licence, ontologyDbId, ontologyName, version);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Ontology {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    authors: ").append(toIndentedString(authors)).append("\n");
-        sb.append("    copyright: ").append(toIndentedString(copyright)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    licence: ").append(toIndentedString(licence)).append("\n");
-        sb.append("    ontologyDbId: ").append(toIndentedString(ontologyDbId)).append("\n");
-        sb.append("    ontologyName: ").append(toIndentedString(ontologyName)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologyListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologyListResponse.java
deleted file mode 100644
index b9b880d4..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologyListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * OntologyListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class OntologyListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private OntologyListResponseResult result = null;
-
-    public OntologyListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public OntologyListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public OntologyListResponse result(OntologyListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public OntologyListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(OntologyListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OntologyListResponse ontologyListResponse = (OntologyListResponse) o;
-        return Objects.equals(this._atContext, ontologyListResponse._atContext) &&
-                Objects.equals(this.metadata, ontologyListResponse.metadata) &&
-                Objects.equals(this.result, ontologyListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class OntologyListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologyListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologyListResponseResult.java
deleted file mode 100644
index 3eba2116..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologyListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * OntologyListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class OntologyListResponseResult {
-    @SerializedName("data")
-    private List<Ontology> data = new ArrayList<Ontology>();
-
-    public OntologyListResponseResult data(List<Ontology> data) {
-        this.data = data;
-        return this;
-    }
-
-    public OntologyListResponseResult addDataItem(Ontology dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Ontology> getData() {
-        return data;
-    }
-
-    public void setData(List<Ontology> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OntologyListResponseResult ontologyListResponseResult = (OntologyListResponseResult) o;
-        return Objects.equals(this.data, ontologyListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class OntologyListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologyNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologyNewRequest.java
deleted file mode 100644
index 548c1ddf..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologyNewRequest.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * OntologyNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class OntologyNewRequest {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("authors")
-    private String authors = null;
-
-    @SerializedName("copyright")
-    private String copyright = null;
-
-    @SerializedName("description")
-    private String description = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("licence")
-    private String licence = null;
-
-    @SerializedName("ontologyName")
-    private String ontologyName = null;
-
-    @SerializedName("version")
-    private String version = null;
-
-    public OntologyNewRequest additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public OntologyNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public OntologyNewRequest authors(String authors) {
-        this.authors = authors;
-        return this;
-    }
-
-    /**
-     * Ontology&#x27;s list of authors (no specific format)
-     *
-     * @return authors
-     **/
-    @Schema(example = "Bob Robertson, Rob Robertson", description = "Ontology's list of authors (no specific format)")
-    public String getAuthors() {
-        return authors;
-    }
-
-    public void setAuthors(String authors) {
-        this.authors = authors;
-    }
-
-    public OntologyNewRequest copyright(String copyright) {
-        this.copyright = copyright;
-        return this;
-    }
-
-    /**
-     * Ontology copyright
-     *
-     * @return copyright
-     **/
-    @Schema(example = "Copyright 1987, Bob Robertson", description = "Ontology copyright")
-    public String getCopyright() {
-        return copyright;
-    }
-
-    public void setCopyright(String copyright) {
-        this.copyright = copyright;
-    }
-
-    public OntologyNewRequest description(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Human readable description of Ontology
-     *
-     * @return description
-     **/
-    @Schema(example = "This is an example ontology that does not exist", description = "Human readable description of Ontology")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public OntologyNewRequest documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/ontology", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public OntologyNewRequest licence(String licence) {
-        this.licence = licence;
-        return this;
-    }
-
-    /**
-     * Ontology licence
-     *
-     * @return licence
-     **/
-    @Schema(example = "MIT Open source licence", description = "Ontology licence")
-    public String getLicence() {
-        return licence;
-    }
-
-    public void setLicence(String licence) {
-        this.licence = licence;
-    }
-
-    public OntologyNewRequest ontologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-        return this;
-    }
-
-    /**
-     * Ontology name
-     *
-     * @return ontologyName
-     **/
-    @Schema(example = "The Official Ontology", description = "Ontology name")
-    public String getOntologyName() {
-        return ontologyName;
-    }
-
-    public void setOntologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-    }
-
-    public OntologyNewRequest version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    /**
-     * Ontology version (no specific format)
-     *
-     * @return version
-     **/
-    @Schema(example = "V1.3.2", description = "Ontology version (no specific format)")
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OntologyNewRequest ontologyNewRequest = (OntologyNewRequest) o;
-        return Objects.equals(this.additionalInfo, ontologyNewRequest.additionalInfo) &&
-                Objects.equals(this.authors, ontologyNewRequest.authors) &&
-                Objects.equals(this.copyright, ontologyNewRequest.copyright) &&
-                Objects.equals(this.description, ontologyNewRequest.description) &&
-                Objects.equals(this.documentationURL, ontologyNewRequest.documentationURL) &&
-                Objects.equals(this.licence, ontologyNewRequest.licence) &&
-                Objects.equals(this.ontologyName, ontologyNewRequest.ontologyName) &&
-                Objects.equals(this.version, ontologyNewRequest.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, authors, copyright, description, documentationURL, licence, ontologyName, version);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class OntologyNewRequest {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    authors: ").append(toIndentedString(authors)).append("\n");
-        sb.append("    copyright: ").append(toIndentedString(copyright)).append("\n");
-        sb.append("    description: ").append(toIndentedString(description)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    licence: ").append(toIndentedString(licence)).append("\n");
-        sb.append("    ontologyName: ").append(toIndentedString(ontologyName)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologyReference.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologyReference.java
deleted file mode 100644
index bcf7974b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologyReference.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).
- */
-@Schema(description = "MIAPPE V1.1  (DM-85) Variable accession number - Accession number of the variable in the Crop Ontology  (DM-87) Trait accession number - Accession number of the trait in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-89) Method accession number - Accession number of the method in a suitable controlled vocabulary (Crop Ontology, Trait Ontology).  (DM-93) Scale accession number - Accession number of the scale in a suitable controlled vocabulary (Crop Ontology).")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class OntologyReference {
-    @SerializedName("documentationLinks")
-    private List<MethodOntologyReferenceDocumentationLinks> documentationLinks = null;
-
-    @SerializedName("ontologyDbId")
-    private String ontologyDbId = null;
-
-    @SerializedName("ontologyName")
-    private String ontologyName = null;
-
-    @SerializedName("version")
-    private String version = null;
-
-    public OntologyReference documentationLinks(List<MethodOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-        return this;
-    }
-
-    public OntologyReference addDocumentationLinksItem(MethodOntologyReferenceDocumentationLinks documentationLinksItem) {
-        if (this.documentationLinks == null) {
-            this.documentationLinks = new ArrayList<MethodOntologyReferenceDocumentationLinks>();
-        }
-        this.documentationLinks.add(documentationLinksItem);
-        return this;
-    }
-
-    /**
-     * links to various ontology documentation
-     *
-     * @return documentationLinks
-     **/
-    @Schema(description = "links to various ontology documentation")
-    public List<MethodOntologyReferenceDocumentationLinks> getDocumentationLinks() {
-        return documentationLinks;
-    }
-
-    public void setDocumentationLinks(List<MethodOntologyReferenceDocumentationLinks> documentationLinks) {
-        this.documentationLinks = documentationLinks;
-    }
-
-    public OntologyReference ontologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-        return this;
-    }
-
-    /**
-     * Ontology database unique identifier
-     *
-     * @return ontologyDbId
-     **/
-    @Schema(example = "6b071868", required = true, description = "Ontology database unique identifier")
-    public String getOntologyDbId() {
-        return ontologyDbId;
-    }
-
-    public void setOntologyDbId(String ontologyDbId) {
-        this.ontologyDbId = ontologyDbId;
-    }
-
-    public OntologyReference ontologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-        return this;
-    }
-
-    /**
-     * Ontology name
-     *
-     * @return ontologyName
-     **/
-    @Schema(example = "The Crop Ontology", required = true, description = "Ontology name")
-    public String getOntologyName() {
-        return ontologyName;
-    }
-
-    public void setOntologyName(String ontologyName) {
-        this.ontologyName = ontologyName;
-    }
-
-    public OntologyReference version(String version) {
-        this.version = version;
-        return this;
-    }
-
-    /**
-     * Ontology version (no specific format)
-     *
-     * @return version
-     **/
-    @Schema(example = "7.2.3", description = "Ontology version (no specific format)")
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OntologyReference ontologyReference = (OntologyReference) o;
-        return Objects.equals(this.documentationLinks, ontologyReference.documentationLinks) &&
-                Objects.equals(this.ontologyDbId, ontologyReference.ontologyDbId) &&
-                Objects.equals(this.ontologyName, ontologyReference.ontologyName) &&
-                Objects.equals(this.version, ontologyReference.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(documentationLinks, ontologyDbId, ontologyName, version);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class OntologyReference {\n");
-
-        sb.append("    documentationLinks: ").append(toIndentedString(documentationLinks)).append("\n");
-        sb.append("    ontologyDbId: ").append(toIndentedString(ontologyDbId)).append("\n");
-        sb.append("    ontologyName: ").append(toIndentedString(ontologyName)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologySingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologySingleResponse.java
deleted file mode 100644
index 9ffda6da..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/OntologySingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * OntologySingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class OntologySingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Ontology result = null;
-
-    public OntologySingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public OntologySingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public OntologySingleResponse result(Ontology result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Ontology getResult() {
-        return result;
-    }
-
-    public void setResult(Ontology result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OntologySingleResponse ontologySingleResponse = (OntologySingleResponse) o;
-        return Objects.equals(this._atContext, ontologySingleResponse._atContext) &&
-                Objects.equals(this.metadata, ontologySingleResponse.metadata) &&
-                Objects.equals(this.result, ontologySingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class OntologySingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/PointGeometry.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/PointGeometry.java
deleted file mode 100644
index 14f94a27..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/PointGeometry.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Copied from RFC 7946 Section 3.1.1  A position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.
- */
-@Schema(description = "Copied from RFC 7946 Section 3.1.1  A position is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class PointGeometry {
-    @SerializedName("coordinates")
-    private List<BigDecimal> coordinates = null;
-
-    @SerializedName("type")
-    private String type = "Point";
-
-    public PointGeometry coordinates(List<BigDecimal> coordinates) {
-        this.coordinates = coordinates;
-        return this;
-    }
-
-    public PointGeometry addCoordinatesItem(BigDecimal coordinatesItem) {
-        if (this.coordinates == null) {
-            this.coordinates = new ArrayList<BigDecimal>();
-        }
-        this.coordinates.add(coordinatesItem);
-        return this;
-    }
-
-    /**
-     * A single position
-     *
-     * @return coordinates
-     **/
-    @Schema(example = "[-76.506042,42.417373,123]", description = "A single position")
-    public List<BigDecimal> getCoordinates() {
-        return coordinates;
-    }
-
-    public void setCoordinates(List<BigDecimal> coordinates) {
-        this.coordinates = coordinates;
-    }
-
-    public PointGeometry type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The literal string \&quot;Point\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Point", description = "The literal string \"Point\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PointGeometry pointGeometry = (PointGeometry) o;
-        return Objects.equals(this.coordinates, pointGeometry.coordinates) &&
-                Objects.equals(this.type, pointGeometry.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(coordinates, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PointGeometry {\n");
-
-        sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Polygon.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Polygon.java
deleted file mode 100644
index 0ace4c85..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Polygon.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An array of linear rings
- */
-@Schema(description = "An array of linear rings")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Polygon extends ArrayList<List> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Polygon {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/PolygonGeometry.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/PolygonGeometry.java
deleted file mode 100644
index 8384b3d3..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/PolygonGeometry.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * An array of Linear Rings. Each Linear Ring is an array of Points.   A Point is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.
- */
-@Schema(description = "An array of Linear Rings. Each Linear Ring is an array of Points.   A Point is an array of numbers. There MUST be two or more elements. The first two elements are longitude and latitude, or easting and northing, precisely in that order and using decimal numbers. Altitude or elevation MAY be included as an optional third element.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class PolygonGeometry {
-    @SerializedName("coordinates")
-    private List<List<List<BigDecimal>>> coordinates = null;
-
-    @SerializedName("type")
-    private String type = "Polygon";
-
-    public PolygonGeometry coordinates(List<List<List<BigDecimal>>> coordinates) {
-        this.coordinates = coordinates;
-        return this;
-    }
-
-    public PolygonGeometry addCoordinatesItem(List<List<BigDecimal>> coordinatesItem) {
-        if (this.coordinates == null) {
-            this.coordinates = new ArrayList<List<List<BigDecimal>>>();
-        }
-        this.coordinates.add(coordinatesItem);
-        return this;
-    }
-
-    /**
-     * An array of linear rings
-     *
-     * @return coordinates
-     **/
-    @Schema(example = "[[[-77.456654,42.241133,494],[-75.414133,41.508282,571],[-76.506042,42.417373,123],[-77.456654,42.241133,346]]]", description = "An array of linear rings")
-    public List<List<List<BigDecimal>>> getCoordinates() {
-        return coordinates;
-    }
-
-    public void setCoordinates(List<List<List<BigDecimal>>> coordinates) {
-        this.coordinates = coordinates;
-    }
-
-    public PolygonGeometry type(String type) {
-        this.type = type;
-        return this;
-    }
-
-    /**
-     * The literal string \&quot;Polygon\&quot;
-     *
-     * @return type
-     **/
-    @Schema(example = "Polygon", description = "The literal string \"Polygon\"")
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PolygonGeometry polygonGeometry = (PolygonGeometry) o;
-        return Objects.equals(this.coordinates, polygonGeometry.coordinates) &&
-                Objects.equals(this.type, polygonGeometry.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(coordinates, type);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class PolygonGeometry {\n");
-
-        sb.append("    coordinates: ").append(toIndentedString(coordinates)).append("\n");
-        sb.append("    type: ").append(toIndentedString(type)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Position.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Position.java
deleted file mode 100644
index feb2193b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Position.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Objects;
-
-/**
- * A single position
- */
-@Schema(description = "A single position")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Position extends ArrayList<BigDecimal> {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode());
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Position {\n");
-        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Scale.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Scale.java
deleted file mode 100644
index d3110590..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Scale.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * Scale metadata
- */
-@Schema(description = "Scale metadata")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Scale {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypeEnum.Adapter.class)
-    public enum DataTypeEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypeEnum fromValue(String input) {
-            for (DataTypeEnum b : DataTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataType")
-    private DataTypeEnum dataType = null;
-
-    @SerializedName("decimalPlaces")
-    private Integer decimalPlaces = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    @SerializedName("scaleDbId")
-    private String scaleDbId = null;
-
-    @SerializedName("scaleName")
-    private String scaleName = null;
-
-    @SerializedName("scalePUI")
-    private String scalePUI = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    @SerializedName("validValues")
-    private ObservationVariableScaleValidValues validValues = null;
-
-    public Scale additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Scale putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Scale dataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-        return this;
-    }
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     *
-     * @return dataType
-     **/
-    @Schema(example = "Numerical", description = "<p>Class of the scale, entries can be</p> <p>\"Code\" -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \"75VD\" means \"75 %\" of the plant is infected and the plant is very delayed.</p> <p>\"Date\" - The date class is for events expressed in a time format, See ISO 8601</p> <p>\"Duration\" - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months</p> <p>\"Nominal\" - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories</p> <p>\"Numerical\" - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches</p> <p>\"Ordinal\" - Ordinal scales are scales composed of ordered categories</p> <p>\"Text\" - A free text is used to express the trait.</p>")
-    public DataTypeEnum getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-    }
-
-    public Scale decimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-        return this;
-    }
-
-    /**
-     * For numerical, number of decimal places to be reported
-     *
-     * @return decimalPlaces
-     **/
-    @Schema(example = "2", description = "For numerical, number of decimal places to be reported")
-    public Integer getDecimalPlaces() {
-        return decimalPlaces;
-    }
-
-    public void setDecimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-    }
-
-    public Scale externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Scale addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Scale ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public Scale scaleDbId(String scaleDbId) {
-        this.scaleDbId = scaleDbId;
-        return this;
-    }
-
-    /**
-     * Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.
-     *
-     * @return scaleDbId
-     **/
-    @Schema(example = "af730171", description = "Unique identifier of the scale. If left blank, the upload system will automatically generate a scale ID.")
-    public String getScaleDbId() {
-        return scaleDbId;
-    }
-
-    public void setScaleDbId(String scaleDbId) {
-        this.scaleDbId = scaleDbId;
-    }
-
-    public Scale scaleName(String scaleName) {
-        this.scaleName = scaleName;
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleName
-     **/
-    @Schema(example = "Meters", description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public String getScaleName() {
-        return scaleName;
-    }
-
-    public void setScaleName(String scaleName) {
-        this.scaleName = scaleName;
-    }
-
-    public Scale scalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000112", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public String getScalePUI() {
-        return scalePUI;
-    }
-
-    public void setScalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-    }
-
-    public Scale units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when &#x60;dataType&#x60; is Numeric, but could also be included for other dataTypes when applicable.
-     *
-     * @return units
-     **/
-    @Schema(example = "m", description = "This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when `dataType` is Numeric, but could also be included for other dataTypes when applicable.")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    public Scale validValues(ObservationVariableScaleValidValues validValues) {
-        this.validValues = validValues;
-        return this;
-    }
-
-    /**
-     * Get validValues
-     *
-     * @return validValues
-     **/
-    @Schema(description = "")
-    public ObservationVariableScaleValidValues getValidValues() {
-        return validValues;
-    }
-
-    public void setValidValues(ObservationVariableScaleValidValues validValues) {
-        this.validValues = validValues;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Scale scale = (Scale) o;
-        return Objects.equals(this.additionalInfo, scale.additionalInfo) &&
-                Objects.equals(this.dataType, scale.dataType) &&
-                Objects.equals(this.decimalPlaces, scale.decimalPlaces) &&
-                Objects.equals(this.externalReferences, scale.externalReferences) &&
-                Objects.equals(this.ontologyReference, scale.ontologyReference) &&
-                Objects.equals(this.scaleDbId, scale.scaleDbId) &&
-                Objects.equals(this.scaleName, scale.scaleName) &&
-                Objects.equals(this.scalePUI, scale.scalePUI) &&
-                Objects.equals(this.units, scale.units) &&
-                Objects.equals(this.validValues, scale.validValues);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, dataType, decimalPlaces, externalReferences, ontologyReference, scaleDbId, scaleName, scalePUI, units, validValues);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Scale {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
-        sb.append("    decimalPlaces: ").append(toIndentedString(decimalPlaces)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scaleDbId: ").append(toIndentedString(scaleDbId)).append("\n");
-        sb.append("    scaleName: ").append(toIndentedString(scaleName)).append("\n");
-        sb.append("    scalePUI: ").append(toIndentedString(scalePUI)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("    validValues: ").append(toIndentedString(validValues)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleBaseClass.java
deleted file mode 100644
index ef2fa20e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleBaseClass.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * A Scale describes the units and acceptable values for an ObservationVariable.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Scale \&quot;inches\&quot; or \&quot;pixels\&quot;.
- */
-@Schema(description = "A Scale describes the units and acceptable values for an ObservationVariable.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Scale \"inches\" or \"pixels\".")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ScaleBaseClass {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypeEnum.Adapter.class)
-    public enum DataTypeEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypeEnum fromValue(String input) {
-            for (DataTypeEnum b : DataTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataType")
-    private DataTypeEnum dataType = null;
-
-    @SerializedName("decimalPlaces")
-    private Integer decimalPlaces = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    @SerializedName("scaleName")
-    private String scaleName = null;
-
-    @SerializedName("scalePUI")
-    private String scalePUI = null;
-
-    @SerializedName("units")
-    private String units = null;
-
-    @SerializedName("validValues")
-    private ObservationVariableScaleValidValues validValues = null;
-
-    public ScaleBaseClass additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public ScaleBaseClass putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public ScaleBaseClass dataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-        return this;
-    }
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     *
-     * @return dataType
-     **/
-    @Schema(example = "Numerical", description = "<p>Class of the scale, entries can be</p> <p>\"Code\" -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \"75VD\" means \"75 %\" of the plant is infected and the plant is very delayed.</p> <p>\"Date\" - The date class is for events expressed in a time format, See ISO 8601</p> <p>\"Duration\" - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months</p> <p>\"Nominal\" - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories</p> <p>\"Numerical\" - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches</p> <p>\"Ordinal\" - Ordinal scales are scales composed of ordered categories</p> <p>\"Text\" - A free text is used to express the trait.</p>")
-    public DataTypeEnum getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(DataTypeEnum dataType) {
-        this.dataType = dataType;
-    }
-
-    public ScaleBaseClass decimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-        return this;
-    }
-
-    /**
-     * For numerical, number of decimal places to be reported
-     *
-     * @return decimalPlaces
-     **/
-    @Schema(example = "2", description = "For numerical, number of decimal places to be reported")
-    public Integer getDecimalPlaces() {
-        return decimalPlaces;
-    }
-
-    public void setDecimalPlaces(Integer decimalPlaces) {
-        this.decimalPlaces = decimalPlaces;
-    }
-
-    public ScaleBaseClass externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public ScaleBaseClass addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public ScaleBaseClass ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public ScaleBaseClass scaleName(String scaleName) {
-        this.scaleName = scaleName;
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleName
-     **/
-    @Schema(example = "Meters", required = true, description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public String getScaleName() {
-        return scaleName;
-    }
-
-    public void setScaleName(String scaleName) {
-        this.scaleName = scaleName;
-    }
-
-    public ScaleBaseClass scalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000112", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public String getScalePUI() {
-        return scalePUI;
-    }
-
-    public void setScalePUI(String scalePUI) {
-        this.scalePUI = scalePUI;
-    }
-
-    public ScaleBaseClass units(String units) {
-        this.units = units;
-        return this;
-    }
-
-    /**
-     * This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when &#x60;dataType&#x60; is Numeric, but could also be included for other dataTypes when applicable.
-     *
-     * @return units
-     **/
-    @Schema(example = "m", description = "This field can be used to describe the units used for this scale. This should be the abbreviated  form of the units, intended to be displayed with every value using this scale. Usually this only  applies when `dataType` is Numeric, but could also be included for other dataTypes when applicable.")
-    public String getUnits() {
-        return units;
-    }
-
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    public ScaleBaseClass validValues(ObservationVariableScaleValidValues validValues) {
-        this.validValues = validValues;
-        return this;
-    }
-
-    /**
-     * Get validValues
-     *
-     * @return validValues
-     **/
-    @Schema(description = "")
-    public ObservationVariableScaleValidValues getValidValues() {
-        return validValues;
-    }
-
-    public void setValidValues(ObservationVariableScaleValidValues validValues) {
-        this.validValues = validValues;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ScaleBaseClass scaleBaseClass = (ScaleBaseClass) o;
-        return Objects.equals(this.additionalInfo, scaleBaseClass.additionalInfo) &&
-                Objects.equals(this.dataType, scaleBaseClass.dataType) &&
-                Objects.equals(this.decimalPlaces, scaleBaseClass.decimalPlaces) &&
-                Objects.equals(this.externalReferences, scaleBaseClass.externalReferences) &&
-                Objects.equals(this.ontologyReference, scaleBaseClass.ontologyReference) &&
-                Objects.equals(this.scaleName, scaleBaseClass.scaleName) &&
-                Objects.equals(this.scalePUI, scaleBaseClass.scalePUI) &&
-                Objects.equals(this.units, scaleBaseClass.units) &&
-                Objects.equals(this.validValues, scaleBaseClass.validValues);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, dataType, decimalPlaces, externalReferences, ontologyReference, scaleName, scalePUI, units, validValues);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScaleBaseClass {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    dataType: ").append(toIndentedString(dataType)).append("\n");
-        sb.append("    decimalPlaces: ").append(toIndentedString(decimalPlaces)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scaleName: ").append(toIndentedString(scaleName)).append("\n");
-        sb.append("    scalePUI: ").append(toIndentedString(scalePUI)).append("\n");
-        sb.append("    units: ").append(toIndentedString(units)).append("\n");
-        sb.append("    validValues: ").append(toIndentedString(validValues)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleListResponse.java
deleted file mode 100644
index fa4ca53c..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ScaleListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ScaleListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private ScaleListResponseResult result = null;
-
-    public ScaleListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ScaleListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ScaleListResponse result(ScaleListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public ScaleListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(ScaleListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ScaleListResponse scaleListResponse = (ScaleListResponse) o;
-        return Objects.equals(this._atContext, scaleListResponse._atContext) &&
-                Objects.equals(this.metadata, scaleListResponse.metadata) &&
-                Objects.equals(this.result, scaleListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScaleListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleListResponseResult.java
deleted file mode 100644
index c7e4321d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * ScaleListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ScaleListResponseResult {
-    @SerializedName("data")
-    private List<Scale> data = new ArrayList<Scale>();
-
-    public ScaleListResponseResult data(List<Scale> data) {
-        this.data = data;
-        return this;
-    }
-
-    public ScaleListResponseResult addDataItem(Scale dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Scale> getData() {
-        return data;
-    }
-
-    public void setData(List<Scale> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ScaleListResponseResult scaleListResponseResult = (ScaleListResponseResult) o;
-        return Objects.equals(this.data, scaleListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScaleListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleNewRequest.java
deleted file mode 100644
index e1a4a314..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleNewRequest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import java.util.Objects;
-
-/**
- * ScaleNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ScaleNewRequest {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash();
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScaleNewRequest {\n");
-
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleSingleResponse.java
deleted file mode 100644
index 845675a3..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/ScaleSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * ScaleSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class ScaleSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Scale result = null;
-
-    public ScaleSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public ScaleSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public ScaleSingleResponse result(Scale result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Scale getResult() {
-        return result;
-    }
-
-    public void setResult(Scale result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ScaleSingleResponse scaleSingleResponse = (ScaleSingleResponse) o;
-        return Objects.equals(this._atContext, scaleSingleResponse._atContext) &&
-                Objects.equals(this.metadata, scaleSingleResponse.metadata) &&
-                Objects.equals(this.result, scaleSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ScaleSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchImagesBody.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchImagesBody.java
deleted file mode 100644
index 2e55946e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchImagesBody.java
+++ /dev/null
@@ -1,747 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchImagesBody
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SearchImagesBody {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("descriptiveOntologyTerms")
-    private List<String> descriptiveOntologyTerms = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("imageDbIds")
-    private List<String> imageDbIds = null;
-
-    @SerializedName("imageFileNames")
-    private List<String> imageFileNames = null;
-
-    @SerializedName("imageFileSizeMax")
-    private Integer imageFileSizeMax = null;
-
-    @SerializedName("imageFileSizeMin")
-    private Integer imageFileSizeMin = null;
-
-    @SerializedName("imageHeightMax")
-    private Integer imageHeightMax = null;
-
-    @SerializedName("imageHeightMin")
-    private Integer imageHeightMin = null;
-
-    @SerializedName("imageLocation")
-    private GeoJSONSearchArea imageLocation = null;
-
-    @SerializedName("imageNames")
-    private List<String> imageNames = null;
-
-    @SerializedName("imageTimeStampRangeEnd")
-    private OffsetDateTime imageTimeStampRangeEnd = null;
-
-    @SerializedName("imageTimeStampRangeStart")
-    private OffsetDateTime imageTimeStampRangeStart = null;
-
-    @SerializedName("imageWidthMax")
-    private Integer imageWidthMax = null;
-
-    @SerializedName("imageWidthMin")
-    private Integer imageWidthMin = null;
-
-    @SerializedName("mimeTypes")
-    private List<String> mimeTypes = null;
-
-    @SerializedName("observationDbIds")
-    private List<String> observationDbIds = null;
-
-    @SerializedName("observationUnitDbIds")
-    private List<String> observationUnitDbIds = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    public SearchImagesBody commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public SearchImagesBody addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public SearchImagesBody descriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-        return this;
-    }
-
-    public SearchImagesBody addDescriptiveOntologyTermsItem(String descriptiveOntologyTermsItem) {
-        if (this.descriptiveOntologyTerms == null) {
-            this.descriptiveOntologyTerms = new ArrayList<String>();
-        }
-        this.descriptiveOntologyTerms.add(descriptiveOntologyTermsItem);
-        return this;
-    }
-
-    /**
-     * A list of terms to formally describe the image to search for. Each item could be a simple Tag, an Ontology reference Id, or a full ontology URL.
-     *
-     * @return descriptiveOntologyTerms
-     **/
-    @Schema(example = "[\"doi:10.1002/0470841559\",\"Red\",\"ncbi:0300294\"]", description = "A list of terms to formally describe the image to search for. Each item could be a simple Tag, an Ontology reference Id, or a full ontology URL.")
-    public List<String> getDescriptiveOntologyTerms() {
-        return descriptiveOntologyTerms;
-    }
-
-    public void setDescriptiveOntologyTerms(List<String> descriptiveOntologyTerms) {
-        this.descriptiveOntologyTerms = descriptiveOntologyTerms;
-    }
-
-    public SearchImagesBody externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public SearchImagesBody addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public SearchImagesBody externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public SearchImagesBody addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public SearchImagesBody externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public SearchImagesBody addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public SearchImagesBody imageDbIds(List<String> imageDbIds) {
-        this.imageDbIds = imageDbIds;
-        return this;
-    }
-
-    public SearchImagesBody addImageDbIdsItem(String imageDbIdsItem) {
-        if (this.imageDbIds == null) {
-            this.imageDbIds = new ArrayList<String>();
-        }
-        this.imageDbIds.add(imageDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of image Ids to search for
-     *
-     * @return imageDbIds
-     **/
-    @Schema(example = "[\"564b64a6\",\"0d122d1d\"]", description = "A list of image Ids to search for")
-    public List<String> getImageDbIds() {
-        return imageDbIds;
-    }
-
-    public void setImageDbIds(List<String> imageDbIds) {
-        this.imageDbIds = imageDbIds;
-    }
-
-    public SearchImagesBody imageFileNames(List<String> imageFileNames) {
-        this.imageFileNames = imageFileNames;
-        return this;
-    }
-
-    public SearchImagesBody addImageFileNamesItem(String imageFileNamesItem) {
-        if (this.imageFileNames == null) {
-            this.imageFileNames = new ArrayList<String>();
-        }
-        this.imageFileNames.add(imageFileNamesItem);
-        return this;
-    }
-
-    /**
-     * Image file names to search for.
-     *
-     * @return imageFileNames
-     **/
-    @Schema(example = "[\"image_01032019.jpg\",\"picture_field_1234.jpg\"]", description = "Image file names to search for.")
-    public List<String> getImageFileNames() {
-        return imageFileNames;
-    }
-
-    public void setImageFileNames(List<String> imageFileNames) {
-        this.imageFileNames = imageFileNames;
-    }
-
-    public SearchImagesBody imageFileSizeMax(Integer imageFileSizeMax) {
-        this.imageFileSizeMax = imageFileSizeMax;
-        return this;
-    }
-
-    /**
-     * A maximum image file size to search for.
-     *
-     * @return imageFileSizeMax
-     **/
-    @Schema(example = "20000000", description = "A maximum image file size to search for.")
-    public Integer getImageFileSizeMax() {
-        return imageFileSizeMax;
-    }
-
-    public void setImageFileSizeMax(Integer imageFileSizeMax) {
-        this.imageFileSizeMax = imageFileSizeMax;
-    }
-
-    public SearchImagesBody imageFileSizeMin(Integer imageFileSizeMin) {
-        this.imageFileSizeMin = imageFileSizeMin;
-        return this;
-    }
-
-    /**
-     * A minimum image file size to search for.
-     *
-     * @return imageFileSizeMin
-     **/
-    @Schema(example = "1000", description = "A minimum image file size to search for.")
-    public Integer getImageFileSizeMin() {
-        return imageFileSizeMin;
-    }
-
-    public void setImageFileSizeMin(Integer imageFileSizeMin) {
-        this.imageFileSizeMin = imageFileSizeMin;
-    }
-
-    public SearchImagesBody imageHeightMax(Integer imageHeightMax) {
-        this.imageHeightMax = imageHeightMax;
-        return this;
-    }
-
-    /**
-     * A maximum image height to search for.
-     *
-     * @return imageHeightMax
-     **/
-    @Schema(example = "1080", description = "A maximum image height to search for.")
-    public Integer getImageHeightMax() {
-        return imageHeightMax;
-    }
-
-    public void setImageHeightMax(Integer imageHeightMax) {
-        this.imageHeightMax = imageHeightMax;
-    }
-
-    public SearchImagesBody imageHeightMin(Integer imageHeightMin) {
-        this.imageHeightMin = imageHeightMin;
-        return this;
-    }
-
-    /**
-     * A minimum image height to search for.
-     *
-     * @return imageHeightMin
-     **/
-    @Schema(example = "720", description = "A minimum image height to search for.")
-    public Integer getImageHeightMin() {
-        return imageHeightMin;
-    }
-
-    public void setImageHeightMin(Integer imageHeightMin) {
-        this.imageHeightMin = imageHeightMin;
-    }
-
-    public SearchImagesBody imageLocation(GeoJSONSearchArea imageLocation) {
-        this.imageLocation = imageLocation;
-        return this;
-    }
-
-    /**
-     * Get imageLocation
-     *
-     * @return imageLocation
-     **/
-    @Schema(description = "")
-    public GeoJSONSearchArea getImageLocation() {
-        return imageLocation;
-    }
-
-    public void setImageLocation(GeoJSONSearchArea imageLocation) {
-        this.imageLocation = imageLocation;
-    }
-
-    public SearchImagesBody imageNames(List<String> imageNames) {
-        this.imageNames = imageNames;
-        return this;
-    }
-
-    public SearchImagesBody addImageNamesItem(String imageNamesItem) {
-        if (this.imageNames == null) {
-            this.imageNames = new ArrayList<String>();
-        }
-        this.imageNames.add(imageNamesItem);
-        return this;
-    }
-
-    /**
-     * Human readable names to search for.
-     *
-     * @return imageNames
-     **/
-    @Schema(example = "[\"Image 43\",\"Tractor in field\"]", description = "Human readable names to search for.")
-    public List<String> getImageNames() {
-        return imageNames;
-    }
-
-    public void setImageNames(List<String> imageNames) {
-        this.imageNames = imageNames;
-    }
-
-    public SearchImagesBody imageTimeStampRangeEnd(OffsetDateTime imageTimeStampRangeEnd) {
-        this.imageTimeStampRangeEnd = imageTimeStampRangeEnd;
-        return this;
-    }
-
-    /**
-     * The latest timestamp to search for.
-     *
-     * @return imageTimeStampRangeEnd
-     **/
-    @Schema(description = "The latest timestamp to search for.")
-    public OffsetDateTime getImageTimeStampRangeEnd() {
-        return imageTimeStampRangeEnd;
-    }
-
-    public void setImageTimeStampRangeEnd(OffsetDateTime imageTimeStampRangeEnd) {
-        this.imageTimeStampRangeEnd = imageTimeStampRangeEnd;
-    }
-
-    public SearchImagesBody imageTimeStampRangeStart(OffsetDateTime imageTimeStampRangeStart) {
-        this.imageTimeStampRangeStart = imageTimeStampRangeStart;
-        return this;
-    }
-
-    /**
-     * The earliest timestamp to search for.
-     *
-     * @return imageTimeStampRangeStart
-     **/
-    @Schema(description = "The earliest timestamp to search for.")
-    public OffsetDateTime getImageTimeStampRangeStart() {
-        return imageTimeStampRangeStart;
-    }
-
-    public void setImageTimeStampRangeStart(OffsetDateTime imageTimeStampRangeStart) {
-        this.imageTimeStampRangeStart = imageTimeStampRangeStart;
-    }
-
-    public SearchImagesBody imageWidthMax(Integer imageWidthMax) {
-        this.imageWidthMax = imageWidthMax;
-        return this;
-    }
-
-    /**
-     * A maximum image width to search for.
-     *
-     * @return imageWidthMax
-     **/
-    @Schema(example = "1920", description = "A maximum image width to search for.")
-    public Integer getImageWidthMax() {
-        return imageWidthMax;
-    }
-
-    public void setImageWidthMax(Integer imageWidthMax) {
-        this.imageWidthMax = imageWidthMax;
-    }
-
-    public SearchImagesBody imageWidthMin(Integer imageWidthMin) {
-        this.imageWidthMin = imageWidthMin;
-        return this;
-    }
-
-    /**
-     * A minimum image width to search for.
-     *
-     * @return imageWidthMin
-     **/
-    @Schema(example = "1280", description = "A minimum image width to search for.")
-    public Integer getImageWidthMin() {
-        return imageWidthMin;
-    }
-
-    public void setImageWidthMin(Integer imageWidthMin) {
-        this.imageWidthMin = imageWidthMin;
-    }
-
-    public SearchImagesBody mimeTypes(List<String> mimeTypes) {
-        this.mimeTypes = mimeTypes;
-        return this;
-    }
-
-    public SearchImagesBody addMimeTypesItem(String mimeTypesItem) {
-        if (this.mimeTypes == null) {
-            this.mimeTypes = new ArrayList<String>();
-        }
-        this.mimeTypes.add(mimeTypesItem);
-        return this;
-    }
-
-    /**
-     * A set of image file types to search for.
-     *
-     * @return mimeTypes
-     **/
-    @Schema(example = "[\"image/jpg\",\"image/jpeg\",\"image/gif\"]", description = "A set of image file types to search for.")
-    public List<String> getMimeTypes() {
-        return mimeTypes;
-    }
-
-    public void setMimeTypes(List<String> mimeTypes) {
-        this.mimeTypes = mimeTypes;
-    }
-
-    public SearchImagesBody observationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-        return this;
-    }
-
-    public SearchImagesBody addObservationDbIdsItem(String observationDbIdsItem) {
-        if (this.observationDbIds == null) {
-            this.observationDbIds = new ArrayList<String>();
-        }
-        this.observationDbIds.add(observationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A list of observation Ids this image is associated with to search for
-     *
-     * @return observationDbIds
-     **/
-    @Schema(example = "[\"47326456\",\"fc9823ac\"]", description = "A list of observation Ids this image is associated with to search for")
-    public List<String> getObservationDbIds() {
-        return observationDbIds;
-    }
-
-    public void setObservationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-    }
-
-    public SearchImagesBody observationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-        return this;
-    }
-
-    public SearchImagesBody addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-        if (this.observationUnitDbIds == null) {
-            this.observationUnitDbIds = new ArrayList<String>();
-        }
-        this.observationUnitDbIds.add(observationUnitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A set of observation unit identifiers to search for.
-     *
-     * @return observationUnitDbIds
-     **/
-    @Schema(example = "[\"f5e4b273\",\"328c9424\"]", description = "A set of observation unit identifiers to search for.")
-    public List<String> getObservationUnitDbIds() {
-        return observationUnitDbIds;
-    }
-
-    public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-    }
-
-    public SearchImagesBody page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SearchImagesBody pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public SearchImagesBody programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public SearchImagesBody addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public SearchImagesBody programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public SearchImagesBody addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchImagesBody searchImagesBody = (SearchImagesBody) o;
-        return Objects.equals(this.commonCropNames, searchImagesBody.commonCropNames) &&
-                Objects.equals(this.descriptiveOntologyTerms, searchImagesBody.descriptiveOntologyTerms) &&
-                Objects.equals(this.externalReferenceIDs, searchImagesBody.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, searchImagesBody.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, searchImagesBody.externalReferenceSources) &&
-                Objects.equals(this.imageDbIds, searchImagesBody.imageDbIds) &&
-                Objects.equals(this.imageFileNames, searchImagesBody.imageFileNames) &&
-                Objects.equals(this.imageFileSizeMax, searchImagesBody.imageFileSizeMax) &&
-                Objects.equals(this.imageFileSizeMin, searchImagesBody.imageFileSizeMin) &&
-                Objects.equals(this.imageHeightMax, searchImagesBody.imageHeightMax) &&
-                Objects.equals(this.imageHeightMin, searchImagesBody.imageHeightMin) &&
-                Objects.equals(this.imageLocation, searchImagesBody.imageLocation) &&
-                Objects.equals(this.imageNames, searchImagesBody.imageNames) &&
-                Objects.equals(this.imageTimeStampRangeEnd, searchImagesBody.imageTimeStampRangeEnd) &&
-                Objects.equals(this.imageTimeStampRangeStart, searchImagesBody.imageTimeStampRangeStart) &&
-                Objects.equals(this.imageWidthMax, searchImagesBody.imageWidthMax) &&
-                Objects.equals(this.imageWidthMin, searchImagesBody.imageWidthMin) &&
-                Objects.equals(this.mimeTypes, searchImagesBody.mimeTypes) &&
-                Objects.equals(this.observationDbIds, searchImagesBody.observationDbIds) &&
-                Objects.equals(this.observationUnitDbIds, searchImagesBody.observationUnitDbIds) &&
-                Objects.equals(this.page, searchImagesBody.page) &&
-                Objects.equals(this.pageSize, searchImagesBody.pageSize) &&
-                Objects.equals(this.programDbIds, searchImagesBody.programDbIds) &&
-                Objects.equals(this.programNames, searchImagesBody.programNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, descriptiveOntologyTerms, externalReferenceIDs, externalReferenceIds, externalReferenceSources, imageDbIds, imageFileNames, imageFileSizeMax, imageFileSizeMin, imageHeightMax, imageHeightMin, imageLocation, imageNames, imageTimeStampRangeEnd, imageTimeStampRangeStart, imageWidthMax, imageWidthMin, mimeTypes, observationDbIds, observationUnitDbIds, page, pageSize, programDbIds, programNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchImagesBody {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    descriptiveOntologyTerms: ").append(toIndentedString(descriptiveOntologyTerms)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    imageDbIds: ").append(toIndentedString(imageDbIds)).append("\n");
-        sb.append("    imageFileNames: ").append(toIndentedString(imageFileNames)).append("\n");
-        sb.append("    imageFileSizeMax: ").append(toIndentedString(imageFileSizeMax)).append("\n");
-        sb.append("    imageFileSizeMin: ").append(toIndentedString(imageFileSizeMin)).append("\n");
-        sb.append("    imageHeightMax: ").append(toIndentedString(imageHeightMax)).append("\n");
-        sb.append("    imageHeightMin: ").append(toIndentedString(imageHeightMin)).append("\n");
-        sb.append("    imageLocation: ").append(toIndentedString(imageLocation)).append("\n");
-        sb.append("    imageNames: ").append(toIndentedString(imageNames)).append("\n");
-        sb.append("    imageTimeStampRangeEnd: ").append(toIndentedString(imageTimeStampRangeEnd)).append("\n");
-        sb.append("    imageTimeStampRangeStart: ").append(toIndentedString(imageTimeStampRangeStart)).append("\n");
-        sb.append("    imageWidthMax: ").append(toIndentedString(imageWidthMax)).append("\n");
-        sb.append("    imageWidthMin: ").append(toIndentedString(imageWidthMin)).append("\n");
-        sb.append("    mimeTypes: ").append(toIndentedString(mimeTypes)).append("\n");
-        sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
-        sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchObservationsBody.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchObservationsBody.java
deleted file mode 100644
index c6ddcdd6..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchObservationsBody.java
+++ /dev/null
@@ -1,867 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchObservationsBody
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SearchObservationsBody {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    @SerializedName("locationDbIds")
-    private List<String> locationDbIds = null;
-
-    @SerializedName("locationNames")
-    private List<String> locationNames = null;
-
-    @SerializedName("observationDbIds")
-    private List<String> observationDbIds = null;
-
-    @SerializedName("observationLevelRelationships")
-    private List<ObservationUnitLevelRelationship1> observationLevelRelationships = null;
-
-    @SerializedName("observationLevels")
-    private List<ObservationUnitLevel1> observationLevels = null;
-
-    @SerializedName("observationTimeStampRangeEnd")
-    private OffsetDateTime observationTimeStampRangeEnd = null;
-
-    @SerializedName("observationTimeStampRangeStart")
-    private OffsetDateTime observationTimeStampRangeStart = null;
-
-    @SerializedName("observationUnitDbIds")
-    private List<String> observationUnitDbIds = null;
-
-    @SerializedName("observationVariableDbIds")
-    private List<String> observationVariableDbIds = null;
-
-    @SerializedName("observationVariableNames")
-    private List<String> observationVariableNames = null;
-
-    @SerializedName("observationVariablePUIs")
-    private List<String> observationVariablePUIs = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("seasonDbIds")
-    private List<String> seasonDbIds = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public SearchObservationsBody commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public SearchObservationsBody addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public SearchObservationsBody externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public SearchObservationsBody addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public SearchObservationsBody externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public SearchObservationsBody addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public SearchObservationsBody externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public SearchObservationsBody addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public SearchObservationsBody germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public SearchObservationsBody germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public SearchObservationsBody addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-    public SearchObservationsBody locationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addLocationDbIdsItem(String locationDbIdsItem) {
-        if (this.locationDbIds == null) {
-            this.locationDbIds = new ArrayList<String>();
-        }
-        this.locationDbIds.add(locationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The location ids to search for
-     *
-     * @return locationDbIds
-     **/
-    @Schema(example = "[\"b28911cf\",\"5071d1e4\"]", description = "The location ids to search for")
-    public List<String> getLocationDbIds() {
-        return locationDbIds;
-    }
-
-    public void setLocationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-    }
-
-    public SearchObservationsBody locationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-        return this;
-    }
-
-    public SearchObservationsBody addLocationNamesItem(String locationNamesItem) {
-        if (this.locationNames == null) {
-            this.locationNames = new ArrayList<String>();
-        }
-        this.locationNames.add(locationNamesItem);
-        return this;
-    }
-
-    /**
-     * A human readable names to search for
-     *
-     * @return locationNames
-     **/
-    @Schema(example = "[\"Location Alpha\",\"The Large Hadron Collider\"]", description = "A human readable names to search for")
-    public List<String> getLocationNames() {
-        return locationNames;
-    }
-
-    public void setLocationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-    }
-
-    public SearchObservationsBody observationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addObservationDbIdsItem(String observationDbIdsItem) {
-        if (this.observationDbIds == null) {
-            this.observationDbIds = new ArrayList<String>();
-        }
-        this.observationDbIds.add(observationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique id of an Observation
-     *
-     * @return observationDbIds
-     **/
-    @Schema(example = "[\"6a4a59d8\",\"3ff067e0\"]", description = "The unique id of an Observation")
-    public List<String> getObservationDbIds() {
-        return observationDbIds;
-    }
-
-    public void setObservationDbIds(List<String> observationDbIds) {
-        this.observationDbIds = observationDbIds;
-    }
-
-    public SearchObservationsBody observationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-        return this;
-    }
-
-    public SearchObservationsBody addObservationLevelRelationshipsItem(ObservationUnitLevelRelationship1 observationLevelRelationshipsItem) {
-        if (this.observationLevelRelationships == null) {
-            this.observationLevelRelationships = new ArrayList<ObservationUnitLevelRelationship1>();
-        }
-        this.observationLevelRelationships.add(observationLevelRelationshipsItem);
-        return this;
-    }
-
-    /**
-     * Searches for values in ObservationUnit-&gt;observationUnitPosition-&gt;observationLevelRelationships
-     *
-     * @return observationLevelRelationships
-     **/
-    @Schema(example = "[{\"levelCode\":\"Field_1\",\"levelName\":\"field\"}]", description = "Searches for values in ObservationUnit->observationUnitPosition->observationLevelRelationships")
-    public List<ObservationUnitLevelRelationship1> getObservationLevelRelationships() {
-        return observationLevelRelationships;
-    }
-
-    public void setObservationLevelRelationships(List<ObservationUnitLevelRelationship1> observationLevelRelationships) {
-        this.observationLevelRelationships = observationLevelRelationships;
-    }
-
-    public SearchObservationsBody observationLevels(List<ObservationUnitLevel1> observationLevels) {
-        this.observationLevels = observationLevels;
-        return this;
-    }
-
-    public SearchObservationsBody addObservationLevelsItem(ObservationUnitLevel1 observationLevelsItem) {
-        if (this.observationLevels == null) {
-            this.observationLevels = new ArrayList<ObservationUnitLevel1>();
-        }
-        this.observationLevels.add(observationLevelsItem);
-        return this;
-    }
-
-    /**
-     * Searches for values in ObservationUnit-&gt;observationUnitPosition-&gt;observationLevel
-     *
-     * @return observationLevels
-     **/
-    @Schema(example = "[{\"levelCode\":\"Plot_123\",\"levelName\":\"plot\"},{\"levelCode\":\"Plot_456\",\"levelName\":\"plot\"},{\"levelCode\":\"Plot_789\",\"levelName\":\"plot\"}]", description = "Searches for values in ObservationUnit->observationUnitPosition->observationLevel")
-    public List<ObservationUnitLevel1> getObservationLevels() {
-        return observationLevels;
-    }
-
-    public void setObservationLevels(List<ObservationUnitLevel1> observationLevels) {
-        this.observationLevels = observationLevels;
-    }
-
-    public SearchObservationsBody observationTimeStampRangeEnd(OffsetDateTime observationTimeStampRangeEnd) {
-        this.observationTimeStampRangeEnd = observationTimeStampRangeEnd;
-        return this;
-    }
-
-    /**
-     * Timestamp range end
-     *
-     * @return observationTimeStampRangeEnd
-     **/
-    @Schema(description = "Timestamp range end")
-    public OffsetDateTime getObservationTimeStampRangeEnd() {
-        return observationTimeStampRangeEnd;
-    }
-
-    public void setObservationTimeStampRangeEnd(OffsetDateTime observationTimeStampRangeEnd) {
-        this.observationTimeStampRangeEnd = observationTimeStampRangeEnd;
-    }
-
-    public SearchObservationsBody observationTimeStampRangeStart(OffsetDateTime observationTimeStampRangeStart) {
-        this.observationTimeStampRangeStart = observationTimeStampRangeStart;
-        return this;
-    }
-
-    /**
-     * Timestamp range start
-     *
-     * @return observationTimeStampRangeStart
-     **/
-    @Schema(description = "Timestamp range start")
-    public OffsetDateTime getObservationTimeStampRangeStart() {
-        return observationTimeStampRangeStart;
-    }
-
-    public void setObservationTimeStampRangeStart(OffsetDateTime observationTimeStampRangeStart) {
-        this.observationTimeStampRangeStart = observationTimeStampRangeStart;
-    }
-
-    public SearchObservationsBody observationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addObservationUnitDbIdsItem(String observationUnitDbIdsItem) {
-        if (this.observationUnitDbIds == null) {
-            this.observationUnitDbIds = new ArrayList<String>();
-        }
-        this.observationUnitDbIds.add(observationUnitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique id of an Observation Unit
-     *
-     * @return observationUnitDbIds
-     **/
-    @Schema(example = "[\"76f559b5\",\"066bc5d3\"]", description = "The unique id of an Observation Unit")
-    public List<String> getObservationUnitDbIds() {
-        return observationUnitDbIds;
-    }
-
-    public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
-        this.observationUnitDbIds = observationUnitDbIds;
-    }
-
-    public SearchObservationsBody observationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-        if (this.observationVariableDbIds == null) {
-            this.observationVariableDbIds = new ArrayList<String>();
-        }
-        this.observationVariableDbIds.add(observationVariableDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The DbIds of Variables to search for
-     *
-     * @return observationVariableDbIds
-     **/
-    @Schema(example = "[\"a646187d\",\"6d23513b\"]", description = "The DbIds of Variables to search for")
-    public List<String> getObservationVariableDbIds() {
-        return observationVariableDbIds;
-    }
-
-    public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-    }
-
-    public SearchObservationsBody observationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-        return this;
-    }
-
-    public SearchObservationsBody addObservationVariableNamesItem(String observationVariableNamesItem) {
-        if (this.observationVariableNames == null) {
-            this.observationVariableNames = new ArrayList<String>();
-        }
-        this.observationVariableNames.add(observationVariableNamesItem);
-        return this;
-    }
-
-    /**
-     * The names of Variables to search for
-     *
-     * @return observationVariableNames
-     **/
-    @Schema(example = "[\"Plant Height in meters\",\"Wheat rust score 1-5\"]", description = "The names of Variables to search for")
-    public List<String> getObservationVariableNames() {
-        return observationVariableNames;
-    }
-
-    public void setObservationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-    }
-
-    public SearchObservationsBody observationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-        return this;
-    }
-
-    public SearchObservationsBody addObservationVariablePUIsItem(String observationVariablePUIsItem) {
-        if (this.observationVariablePUIs == null) {
-            this.observationVariablePUIs = new ArrayList<String>();
-        }
-        this.observationVariablePUIs.add(observationVariablePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI
-     *
-     * @return observationVariablePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008012\",\"http://my-traits.com/trait/CO_123:0007261\"]", description = "The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI")
-    public List<String> getObservationVariablePUIs() {
-        return observationVariablePUIs;
-    }
-
-    public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-    }
-
-    public SearchObservationsBody page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SearchObservationsBody pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public SearchObservationsBody programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public SearchObservationsBody programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public SearchObservationsBody addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public SearchObservationsBody seasonDbIds(List<String> seasonDbIds) {
-        this.seasonDbIds = seasonDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addSeasonDbIdsItem(String seasonDbIdsItem) {
-        if (this.seasonDbIds == null) {
-            this.seasonDbIds = new ArrayList<String>();
-        }
-        this.seasonDbIds.add(seasonDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The year or Phenotyping campaign of a multi-annual study (trees, grape, ...)
-     *
-     * @return seasonDbIds
-     **/
-    @Schema(example = "[\"Spring 2018\",\"Season A\"]", description = "The year or Phenotyping campaign of a multi-annual study (trees, grape, ...)")
-    public List<String> getSeasonDbIds() {
-        return seasonDbIds;
-    }
-
-    public void setSeasonDbIds(List<String> seasonDbIds) {
-        this.seasonDbIds = seasonDbIds;
-    }
-
-    public SearchObservationsBody studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public SearchObservationsBody studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public SearchObservationsBody addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public SearchObservationsBody trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public SearchObservationsBody addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public SearchObservationsBody trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public SearchObservationsBody addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchObservationsBody searchObservationsBody = (SearchObservationsBody) o;
-        return Objects.equals(this.commonCropNames, searchObservationsBody.commonCropNames) &&
-                Objects.equals(this.externalReferenceIDs, searchObservationsBody.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, searchObservationsBody.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, searchObservationsBody.externalReferenceSources) &&
-                Objects.equals(this.germplasmDbIds, searchObservationsBody.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, searchObservationsBody.germplasmNames) &&
-                Objects.equals(this.locationDbIds, searchObservationsBody.locationDbIds) &&
-                Objects.equals(this.locationNames, searchObservationsBody.locationNames) &&
-                Objects.equals(this.observationDbIds, searchObservationsBody.observationDbIds) &&
-                Objects.equals(this.observationLevelRelationships, searchObservationsBody.observationLevelRelationships) &&
-                Objects.equals(this.observationLevels, searchObservationsBody.observationLevels) &&
-                Objects.equals(this.observationTimeStampRangeEnd, searchObservationsBody.observationTimeStampRangeEnd) &&
-                Objects.equals(this.observationTimeStampRangeStart, searchObservationsBody.observationTimeStampRangeStart) &&
-                Objects.equals(this.observationUnitDbIds, searchObservationsBody.observationUnitDbIds) &&
-                Objects.equals(this.observationVariableDbIds, searchObservationsBody.observationVariableDbIds) &&
-                Objects.equals(this.observationVariableNames, searchObservationsBody.observationVariableNames) &&
-                Objects.equals(this.observationVariablePUIs, searchObservationsBody.observationVariablePUIs) &&
-                Objects.equals(this.page, searchObservationsBody.page) &&
-                Objects.equals(this.pageSize, searchObservationsBody.pageSize) &&
-                Objects.equals(this.programDbIds, searchObservationsBody.programDbIds) &&
-                Objects.equals(this.programNames, searchObservationsBody.programNames) &&
-                Objects.equals(this.seasonDbIds, searchObservationsBody.seasonDbIds) &&
-                Objects.equals(this.studyDbIds, searchObservationsBody.studyDbIds) &&
-                Objects.equals(this.studyNames, searchObservationsBody.studyNames) &&
-                Objects.equals(this.trialDbIds, searchObservationsBody.trialDbIds) &&
-                Objects.equals(this.trialNames, searchObservationsBody.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds, germplasmNames, locationDbIds, locationNames, observationDbIds, observationLevelRelationships, observationLevels, observationTimeStampRangeEnd, observationTimeStampRangeStart, observationUnitDbIds, observationVariableDbIds, observationVariableNames, observationVariablePUIs, page, pageSize, programDbIds, programNames, seasonDbIds, studyDbIds, studyNames, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchObservationsBody {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-        sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-        sb.append("    observationDbIds: ").append(toIndentedString(observationDbIds)).append("\n");
-        sb.append("    observationLevelRelationships: ").append(toIndentedString(observationLevelRelationships)).append("\n");
-        sb.append("    observationLevels: ").append(toIndentedString(observationLevels)).append("\n");
-        sb.append("    observationTimeStampRangeEnd: ").append(toIndentedString(observationTimeStampRangeEnd)).append("\n");
-        sb.append("    observationTimeStampRangeStart: ").append(toIndentedString(observationTimeStampRangeStart)).append("\n");
-        sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-        sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-        sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
-        sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    seasonDbIds: ").append(toIndentedString(seasonDbIds)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersCommonCropNames.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersCommonCropNames.java
deleted file mode 100644
index 4f5ec2a5..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersCommonCropNames.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersCommonCropNames
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SearchRequestParametersCommonCropNames {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    public SearchRequestParametersCommonCropNames commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public SearchRequestParametersCommonCropNames addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersCommonCropNames searchRequestParametersCommonCropNames = (SearchRequestParametersCommonCropNames) o;
-        return Objects.equals(this.commonCropNames, searchRequestParametersCommonCropNames.commonCropNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersCommonCropNames {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersExternalReferences.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersExternalReferences.java
deleted file mode 100644
index 3c20debe..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersExternalReferences.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersExternalReferences
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SearchRequestParametersExternalReferences {
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    public SearchRequestParametersExternalReferences externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public SearchRequestParametersExternalReferences addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public SearchRequestParametersExternalReferences externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public SearchRequestParametersExternalReferences addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public SearchRequestParametersExternalReferences externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public SearchRequestParametersExternalReferences addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersExternalReferences searchRequestParametersExternalReferences = (SearchRequestParametersExternalReferences) o;
-        return Objects.equals(this.externalReferenceIDs, searchRequestParametersExternalReferences.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, searchRequestParametersExternalReferences.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, searchRequestParametersExternalReferences.externalReferenceSources);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(externalReferenceIDs, externalReferenceIds, externalReferenceSources);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersExternalReferences {\n");
-
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersGermplasm.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersGermplasm.java
deleted file mode 100644
index 9a858fe1..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersGermplasm.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersGermplasm
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SearchRequestParametersGermplasm {
-    @SerializedName("germplasmDbIds")
-    private List<String> germplasmDbIds = null;
-
-    @SerializedName("germplasmNames")
-    private List<String> germplasmNames = null;
-
-    public SearchRequestParametersGermplasm germplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersGermplasm addGermplasmDbIdsItem(String germplasmDbIdsItem) {
-        if (this.germplasmDbIds == null) {
-            this.germplasmDbIds = new ArrayList<String>();
-        }
-        this.germplasmDbIds.add(germplasmDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of IDs which uniquely identify germplasm to search for
-     *
-     * @return germplasmDbIds
-     **/
-    @Schema(example = "[\"e9c6edd7\",\"1b1df4a6\"]", description = "List of IDs which uniquely identify germplasm to search for")
-    public List<String> getGermplasmDbIds() {
-        return germplasmDbIds;
-    }
-
-    public void setGermplasmDbIds(List<String> germplasmDbIds) {
-        this.germplasmDbIds = germplasmDbIds;
-    }
-
-    public SearchRequestParametersGermplasm germplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-        return this;
-    }
-
-    public SearchRequestParametersGermplasm addGermplasmNamesItem(String germplasmNamesItem) {
-        if (this.germplasmNames == null) {
-            this.germplasmNames = new ArrayList<String>();
-        }
-        this.germplasmNames.add(germplasmNamesItem);
-        return this;
-    }
-
-    /**
-     * List of human readable names to identify germplasm to search for
-     *
-     * @return germplasmNames
-     **/
-    @Schema(example = "[\"A0000003\",\"A0000477\"]", description = "List of human readable names to identify germplasm to search for")
-    public List<String> getGermplasmNames() {
-        return germplasmNames;
-    }
-
-    public void setGermplasmNames(List<String> germplasmNames) {
-        this.germplasmNames = germplasmNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersGermplasm searchRequestParametersGermplasm = (SearchRequestParametersGermplasm) o;
-        return Objects.equals(this.germplasmDbIds, searchRequestParametersGermplasm.germplasmDbIds) &&
-                Objects.equals(this.germplasmNames, searchRequestParametersGermplasm.germplasmNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(germplasmDbIds, germplasmNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersGermplasm {\n");
-
-        sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
-        sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersLocations.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersLocations.java
deleted file mode 100644
index 8b2b42ca..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersLocations.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersLocations
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SearchRequestParametersLocations {
-    @SerializedName("locationDbIds")
-    private List<String> locationDbIds = null;
-
-    @SerializedName("locationNames")
-    private List<String> locationNames = null;
-
-    public SearchRequestParametersLocations locationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersLocations addLocationDbIdsItem(String locationDbIdsItem) {
-        if (this.locationDbIds == null) {
-            this.locationDbIds = new ArrayList<String>();
-        }
-        this.locationDbIds.add(locationDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The location ids to search for
-     *
-     * @return locationDbIds
-     **/
-    @Schema(example = "[\"b28911cf\",\"5071d1e4\"]", description = "The location ids to search for")
-    public List<String> getLocationDbIds() {
-        return locationDbIds;
-    }
-
-    public void setLocationDbIds(List<String> locationDbIds) {
-        this.locationDbIds = locationDbIds;
-    }
-
-    public SearchRequestParametersLocations locationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-        return this;
-    }
-
-    public SearchRequestParametersLocations addLocationNamesItem(String locationNamesItem) {
-        if (this.locationNames == null) {
-            this.locationNames = new ArrayList<String>();
-        }
-        this.locationNames.add(locationNamesItem);
-        return this;
-    }
-
-    /**
-     * A human readable names to search for
-     *
-     * @return locationNames
-     **/
-    @Schema(example = "[\"Location Alpha\",\"The Large Hadron Collider\"]", description = "A human readable names to search for")
-    public List<String> getLocationNames() {
-        return locationNames;
-    }
-
-    public void setLocationNames(List<String> locationNames) {
-        this.locationNames = locationNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersLocations searchRequestParametersLocations = (SearchRequestParametersLocations) o;
-        return Objects.equals(this.locationDbIds, searchRequestParametersLocations.locationDbIds) &&
-                Objects.equals(this.locationNames, searchRequestParametersLocations.locationNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(locationDbIds, locationNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersLocations {\n");
-
-        sb.append("    locationDbIds: ").append(toIndentedString(locationDbIds)).append("\n");
-        sb.append("    locationNames: ").append(toIndentedString(locationNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersObservationVariables.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersObservationVariables.java
deleted file mode 100644
index 0c368628..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersObservationVariables.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersObservationVariables
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SearchRequestParametersObservationVariables {
-    @SerializedName("observationVariableDbIds")
-    private List<String> observationVariableDbIds = null;
-
-    @SerializedName("observationVariableNames")
-    private List<String> observationVariableNames = null;
-
-    @SerializedName("observationVariablePUIs")
-    private List<String> observationVariablePUIs = null;
-
-    public SearchRequestParametersObservationVariables observationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersObservationVariables addObservationVariableDbIdsItem(String observationVariableDbIdsItem) {
-        if (this.observationVariableDbIds == null) {
-            this.observationVariableDbIds = new ArrayList<String>();
-        }
-        this.observationVariableDbIds.add(observationVariableDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The DbIds of Variables to search for
-     *
-     * @return observationVariableDbIds
-     **/
-    @Schema(example = "[\"a646187d\",\"6d23513b\"]", description = "The DbIds of Variables to search for")
-    public List<String> getObservationVariableDbIds() {
-        return observationVariableDbIds;
-    }
-
-    public void setObservationVariableDbIds(List<String> observationVariableDbIds) {
-        this.observationVariableDbIds = observationVariableDbIds;
-    }
-
-    public SearchRequestParametersObservationVariables observationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-        return this;
-    }
-
-    public SearchRequestParametersObservationVariables addObservationVariableNamesItem(String observationVariableNamesItem) {
-        if (this.observationVariableNames == null) {
-            this.observationVariableNames = new ArrayList<String>();
-        }
-        this.observationVariableNames.add(observationVariableNamesItem);
-        return this;
-    }
-
-    /**
-     * The names of Variables to search for
-     *
-     * @return observationVariableNames
-     **/
-    @Schema(example = "[\"Plant Height in meters\",\"Wheat rust score 1-5\"]", description = "The names of Variables to search for")
-    public List<String> getObservationVariableNames() {
-        return observationVariableNames;
-    }
-
-    public void setObservationVariableNames(List<String> observationVariableNames) {
-        this.observationVariableNames = observationVariableNames;
-    }
-
-    public SearchRequestParametersObservationVariables observationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-        return this;
-    }
-
-    public SearchRequestParametersObservationVariables addObservationVariablePUIsItem(String observationVariablePUIsItem) {
-        if (this.observationVariablePUIs == null) {
-            this.observationVariablePUIs = new ArrayList<String>();
-        }
-        this.observationVariablePUIs.add(observationVariablePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI
-     *
-     * @return observationVariablePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008012\",\"http://my-traits.com/trait/CO_123:0007261\"]", description = "The Permanent Unique Identifier of an Observation Variable, usually in the form of a URI")
-    public List<String> getObservationVariablePUIs() {
-        return observationVariablePUIs;
-    }
-
-    public void setObservationVariablePUIs(List<String> observationVariablePUIs) {
-        this.observationVariablePUIs = observationVariablePUIs;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersObservationVariables searchRequestParametersObservationVariables = (SearchRequestParametersObservationVariables) o;
-        return Objects.equals(this.observationVariableDbIds, searchRequestParametersObservationVariables.observationVariableDbIds) &&
-                Objects.equals(this.observationVariableNames, searchRequestParametersObservationVariables.observationVariableNames) &&
-                Objects.equals(this.observationVariablePUIs, searchRequestParametersObservationVariables.observationVariablePUIs);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(observationVariableDbIds, observationVariableNames, observationVariablePUIs);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersObservationVariables {\n");
-
-        sb.append("    observationVariableDbIds: ").append(toIndentedString(observationVariableDbIds)).append("\n");
-        sb.append("    observationVariableNames: ").append(toIndentedString(observationVariableNames)).append("\n");
-        sb.append("    observationVariablePUIs: ").append(toIndentedString(observationVariablePUIs)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersPaging.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersPaging.java
deleted file mode 100644
index 5b9ae39b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersPaging.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * SearchRequestParametersPaging
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SearchRequestParametersPaging {
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    public SearchRequestParametersPaging page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SearchRequestParametersPaging pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersPaging searchRequestParametersPaging = (SearchRequestParametersPaging) o;
-        return Objects.equals(this.page, searchRequestParametersPaging.page) &&
-                Objects.equals(this.pageSize, searchRequestParametersPaging.pageSize);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(page, pageSize);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersPaging {\n");
-
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersPrograms.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersPrograms.java
deleted file mode 100644
index 69d40339..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersPrograms.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersPrograms
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SearchRequestParametersPrograms {
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    public SearchRequestParametersPrograms programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersPrograms addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public SearchRequestParametersPrograms programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public SearchRequestParametersPrograms addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersPrograms searchRequestParametersPrograms = (SearchRequestParametersPrograms) o;
-        return Objects.equals(this.programDbIds, searchRequestParametersPrograms.programDbIds) &&
-                Objects.equals(this.programNames, searchRequestParametersPrograms.programNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(programDbIds, programNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersPrograms {\n");
-
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersStudies.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersStudies.java
deleted file mode 100644
index d10c3c02..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersStudies.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersStudies
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SearchRequestParametersStudies {
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    public SearchRequestParametersStudies studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersStudies addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public SearchRequestParametersStudies studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public SearchRequestParametersStudies addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersStudies searchRequestParametersStudies = (SearchRequestParametersStudies) o;
-        return Objects.equals(this.studyDbIds, searchRequestParametersStudies.studyDbIds) &&
-                Objects.equals(this.studyNames, searchRequestParametersStudies.studyNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(studyDbIds, studyNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersStudies {\n");
-
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersTokenPaging.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersTokenPaging.java
deleted file mode 100644
index ca878876..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersTokenPaging.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * SearchRequestParametersTokenPaging
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SearchRequestParametersTokenPaging {
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("pageToken")
-    private String pageToken = null;
-
-    public SearchRequestParametersTokenPaging page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SearchRequestParametersTokenPaging pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public SearchRequestParametersTokenPaging pageToken(String pageToken) {
-        this.pageToken = pageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;Used to request a specific page of data to be returned. &lt;br&gt;Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively.
-     *
-     * @return pageToken
-     **/
-    @Schema(example = "33c27874", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>Used to request a specific page of data to be returned. <br>Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken from a prior response to construct a query and move to the next or previous page respectively. ")
-    public String getPageToken() {
-        return pageToken;
-    }
-
-    public void setPageToken(String pageToken) {
-        this.pageToken = pageToken;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersTokenPaging searchRequestParametersTokenPaging = (SearchRequestParametersTokenPaging) o;
-        return Objects.equals(this.page, searchRequestParametersTokenPaging.page) &&
-                Objects.equals(this.pageSize, searchRequestParametersTokenPaging.pageSize) &&
-                Objects.equals(this.pageToken, searchRequestParametersTokenPaging.pageToken);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(page, pageSize, pageToken);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersTokenPaging {\n");
-
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    pageToken: ").append(toIndentedString(pageToken)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersTrials.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersTrials.java
deleted file mode 100644
index 35c920e2..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersTrials.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersTrials
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SearchRequestParametersTrials {
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public SearchRequestParametersTrials trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersTrials addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public SearchRequestParametersTrials trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public SearchRequestParametersTrials addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersTrials searchRequestParametersTrials = (SearchRequestParametersTrials) o;
-        return Objects.equals(this.trialDbIds, searchRequestParametersTrials.trialDbIds) &&
-                Objects.equals(this.trialNames, searchRequestParametersTrials.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersTrials {\n");
-
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersVariableBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersVariableBaseClass.java
deleted file mode 100644
index d1e4b58e..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SearchRequestParametersVariableBaseClass.java
+++ /dev/null
@@ -1,1034 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * SearchRequestParametersVariableBaseClass
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SearchRequestParametersVariableBaseClass {
-    @SerializedName("commonCropNames")
-    private List<String> commonCropNames = null;
-
-    /**
-     * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
-     */
-    @JsonAdapter(DataTypesEnum.Adapter.class)
-    public enum DataTypesEnum {
-        CODE("Code"),
-        DATE("Date"),
-        DURATION("Duration"),
-        NOMINAL("Nominal"),
-        NUMERICAL("Numerical"),
-        ORDINAL("Ordinal"),
-        TEXT("Text");
-
-        private String value;
-
-        DataTypesEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static DataTypesEnum fromValue(String input) {
-            for (DataTypesEnum b : DataTypesEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<DataTypesEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final DataTypesEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public DataTypesEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return DataTypesEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("dataTypes")
-    private List<DataTypesEnum> dataTypes = null;
-
-    @SerializedName("externalReferenceIDs")
-    private List<String> externalReferenceIDs = null;
-
-    @SerializedName("externalReferenceIds")
-    private List<String> externalReferenceIds = null;
-
-    @SerializedName("externalReferenceSources")
-    private List<String> externalReferenceSources = null;
-
-    @SerializedName("methodDbIds")
-    private List<String> methodDbIds = null;
-
-    @SerializedName("methodNames")
-    private List<String> methodNames = null;
-
-    @SerializedName("methodPUIs")
-    private List<String> methodPUIs = null;
-
-    @SerializedName("ontologyDbIds")
-    private List<String> ontologyDbIds = null;
-
-    @SerializedName("page")
-    private Integer page = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = null;
-
-    @SerializedName("programDbIds")
-    private List<String> programDbIds = null;
-
-    @SerializedName("programNames")
-    private List<String> programNames = null;
-
-    @SerializedName("scaleDbIds")
-    private List<String> scaleDbIds = null;
-
-    @SerializedName("scaleNames")
-    private List<String> scaleNames = null;
-
-    @SerializedName("scalePUIs")
-    private List<String> scalePUIs = null;
-
-    @SerializedName("studyDbId")
-    private List<String> studyDbId = null;
-
-    @SerializedName("studyDbIds")
-    private List<String> studyDbIds = null;
-
-    @SerializedName("studyNames")
-    private List<String> studyNames = null;
-
-    @SerializedName("traitAttributePUIs")
-    private List<String> traitAttributePUIs = null;
-
-    @SerializedName("traitAttributes")
-    private List<String> traitAttributes = null;
-
-    @SerializedName("traitClasses")
-    private List<String> traitClasses = null;
-
-    @SerializedName("traitDbIds")
-    private List<String> traitDbIds = null;
-
-    @SerializedName("traitEntities")
-    private List<String> traitEntities = null;
-
-    @SerializedName("traitEntityPUIs")
-    private List<String> traitEntityPUIs = null;
-
-    @SerializedName("traitNames")
-    private List<String> traitNames = null;
-
-    @SerializedName("traitPUIs")
-    private List<String> traitPUIs = null;
-
-    @SerializedName("trialDbIds")
-    private List<String> trialDbIds = null;
-
-    @SerializedName("trialNames")
-    private List<String> trialNames = null;
-
-    public SearchRequestParametersVariableBaseClass commonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addCommonCropNamesItem(String commonCropNamesItem) {
-        if (this.commonCropNames == null) {
-            this.commonCropNames = new ArrayList<String>();
-        }
-        this.commonCropNames.add(commonCropNamesItem);
-        return this;
-    }
-
-    /**
-     * The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like &#x27;Maize&#x27;, &#x27;Wheat&#x27;, and &#x27;Rice&#x27; are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use &#x60;GET /commoncropnames&#x60; to find the list of available crops on a server.
-     *
-     * @return commonCropNames
-     **/
-    @Schema(example = "[\"Tomatillo\",\"Paw Paw\"]", description = "The BrAPI Common Crop Name is the simple, generalized, widely accepted name of the organism being researched. It is most often used in multi-crop systems where digital resources need to be divided at a high level. Things like 'Maize', 'Wheat', and 'Rice' are examples of common crop names.  Use this parameter to only return results associated with the given crops.   Use `GET /commoncropnames` to find the list of available crops on a server.")
-    public List<String> getCommonCropNames() {
-        return commonCropNames;
-    }
-
-    public void setCommonCropNames(List<String> commonCropNames) {
-        this.commonCropNames = commonCropNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass dataTypes(List<DataTypesEnum> dataTypes) {
-        this.dataTypes = dataTypes;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addDataTypesItem(DataTypesEnum dataTypesItem) {
-        if (this.dataTypes == null) {
-            this.dataTypes = new ArrayList<DataTypesEnum>();
-        }
-        this.dataTypes.add(dataTypesItem);
-        return this;
-    }
-
-    /**
-     * List of scale data types to filter search results
-     *
-     * @return dataTypes
-     **/
-    @Schema(example = "[\"Numerical\",\"Ordinal\",\"Text\"]", description = "List of scale data types to filter search results")
-    public List<DataTypesEnum> getDataTypes() {
-        return dataTypes;
-    }
-
-    public void setDataTypes(List<DataTypesEnum> dataTypes) {
-        this.dataTypes = dataTypes;
-    }
-
-    public SearchRequestParametersVariableBaseClass externalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addExternalReferenceIDsItem(String externalReferenceIDsItem) {
-        if (this.externalReferenceIDs == null) {
-            this.externalReferenceIDs = new ArrayList<String>();
-        }
-        this.externalReferenceIDs.add(externalReferenceIDsItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;externalReferenceIds&#x60;. Github issue number #460  &lt;br&gt;List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIDs
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "**Deprecated in v2.1** Please use `externalReferenceIds`. Github issue number #460  <br>List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIDs() {
-        return externalReferenceIDs;
-    }
-
-    public void setExternalReferenceIDs(List<String> externalReferenceIDs) {
-        this.externalReferenceIDs = externalReferenceIDs;
-    }
-
-    public SearchRequestParametersVariableBaseClass externalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addExternalReferenceIdsItem(String externalReferenceIdsItem) {
-        if (this.externalReferenceIds == null) {
-            this.externalReferenceIds = new ArrayList<String>();
-        }
-        this.externalReferenceIds.add(externalReferenceIdsItem);
-        return this;
-    }
-
-    /**
-     * List of external reference IDs. Could be a simple strings or a URIs. (use with &#x60;externalReferenceSources&#x60; parameter)
-     *
-     * @return externalReferenceIds
-     **/
-    @Schema(example = "[\"doi:10.155454/12341234\",\"14a19841\"]", description = "List of external reference IDs. Could be a simple strings or a URIs. (use with `externalReferenceSources` parameter)")
-    public List<String> getExternalReferenceIds() {
-        return externalReferenceIds;
-    }
-
-    public void setExternalReferenceIds(List<String> externalReferenceIds) {
-        this.externalReferenceIds = externalReferenceIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass externalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addExternalReferenceSourcesItem(String externalReferenceSourcesItem) {
-        if (this.externalReferenceSources == null) {
-            this.externalReferenceSources = new ArrayList<String>();
-        }
-        this.externalReferenceSources.add(externalReferenceSourcesItem);
-        return this;
-    }
-
-    /**
-     * List of identifiers for the source system or database of an external reference (use with &#x60;externalReferenceIDs&#x60; parameter)
-     *
-     * @return externalReferenceSources
-     **/
-    @Schema(example = "[\"DOI\",\"Field App Name\"]", description = "List of identifiers for the source system or database of an external reference (use with `externalReferenceIDs` parameter)")
-    public List<String> getExternalReferenceSources() {
-        return externalReferenceSources;
-    }
-
-    public void setExternalReferenceSources(List<String> externalReferenceSources) {
-        this.externalReferenceSources = externalReferenceSources;
-    }
-
-    public SearchRequestParametersVariableBaseClass methodDbIds(List<String> methodDbIds) {
-        this.methodDbIds = methodDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addMethodDbIdsItem(String methodDbIdsItem) {
-        if (this.methodDbIds == null) {
-            this.methodDbIds = new ArrayList<String>();
-        }
-        this.methodDbIds.add(methodDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of methods to filter search results
-     *
-     * @return methodDbIds
-     **/
-    @Schema(example = "[\"07e34f83\",\"d3d5517a\"]", description = "List of methods to filter search results")
-    public List<String> getMethodDbIds() {
-        return methodDbIds;
-    }
-
-    public void setMethodDbIds(List<String> methodDbIds) {
-        this.methodDbIds = methodDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass methodNames(List<String> methodNames) {
-        this.methodNames = methodNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addMethodNamesItem(String methodNamesItem) {
-        if (this.methodNames == null) {
-            this.methodNames = new ArrayList<String>();
-        }
-        this.methodNames.add(methodNamesItem);
-        return this;
-    }
-
-    /**
-     * Human readable name for the method &lt;br/&gt;MIAPPE V1.1 (DM-88) Method  Name of the method of observation
-     *
-     * @return methodNames
-     **/
-    @Schema(example = "[\"Measuring Tape\",\"Spectrometer\"]", description = "Human readable name for the method <br/>MIAPPE V1.1 (DM-88) Method  Name of the method of observation")
-    public List<String> getMethodNames() {
-        return methodNames;
-    }
-
-    public void setMethodNames(List<String> methodNames) {
-        this.methodNames = methodNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass methodPUIs(List<String> methodPUIs) {
-        this.methodPUIs = methodPUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addMethodPUIsItem(String methodPUIsItem) {
-        if (this.methodPUIs == null) {
-            this.methodPUIs = new ArrayList<String>();
-        }
-        this.methodPUIs.add(methodPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Method, usually in the form of a URI
-     *
-     * @return methodPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000212\",\"http://my-traits.com/trait/CO_123:0003557\"]", description = "The Permanent Unique Identifier of a Method, usually in the form of a URI")
-    public List<String> getMethodPUIs() {
-        return methodPUIs;
-    }
-
-    public void setMethodPUIs(List<String> methodPUIs) {
-        this.methodPUIs = methodPUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass ontologyDbIds(List<String> ontologyDbIds) {
-        this.ontologyDbIds = ontologyDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addOntologyDbIdsItem(String ontologyDbIdsItem) {
-        if (this.ontologyDbIds == null) {
-            this.ontologyDbIds = new ArrayList<String>();
-        }
-        this.ontologyDbIds.add(ontologyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of ontology IDs to search for
-     *
-     * @return ontologyDbIds
-     **/
-    @Schema(example = "[\"f44f7b23\",\"a26b576e\"]", description = "List of ontology IDs to search for")
-    public List<String> getOntologyDbIds() {
-        return ontologyDbIds;
-    }
-
-    public void setOntologyDbIds(List<String> ontologyDbIds) {
-        this.ontologyDbIds = ontologyDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    @Schema(example = "0", description = "Which result page is requested. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.")
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public SearchRequestParametersVariableBaseClass pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The size of the pages to be returned. Default is `1000`.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public SearchRequestParametersVariableBaseClass programDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addProgramDbIdsItem(String programDbIdsItem) {
-        if (this.programDbIds == null) {
-            this.programDbIds = new ArrayList<String>();
-        }
-        this.programDbIds.add(programDbIdsItem);
-        return this;
-    }
-
-    /**
-     * A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programDbIds
-     **/
-    @Schema(example = "[\"8f5de35b\",\"0e2d4a13\"]", description = "A BrAPI Program represents the high level organization or group who is responsible for conducting trials and studies. Things like Breeding Programs and Funded Projects are considered BrAPI Programs.   Use this parameter to only return results associated with the given programs.   Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramDbIds() {
-        return programDbIds;
-    }
-
-    public void setProgramDbIds(List<String> programDbIds) {
-        this.programDbIds = programDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass programNames(List<String> programNames) {
-        this.programNames = programNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addProgramNamesItem(String programNamesItem) {
-        if (this.programNames == null) {
-            this.programNames = new ArrayList<String>();
-        }
-        this.programNames.add(programNamesItem);
-        return this;
-    }
-
-    /**
-     * Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use &#x60;GET /programs&#x60; to find the list of available programs on a server.
-     *
-     * @return programNames
-     **/
-    @Schema(example = "[\"Better Breeding Program\",\"Best Breeding Program\"]", description = "Use this parameter to only return results associated with the given program names. Program names are not required to be unique.  Use `GET /programs` to find the list of available programs on a server.")
-    public List<String> getProgramNames() {
-        return programNames;
-    }
-
-    public void setProgramNames(List<String> programNames) {
-        this.programNames = programNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass scaleDbIds(List<String> scaleDbIds) {
-        this.scaleDbIds = scaleDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addScaleDbIdsItem(String scaleDbIdsItem) {
-        if (this.scaleDbIds == null) {
-            this.scaleDbIds = new ArrayList<String>();
-        }
-        this.scaleDbIds.add(scaleDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Scale
-     *
-     * @return scaleDbIds
-     **/
-    @Schema(example = "[\"a13ecffa\",\"7e1afe4f\"]", description = "The unique identifier for a Scale")
-    public List<String> getScaleDbIds() {
-        return scaleDbIds;
-    }
-
-    public void setScaleDbIds(List<String> scaleDbIds) {
-        this.scaleDbIds = scaleDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass scaleNames(List<String> scaleNames) {
-        this.scaleNames = scaleNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addScaleNamesItem(String scaleNamesItem) {
-        if (this.scaleNames == null) {
-            this.scaleNames = new ArrayList<String>();
-        }
-        this.scaleNames.add(scaleNamesItem);
-        return this;
-    }
-
-    /**
-     * Name of the scale &lt;br/&gt;MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable
-     *
-     * @return scaleNames
-     **/
-    @Schema(example = "[\"Meters\",\"Liters\"]", description = "Name of the scale <br/>MIAPPE V1.1 (DM-92) Scale Name of the scale associated with the variable")
-    public List<String> getScaleNames() {
-        return scaleNames;
-    }
-
-    public void setScaleNames(List<String> scaleNames) {
-        this.scaleNames = scaleNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass scalePUIs(List<String> scalePUIs) {
-        this.scalePUIs = scalePUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addScalePUIsItem(String scalePUIsItem) {
-        if (this.scalePUIs == null) {
-            this.scalePUIs = new ArrayList<String>();
-        }
-        this.scalePUIs.add(scalePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Scale, usually in the form of a URI
-     *
-     * @return scalePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000336\",\"http://my-traits.com/trait/CO_123:0000560\"]", description = "The Permanent Unique Identifier of a Scale, usually in the form of a URI")
-    public List<String> getScalePUIs() {
-        return scalePUIs;
-    }
-
-    public void setScalePUIs(List<String> scalePUIs) {
-        this.scalePUIs = scalePUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass studyDbId(List<String> studyDbId) {
-        this.studyDbId = studyDbId;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addStudyDbIdItem(String studyDbIdItem) {
-        if (this.studyDbId == null) {
-            this.studyDbId = new ArrayList<String>();
-        }
-        this.studyDbId.add(studyDbIdItem);
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;studyDbIds&#x60;. Github issue number #483  &lt;br&gt;The unique ID of a studies to filter on
-     *
-     * @return studyDbId
-     **/
-    @Schema(example = "[\"5bcac0ae\",\"7f48e22d\"]", description = "**Deprecated in v2.1** Please use `studyDbIds`. Github issue number #483  <br>The unique ID of a studies to filter on")
-    public List<String> getStudyDbId() {
-        return studyDbId;
-    }
-
-    public void setStudyDbId(List<String> studyDbId) {
-        this.studyDbId = studyDbId;
-    }
-
-    public SearchRequestParametersVariableBaseClass studyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addStudyDbIdsItem(String studyDbIdsItem) {
-        if (this.studyDbIds == null) {
-            this.studyDbIds = new ArrayList<String>();
-        }
-        this.studyDbIds.add(studyDbIdsItem);
-        return this;
-    }
-
-    /**
-     * List of study identifiers to search for
-     *
-     * @return studyDbIds
-     **/
-    @Schema(example = "[\"cf6c4bd4\",\"691e69d6\"]", description = "List of study identifiers to search for")
-    public List<String> getStudyDbIds() {
-        return studyDbIds;
-    }
-
-    public void setStudyDbIds(List<String> studyDbIds) {
-        this.studyDbIds = studyDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass studyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addStudyNamesItem(String studyNamesItem) {
-        if (this.studyNames == null) {
-            this.studyNames = new ArrayList<String>();
-        }
-        this.studyNames.add(studyNamesItem);
-        return this;
-    }
-
-    /**
-     * List of study names to filter search results
-     *
-     * @return studyNames
-     **/
-    @Schema(example = "[\"The First Bob Study 2017\",\"Wheat Yield Trial 246\"]", description = "List of study names to filter search results")
-    public List<String> getStudyNames() {
-        return studyNames;
-    }
-
-    public void setStudyNames(List<String> studyNames) {
-        this.studyNames = studyNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitAttributePUIs(List<String> traitAttributePUIs) {
-        this.traitAttributePUIs = traitAttributePUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitAttributePUIsItem(String traitAttributePUIsItem) {
-        if (this.traitAttributePUIs == null) {
-            this.traitAttributePUIs = new ArrayList<String>();
-        }
-        this.traitAttributePUIs.add(traitAttributePUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return traitAttributePUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0008336\",\"http://my-traits.com/trait/CO_123:0001092\"]", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public List<String> getTraitAttributePUIs() {
-        return traitAttributePUIs;
-    }
-
-    public void setTraitAttributePUIs(List<String> traitAttributePUIs) {
-        this.traitAttributePUIs = traitAttributePUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitAttributes(List<String> traitAttributes) {
-        this.traitAttributes = traitAttributes;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitAttributesItem(String traitAttributesItem) {
-        if (this.traitAttributes == null) {
-            this.traitAttributes = new ArrayList<String>();
-        }
-        this.traitAttributes.add(traitAttributesItem);
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return traitAttributes
-     **/
-    @Schema(example = "[\"Height\",\"Color\"]", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public List<String> getTraitAttributes() {
-        return traitAttributes;
-    }
-
-    public void setTraitAttributes(List<String> traitAttributes) {
-        this.traitAttributes = traitAttributes;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitClasses(List<String> traitClasses) {
-        this.traitClasses = traitClasses;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitClassesItem(String traitClassesItem) {
-        if (this.traitClasses == null) {
-            this.traitClasses = new ArrayList<String>();
-        }
-        this.traitClasses.add(traitClassesItem);
-        return this;
-    }
-
-    /**
-     * List of trait classes to filter search results
-     *
-     * @return traitClasses
-     **/
-    @Schema(example = "[\"morphological\",\"phenological\",\"agronomical\"]", description = "List of trait classes to filter search results")
-    public List<String> getTraitClasses() {
-        return traitClasses;
-    }
-
-    public void setTraitClasses(List<String> traitClasses) {
-        this.traitClasses = traitClasses;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitDbIds(List<String> traitDbIds) {
-        this.traitDbIds = traitDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitDbIdsItem(String traitDbIdsItem) {
-        if (this.traitDbIds == null) {
-            this.traitDbIds = new ArrayList<String>();
-        }
-        this.traitDbIds.add(traitDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The unique identifier for a Trait
-     *
-     * @return traitDbIds
-     **/
-    @Schema(example = "[\"ef81147b\",\"78d82fad\"]", description = "The unique identifier for a Trait")
-    public List<String> getTraitDbIds() {
-        return traitDbIds;
-    }
-
-    public void setTraitDbIds(List<String> traitDbIds) {
-        this.traitDbIds = traitDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitEntities(List<String> traitEntities) {
-        this.traitEntities = traitEntities;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitEntitiesItem(String traitEntitiesItem) {
-        if (this.traitEntities == null) {
-            this.traitEntities = new ArrayList<String>();
-        }
-        this.traitEntities.add(traitEntitiesItem);
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return traitEntities
-     **/
-    @Schema(example = "[\"Stalk\",\"Root\"]", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public List<String> getTraitEntities() {
-        return traitEntities;
-    }
-
-    public void setTraitEntities(List<String> traitEntities) {
-        this.traitEntities = traitEntities;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitEntityPUIs(List<String> traitEntityPUIs) {
-        this.traitEntityPUIs = traitEntityPUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitEntityPUIsItem(String traitEntityPUIsItem) {
-        if (this.traitEntityPUIs == null) {
-            this.traitEntityPUIs = new ArrayList<String>();
-        }
-        this.traitEntityPUIs.add(traitEntityPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return traitEntityPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0004098\",\"http://my-traits.com/trait/CO_123:0002366\"]", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public List<String> getTraitEntityPUIs() {
-        return traitEntityPUIs;
-    }
-
-    public void setTraitEntityPUIs(List<String> traitEntityPUIs) {
-        this.traitEntityPUIs = traitEntityPUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitNames(List<String> traitNames) {
-        this.traitNames = traitNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitNamesItem(String traitNamesItem) {
-        if (this.traitNames == null) {
-            this.traitNames = new ArrayList<String>();
-        }
-        this.traitNames.add(traitNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitNames
-     **/
-    @Schema(example = "[\"Stalk Height\",\"Root Color\"]", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public List<String> getTraitNames() {
-        return traitNames;
-    }
-
-    public void setTraitNames(List<String> traitNames) {
-        this.traitNames = traitNames;
-    }
-
-    public SearchRequestParametersVariableBaseClass traitPUIs(List<String> traitPUIs) {
-        this.traitPUIs = traitPUIs;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTraitPUIsItem(String traitPUIsItem) {
-        if (this.traitPUIs == null) {
-            this.traitPUIs = new ArrayList<String>();
-        }
-        this.traitPUIs.add(traitPUIsItem);
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUIs
-     **/
-    @Schema(example = "[\"http://my-traits.com/trait/CO_123:0000456\",\"http://my-traits.com/trait/CO_123:0000820\"]", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public List<String> getTraitPUIs() {
-        return traitPUIs;
-    }
-
-    public void setTraitPUIs(List<String> traitPUIs) {
-        this.traitPUIs = traitPUIs;
-    }
-
-    public SearchRequestParametersVariableBaseClass trialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTrialDbIdsItem(String trialDbIdsItem) {
-        if (this.trialDbIds == null) {
-            this.trialDbIds = new ArrayList<String>();
-        }
-        this.trialDbIds.add(trialDbIdsItem);
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trial to search for
-     *
-     * @return trialDbIds
-     **/
-    @Schema(example = "[\"d2593dc2\",\"9431a731\"]", description = "The ID which uniquely identifies a trial to search for")
-    public List<String> getTrialDbIds() {
-        return trialDbIds;
-    }
-
-    public void setTrialDbIds(List<String> trialDbIds) {
-        this.trialDbIds = trialDbIds;
-    }
-
-    public SearchRequestParametersVariableBaseClass trialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-        return this;
-    }
-
-    public SearchRequestParametersVariableBaseClass addTrialNamesItem(String trialNamesItem) {
-        if (this.trialNames == null) {
-            this.trialNames = new ArrayList<String>();
-        }
-        this.trialNames.add(trialNamesItem);
-        return this;
-    }
-
-    /**
-     * The human readable name of a trial to search for
-     *
-     * @return trialNames
-     **/
-    @Schema(example = "[\"All Yield Trials 2016\",\"Disease Resistance Study Comparison Group\"]", description = "The human readable name of a trial to search for")
-    public List<String> getTrialNames() {
-        return trialNames;
-    }
-
-    public void setTrialNames(List<String> trialNames) {
-        this.trialNames = trialNames;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SearchRequestParametersVariableBaseClass searchRequestParametersVariableBaseClass = (SearchRequestParametersVariableBaseClass) o;
-        return Objects.equals(this.commonCropNames, searchRequestParametersVariableBaseClass.commonCropNames) &&
-                Objects.equals(this.dataTypes, searchRequestParametersVariableBaseClass.dataTypes) &&
-                Objects.equals(this.externalReferenceIDs, searchRequestParametersVariableBaseClass.externalReferenceIDs) &&
-                Objects.equals(this.externalReferenceIds, searchRequestParametersVariableBaseClass.externalReferenceIds) &&
-                Objects.equals(this.externalReferenceSources, searchRequestParametersVariableBaseClass.externalReferenceSources) &&
-                Objects.equals(this.methodDbIds, searchRequestParametersVariableBaseClass.methodDbIds) &&
-                Objects.equals(this.methodNames, searchRequestParametersVariableBaseClass.methodNames) &&
-                Objects.equals(this.methodPUIs, searchRequestParametersVariableBaseClass.methodPUIs) &&
-                Objects.equals(this.ontologyDbIds, searchRequestParametersVariableBaseClass.ontologyDbIds) &&
-                Objects.equals(this.page, searchRequestParametersVariableBaseClass.page) &&
-                Objects.equals(this.pageSize, searchRequestParametersVariableBaseClass.pageSize) &&
-                Objects.equals(this.programDbIds, searchRequestParametersVariableBaseClass.programDbIds) &&
-                Objects.equals(this.programNames, searchRequestParametersVariableBaseClass.programNames) &&
-                Objects.equals(this.scaleDbIds, searchRequestParametersVariableBaseClass.scaleDbIds) &&
-                Objects.equals(this.scaleNames, searchRequestParametersVariableBaseClass.scaleNames) &&
-                Objects.equals(this.scalePUIs, searchRequestParametersVariableBaseClass.scalePUIs) &&
-                Objects.equals(this.studyDbId, searchRequestParametersVariableBaseClass.studyDbId) &&
-                Objects.equals(this.studyDbIds, searchRequestParametersVariableBaseClass.studyDbIds) &&
-                Objects.equals(this.studyNames, searchRequestParametersVariableBaseClass.studyNames) &&
-                Objects.equals(this.traitAttributePUIs, searchRequestParametersVariableBaseClass.traitAttributePUIs) &&
-                Objects.equals(this.traitAttributes, searchRequestParametersVariableBaseClass.traitAttributes) &&
-                Objects.equals(this.traitClasses, searchRequestParametersVariableBaseClass.traitClasses) &&
-                Objects.equals(this.traitDbIds, searchRequestParametersVariableBaseClass.traitDbIds) &&
-                Objects.equals(this.traitEntities, searchRequestParametersVariableBaseClass.traitEntities) &&
-                Objects.equals(this.traitEntityPUIs, searchRequestParametersVariableBaseClass.traitEntityPUIs) &&
-                Objects.equals(this.traitNames, searchRequestParametersVariableBaseClass.traitNames) &&
-                Objects.equals(this.traitPUIs, searchRequestParametersVariableBaseClass.traitPUIs) &&
-                Objects.equals(this.trialDbIds, searchRequestParametersVariableBaseClass.trialDbIds) &&
-                Objects.equals(this.trialNames, searchRequestParametersVariableBaseClass.trialNames);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(commonCropNames, dataTypes, externalReferenceIDs, externalReferenceIds, externalReferenceSources, methodDbIds, methodNames, methodPUIs, ontologyDbIds, page, pageSize, programDbIds, programNames, scaleDbIds, scaleNames, scalePUIs, studyDbId, studyDbIds, studyNames, traitAttributePUIs, traitAttributes, traitClasses, traitDbIds, traitEntities, traitEntityPUIs, traitNames, traitPUIs, trialDbIds, trialNames);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SearchRequestParametersVariableBaseClass {\n");
-
-        sb.append("    commonCropNames: ").append(toIndentedString(commonCropNames)).append("\n");
-        sb.append("    dataTypes: ").append(toIndentedString(dataTypes)).append("\n");
-        sb.append("    externalReferenceIDs: ").append(toIndentedString(externalReferenceIDs)).append("\n");
-        sb.append("    externalReferenceIds: ").append(toIndentedString(externalReferenceIds)).append("\n");
-        sb.append("    externalReferenceSources: ").append(toIndentedString(externalReferenceSources)).append("\n");
-        sb.append("    methodDbIds: ").append(toIndentedString(methodDbIds)).append("\n");
-        sb.append("    methodNames: ").append(toIndentedString(methodNames)).append("\n");
-        sb.append("    methodPUIs: ").append(toIndentedString(methodPUIs)).append("\n");
-        sb.append("    ontologyDbIds: ").append(toIndentedString(ontologyDbIds)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");
-        sb.append("    programNames: ").append(toIndentedString(programNames)).append("\n");
-        sb.append("    scaleDbIds: ").append(toIndentedString(scaleDbIds)).append("\n");
-        sb.append("    scaleNames: ").append(toIndentedString(scaleNames)).append("\n");
-        sb.append("    scalePUIs: ").append(toIndentedString(scalePUIs)).append("\n");
-        sb.append("    studyDbId: ").append(toIndentedString(studyDbId)).append("\n");
-        sb.append("    studyDbIds: ").append(toIndentedString(studyDbIds)).append("\n");
-        sb.append("    studyNames: ").append(toIndentedString(studyNames)).append("\n");
-        sb.append("    traitAttributePUIs: ").append(toIndentedString(traitAttributePUIs)).append("\n");
-        sb.append("    traitAttributes: ").append(toIndentedString(traitAttributes)).append("\n");
-        sb.append("    traitClasses: ").append(toIndentedString(traitClasses)).append("\n");
-        sb.append("    traitDbIds: ").append(toIndentedString(traitDbIds)).append("\n");
-        sb.append("    traitEntities: ").append(toIndentedString(traitEntities)).append("\n");
-        sb.append("    traitEntityPUIs: ").append(toIndentedString(traitEntityPUIs)).append("\n");
-        sb.append("    traitNames: ").append(toIndentedString(traitNames)).append("\n");
-        sb.append("    traitPUIs: ").append(toIndentedString(traitPUIs)).append("\n");
-        sb.append("    trialDbIds: ").append(toIndentedString(trialDbIds)).append("\n");
-        sb.append("    trialNames: ").append(toIndentedString(trialNames)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SeasonObs.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SeasonObs.java
deleted file mode 100644
index d31f9f6b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/SeasonObs.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * SeasonObs
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class SeasonObs {
-    @SerializedName("season")
-    private String season = null;
-
-    @SerializedName("seasonDbId")
-    private String seasonDbId = null;
-
-    @SerializedName("seasonName")
-    private String seasonName = null;
-
-    @SerializedName("year")
-    private Integer year = null;
-
-    public SeasonObs season(String season) {
-        this.season = season;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;seasonName&#x60;. Github issue number #456  &lt;br&gt;Name of the season. ex. &#x27;Spring&#x27;, &#x27;Q2&#x27;, &#x27;Season A&#x27;, etc.
-     *
-     * @return season
-     **/
-    @Schema(example = "Spring", description = "**Deprecated in v2.1** Please use `seasonName`. Github issue number #456  <br>Name of the season. ex. 'Spring', 'Q2', 'Season A', etc.")
-    public String getSeason() {
-        return season;
-    }
-
-    public void setSeason(String season) {
-        this.season = season;
-    }
-
-    public SeasonObs seasonDbId(String seasonDbId) {
-        this.seasonDbId = seasonDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a season. For backward compatibility it can be a string like &#x27;2012&#x27;, &#x27;1957-2004&#x27;
-     *
-     * @return seasonDbId
-     **/
-    @Schema(example = "Spring_2018", required = true, description = "The ID which uniquely identifies a season. For backward compatibility it can be a string like '2012', '1957-2004'")
-    public String getSeasonDbId() {
-        return seasonDbId;
-    }
-
-    public void setSeasonDbId(String seasonDbId) {
-        this.seasonDbId = seasonDbId;
-    }
-
-    public SeasonObs seasonName(String seasonName) {
-        this.seasonName = seasonName;
-        return this;
-    }
-
-    /**
-     * Name of the season. ex. &#x27;Spring&#x27;, &#x27;Q2&#x27;, &#x27;Season A&#x27;, etc.
-     *
-     * @return seasonName
-     **/
-    @Schema(example = "Spring", description = "Name of the season. ex. 'Spring', 'Q2', 'Season A', etc.")
-    public String getSeasonName() {
-        return seasonName;
-    }
-
-    public void setSeasonName(String seasonName) {
-        this.seasonName = seasonName;
-    }
-
-    public SeasonObs year(Integer year) {
-        this.year = year;
-        return this;
-    }
-
-    /**
-     * The 4 digit year of the season.
-     *
-     * @return year
-     **/
-    @Schema(example = "2018", description = "The 4 digit year of the season.")
-    public Integer getYear() {
-        return year;
-    }
-
-    public void setYear(Integer year) {
-        this.year = year;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SeasonObs seasonObs = (SeasonObs) o;
-        return Objects.equals(this.season, seasonObs.season) &&
-                Objects.equals(this.seasonDbId, seasonObs.seasonDbId) &&
-                Objects.equals(this.seasonName, seasonObs.seasonName) &&
-                Objects.equals(this.year, seasonObs.year);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(season, seasonDbId, seasonName, year);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class SeasonObs {\n");
-
-        sb.append("    season: ").append(toIndentedString(season)).append("\n");
-        sb.append("    seasonDbId: ").append(toIndentedString(seasonDbId)).append("\n");
-        sb.append("    seasonName: ").append(toIndentedString(seasonName)).append("\n");
-        sb.append("    year: ").append(toIndentedString(year)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Status.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Status.java
deleted file mode 100644
index 5bb8bb3b..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Status.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * An array of status messages to convey technical logging information from the server to the client.
- */
-@Schema(description = "An array of status messages to convey technical logging information from the server to the client.")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Status {
-    @SerializedName("message")
-    private String message = null;
-
-    /**
-     * The logging level for the attached message
-     */
-    @JsonAdapter(MessageTypeEnum.Adapter.class)
-    public enum MessageTypeEnum {
-        DEBUG("DEBUG"),
-        ERROR("ERROR"),
-        WARNING("WARNING"),
-        INFO("INFO");
-
-        private String value;
-
-        MessageTypeEnum(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-        public static MessageTypeEnum fromValue(String input) {
-            for (MessageTypeEnum b : MessageTypeEnum.values()) {
-                if (b.value.equals(input)) {
-                    return b;
-                }
-            }
-            return null;
-        }
-
-        public static class Adapter extends TypeAdapter<MessageTypeEnum> {
-            @Override
-            public void write(final JsonWriter jsonWriter, final MessageTypeEnum enumeration) throws IOException {
-                jsonWriter.value(String.valueOf(enumeration.getValue()));
-            }
-
-            @Override
-            public MessageTypeEnum read(final JsonReader jsonReader) throws IOException {
-                Object value = jsonReader.nextString();
-                return MessageTypeEnum.fromValue((String) (value));
-            }
-        }
-    }
-
-    @SerializedName("messageType")
-    private MessageTypeEnum messageType = null;
-
-    public Status message(String message) {
-        this.message = message;
-        return this;
-    }
-
-    /**
-     * A short message concerning the status of this request/response
-     *
-     * @return message
-     **/
-    @Schema(example = "Request accepted, response successful", required = true, description = "A short message concerning the status of this request/response")
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public Status messageType(MessageTypeEnum messageType) {
-        this.messageType = messageType;
-        return this;
-    }
-
-    /**
-     * The logging level for the attached message
-     *
-     * @return messageType
-     **/
-    @Schema(example = "INFO", required = true, description = "The logging level for the attached message")
-    public MessageTypeEnum getMessageType() {
-        return messageType;
-    }
-
-    public void setMessageType(MessageTypeEnum messageType) {
-        this.messageType = messageType;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Status status = (Status) o;
-        return Objects.equals(this.message, status.message) &&
-                Objects.equals(this.messageType, status.messageType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(message, messageType);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Status {\n");
-
-        sb.append("    message: ").append(toIndentedString(message)).append("\n");
-        sb.append("    messageType: ").append(toIndentedString(messageType)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TokenPagination.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TokenPagination.java
deleted file mode 100644
index a185f5e2..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TokenPagination.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Objects;
-
-/**
- * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The pagination object is applicable only when the payload contains a \&quot;data\&quot; key. It describes the pagination of the data contained in the \&quot;data\&quot; array, as a way to identify which subset of data is being returned.  &lt;br&gt;Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken to construct an additional query and move to the next or previous page respectively.
- */
-@Schema(description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The pagination object is applicable only when the payload contains a \"data\" key. It describes the pagination of the data contained in the \"data\" array, as a way to identify which subset of data is being returned.  <br>Tokenized pages are for large data sets which can not be efficiently broken into indexed pages. Use the nextPageToken and prevPageToken to construct an additional query and move to the next or previous page respectively.  ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class TokenPagination {
-    @SerializedName("currentPage")
-    private Integer currentPage = 0;
-
-    @SerializedName("currentPageToken")
-    private String currentPageToken = null;
-
-    @SerializedName("nextPageToken")
-    private String nextPageToken = null;
-
-    @SerializedName("pageSize")
-    private Integer pageSize = 1000;
-
-    @SerializedName("prevPageToken")
-    private String prevPageToken = null;
-
-    @SerializedName("totalCount")
-    private Integer totalCount = null;
-
-    @SerializedName("totalPages")
-    private Integer totalPages = null;
-
-    public TokenPagination currentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-        return this;
-    }
-
-    /**
-     * The index number for the returned page of data. This should always match the requested page number or the default page (0).
-     *
-     * @return currentPage
-     **/
-    @Schema(example = "0", description = "The index number for the returned page of data. This should always match the requested page number or the default page (0).")
-    public Integer getCurrentPage() {
-        return currentPage;
-    }
-
-    public void setCurrentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-    }
-
-    public TokenPagination currentPageToken(String currentPageToken) {
-        this.currentPageToken = currentPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the current page of data.
-     *
-     * @return currentPageToken
-     **/
-    @Schema(example = "48bc6ac1", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the current page of data.")
-    public String getCurrentPageToken() {
-        return currentPageToken;
-    }
-
-    public void setCurrentPageToken(String currentPageToken) {
-        this.currentPageToken = currentPageToken;
-    }
-
-    public TokenPagination nextPageToken(String nextPageToken) {
-        this.nextPageToken = nextPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the next page of data.
-     *
-     * @return nextPageToken
-     **/
-    @Schema(example = "cb668f63", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the next page of data.")
-    public String getNextPageToken() {
-        return nextPageToken;
-    }
-
-    public void setNextPageToken(String nextPageToken) {
-        this.nextPageToken = nextPageToken;
-    }
-
-    public TokenPagination pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.
-     *
-     * @return pageSize
-     **/
-    @Schema(example = "1000", description = "The number of data elements returned, aka the size of the current page. If the requested page does not have enough elements to fill a page at the requested page size, this field should indicate the actual number of elements returned.")
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public TokenPagination prevPageToken(String prevPageToken) {
-        this.prevPageToken = prevPageToken;
-        return this;
-    }
-
-    /**
-     * **Deprecated in v2.1** Please use &#x60;page&#x60;. Github issue number #451  &lt;br&gt;The string token used to query the previous page of data.
-     *
-     * @return prevPageToken
-     **/
-    @Schema(example = "9659857e", description = "**Deprecated in v2.1** Please use `page`. Github issue number #451  <br>The string token used to query the previous page of data.")
-    public String getPrevPageToken() {
-        return prevPageToken;
-    }
-
-    public void setPrevPageToken(String prevPageToken) {
-        this.prevPageToken = prevPageToken;
-    }
-
-    public TokenPagination totalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-        return this;
-    }
-
-    /**
-     * The total number of elements that are available on the server and match the requested query parameters.
-     *
-     * @return totalCount
-     **/
-    @Schema(example = "10", description = "The total number of elements that are available on the server and match the requested query parameters.")
-    public Integer getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public TokenPagination totalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-        return this;
-    }
-
-    /**
-     * The total number of pages of elements available on the server. This should be calculated with the following formula.  &lt;br&gt; totalPages &#x3D; CEILING( totalCount / requested_page_size)
-     *
-     * @return totalPages
-     **/
-    @Schema(example = "1", description = "The total number of pages of elements available on the server. This should be calculated with the following formula.  <br> totalPages = CEILING( totalCount / requested_page_size)")
-    public Integer getTotalPages() {
-        return totalPages;
-    }
-
-    public void setTotalPages(Integer totalPages) {
-        this.totalPages = totalPages;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TokenPagination tokenPagination = (TokenPagination) o;
-        return Objects.equals(this.currentPage, tokenPagination.currentPage) &&
-                Objects.equals(this.currentPageToken, tokenPagination.currentPageToken) &&
-                Objects.equals(this.nextPageToken, tokenPagination.nextPageToken) &&
-                Objects.equals(this.pageSize, tokenPagination.pageSize) &&
-                Objects.equals(this.prevPageToken, tokenPagination.prevPageToken) &&
-                Objects.equals(this.totalCount, tokenPagination.totalCount) &&
-                Objects.equals(this.totalPages, tokenPagination.totalPages);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(currentPage, currentPageToken, nextPageToken, pageSize, prevPageToken, totalCount, totalPages);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TokenPagination {\n");
-
-        sb.append("    currentPage: ").append(toIndentedString(currentPage)).append("\n");
-        sb.append("    currentPageToken: ").append(toIndentedString(currentPageToken)).append("\n");
-        sb.append("    nextPageToken: ").append(toIndentedString(nextPageToken)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
-        sb.append("    prevPageToken: ").append(toIndentedString(prevPageToken)).append("\n");
-        sb.append("    totalCount: ").append(toIndentedString(totalCount)).append("\n");
-        sb.append("    totalPages: ").append(toIndentedString(totalPages)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Trait.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Trait.java
deleted file mode 100644
index f3df2e7d..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/Trait.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A Trait describes what property is being observed.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Trait \&quot;Leaf length\&quot; or \&quot;Flower height\&quot;.
- */
-@Schema(description = "A Trait describes what property is being observed.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Trait \"Leaf length\" or \"Flower height\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class Trait {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("alternativeAbbreviations")
-    private List<String> alternativeAbbreviations = null;
-
-    @SerializedName("attribute")
-    private String attribute = null;
-
-    @SerializedName("attributePUI")
-    private String attributePUI = null;
-
-    @SerializedName("entity")
-    private String entity = null;
-
-    @SerializedName("entityPUI")
-    private String entityPUI = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("mainAbbreviation")
-    private String mainAbbreviation = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("traitClass")
-    private String traitClass = null;
-
-    @SerializedName("traitDbId")
-    private String traitDbId = null;
-
-    @SerializedName("traitDescription")
-    private String traitDescription = null;
-
-    @SerializedName("traitName")
-    private String traitName = null;
-
-    @SerializedName("traitPUI")
-    private String traitPUI = null;
-
-    public Trait additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public Trait putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public Trait alternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-        return this;
-    }
-
-    public Trait addAlternativeAbbreviationsItem(String alternativeAbbreviationsItem) {
-        if (this.alternativeAbbreviations == null) {
-            this.alternativeAbbreviations = new ArrayList<String>();
-        }
-        this.alternativeAbbreviations.add(alternativeAbbreviationsItem);
-        return this;
-    }
-
-    /**
-     * A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.
-     *
-     * @return alternativeAbbreviations
-     **/
-    @Schema(example = "[\"H\",\"PH\",\"H1\"]", description = "A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.")
-    public List<String> getAlternativeAbbreviations() {
-        return alternativeAbbreviations;
-    }
-
-    public void setAlternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-    }
-
-    public Trait attribute(String attribute) {
-        this.attribute = attribute;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attribute
-     **/
-    @Schema(example = "height", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    public Trait attributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attributePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PO:00012345", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttributePUI() {
-        return attributePUI;
-    }
-
-    public void setAttributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-    }
-
-    public Trait entity(String entity) {
-        this.entity = entity;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entity
-     **/
-    @Schema(example = "Stalk", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public String getEntity() {
-        return entity;
-    }
-
-    public void setEntity(String entity) {
-        this.entity = entity;
-    }
-
-    public Trait entityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A Trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the Entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entityPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PATO:00098765", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A Trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the Entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public String getEntityPUI() {
-        return entityPUI;
-    }
-
-    public void setEntityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-    }
-
-    public Trait externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public Trait addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public Trait mainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Trait
-     *
-     * @return mainAbbreviation
-     **/
-    @Schema(example = "PH", description = "A shortened version of the human readable name for a Trait")
-    public String getMainAbbreviation() {
-        return mainAbbreviation;
-    }
-
-    public void setMainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-    }
-
-    public Trait ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public Trait status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Trait status (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Trait status (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Trait synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public Trait addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other trait names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Height\",\"Plant Height\",\"Stalk Height\",\"Canopy Height\"]", description = "Other trait names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public Trait traitClass(String traitClass) {
-        this.traitClass = traitClass;
-        return this;
-    }
-
-    /**
-     * A classification to describe the type of trait and the context it should be considered in. &lt;br/&gt; examples- \&quot;morphological\&quot;, \&quot;phenological\&quot;, \&quot;agronomical\&quot;, \&quot;physiological\&quot;, \&quot;abiotic stress\&quot;, \&quot;biotic stress\&quot;, \&quot;biochemical\&quot;, \&quot;quality traits\&quot;, \&quot;fertility\&quot;, etc.
-     *
-     * @return traitClass
-     **/
-    @Schema(example = "phenological", description = "A classification to describe the type of trait and the context it should be considered in. <br/> examples- \"morphological\", \"phenological\", \"agronomical\", \"physiological\", \"abiotic stress\", \"biotic stress\", \"biochemical\", \"quality traits\", \"fertility\", etc.")
-    public String getTraitClass() {
-        return traitClass;
-    }
-
-    public void setTraitClass(String traitClass) {
-        this.traitClass = traitClass;
-    }
-
-    public Trait traitDbId(String traitDbId) {
-        this.traitDbId = traitDbId;
-        return this;
-    }
-
-    /**
-     * The ID which uniquely identifies a trait
-     *
-     * @return traitDbId
-     **/
-    @Schema(example = "9b2e34f5", description = "The ID which uniquely identifies a trait")
-    public String getTraitDbId() {
-        return traitDbId;
-    }
-
-    public void setTraitDbId(String traitDbId) {
-        this.traitDbId = traitDbId;
-    }
-
-    public Trait traitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-        return this;
-    }
-
-    /**
-     * The description of a trait
-     *
-     * @return traitDescription
-     **/
-    @Schema(example = "The height of the plant", description = "The description of a trait")
-    public String getTraitDescription() {
-        return traitDescription;
-    }
-
-    public void setTraitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-    }
-
-    public Trait traitName(String traitName) {
-        this.traitName = traitName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitName
-     **/
-    @Schema(example = "Height", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public String getTraitName() {
-        return traitName;
-    }
-
-    public void setTraitName(String traitName) {
-        this.traitName = traitName;
-    }
-
-    public Trait traitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000012", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public String getTraitPUI() {
-        return traitPUI;
-    }
-
-    public void setTraitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Trait trait = (Trait) o;
-        return Objects.equals(this.additionalInfo, trait.additionalInfo) &&
-                Objects.equals(this.alternativeAbbreviations, trait.alternativeAbbreviations) &&
-                Objects.equals(this.attribute, trait.attribute) &&
-                Objects.equals(this.attributePUI, trait.attributePUI) &&
-                Objects.equals(this.entity, trait.entity) &&
-                Objects.equals(this.entityPUI, trait.entityPUI) &&
-                Objects.equals(this.externalReferences, trait.externalReferences) &&
-                Objects.equals(this.mainAbbreviation, trait.mainAbbreviation) &&
-                Objects.equals(this.ontologyReference, trait.ontologyReference) &&
-                Objects.equals(this.status, trait.status) &&
-                Objects.equals(this.synonyms, trait.synonyms) &&
-                Objects.equals(this.traitClass, trait.traitClass) &&
-                Objects.equals(this.traitDbId, trait.traitDbId) &&
-                Objects.equals(this.traitDescription, trait.traitDescription) &&
-                Objects.equals(this.traitName, trait.traitName) &&
-                Objects.equals(this.traitPUI, trait.traitPUI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, alternativeAbbreviations, attribute, attributePUI, entity, entityPUI, externalReferences, mainAbbreviation, ontologyReference, status, synonyms, traitClass, traitDbId, traitDescription, traitName, traitPUI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Trait {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    alternativeAbbreviations: ").append(toIndentedString(alternativeAbbreviations)).append("\n");
-        sb.append("    attribute: ").append(toIndentedString(attribute)).append("\n");
-        sb.append("    attributePUI: ").append(toIndentedString(attributePUI)).append("\n");
-        sb.append("    entity: ").append(toIndentedString(entity)).append("\n");
-        sb.append("    entityPUI: ").append(toIndentedString(entityPUI)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    mainAbbreviation: ").append(toIndentedString(mainAbbreviation)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    traitClass: ").append(toIndentedString(traitClass)).append("\n");
-        sb.append("    traitDbId: ").append(toIndentedString(traitDbId)).append("\n");
-        sb.append("    traitDescription: ").append(toIndentedString(traitDescription)).append("\n");
-        sb.append("    traitName: ").append(toIndentedString(traitName)).append("\n");
-        sb.append("    traitPUI: ").append(toIndentedString(traitPUI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitBaseClass.java
deleted file mode 100644
index ac0aad11..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitBaseClass.java
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.*;
-
-/**
- * A Trait describes what property is being observed.  &lt;br&gt;For example, an ObservationVariable might be defined with a Trait of \&quot;plant height\&quot;, a Scale of \&quot;meters\&quot;, and a Method of \&quot;tape measure\&quot;. This variable would be distinct from a variable with the Trait \&quot;Leaf length\&quot; or \&quot;Flower height\&quot;.
- */
-@Schema(description = "A Trait describes what property is being observed.  <br>For example, an ObservationVariable might be defined with a Trait of \"plant height\", a Scale of \"meters\", and a Method of \"tape measure\". This variable would be distinct from a variable with the Trait \"Leaf length\" or \"Flower height\". ")
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class TraitBaseClass {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("alternativeAbbreviations")
-    private List<String> alternativeAbbreviations = null;
-
-    @SerializedName("attribute")
-    private String attribute = null;
-
-    @SerializedName("attributePUI")
-    private String attributePUI = null;
-
-    @SerializedName("entity")
-    private String entity = null;
-
-    @SerializedName("entityPUI")
-    private String entityPUI = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("mainAbbreviation")
-    private String mainAbbreviation = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("traitClass")
-    private String traitClass = null;
-
-    @SerializedName("traitDescription")
-    private String traitDescription = null;
-
-    @SerializedName("traitName")
-    private String traitName = null;
-
-    @SerializedName("traitPUI")
-    private String traitPUI = null;
-
-    public TraitBaseClass additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public TraitBaseClass putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public TraitBaseClass alternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-        return this;
-    }
-
-    public TraitBaseClass addAlternativeAbbreviationsItem(String alternativeAbbreviationsItem) {
-        if (this.alternativeAbbreviations == null) {
-            this.alternativeAbbreviations = new ArrayList<String>();
-        }
-        this.alternativeAbbreviations.add(alternativeAbbreviationsItem);
-        return this;
-    }
-
-    /**
-     * A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.
-     *
-     * @return alternativeAbbreviations
-     **/
-    @Schema(example = "[\"H\",\"PH\",\"H1\"]", description = "A list of shortened, human readable, names for a Trait. These abbreviations are acceptable alternatives to the mainAbbreviation and do not need to follow any formatting convention.")
-    public List<String> getAlternativeAbbreviations() {
-        return alternativeAbbreviations;
-    }
-
-    public void setAlternativeAbbreviations(List<String> alternativeAbbreviations) {
-        this.alternativeAbbreviations = alternativeAbbreviations;
-    }
-
-    public TraitBaseClass attribute(String attribute) {
-        this.attribute = attribute;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attribute
-     **/
-    @Schema(example = "height", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    public TraitBaseClass attributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI &lt;br/&gt;A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the attribute is the observed feature (or characteristic) of the entity e.g., for \&quot;grain colour\&quot;, attribute &#x3D; \&quot;colour\&quot;
-     *
-     * @return attributePUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PO:00012345", description = "The Permanent Unique Identifier of a Trait Attribute, usually in the form of a URI <br/>A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the attribute is the observed feature (or characteristic) of the entity e.g., for \"grain colour\", attribute = \"colour\"")
-    public String getAttributePUI() {
-        return attributePUI;
-    }
-
-    public void setAttributePUI(String attributePUI) {
-        this.attributePUI = attributePUI;
-    }
-
-    public TraitBaseClass entity(String entity) {
-        this.entity = entity;
-        return this;
-    }
-
-    /**
-     * A trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entity
-     **/
-    @Schema(example = "Stalk", description = "A trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\"")
-    public String getEntity() {
-        return entity;
-    }
-
-    public void setEntity(String entity) {
-        this.entity = entity;
-    }
-
-    public TraitBaseClass entityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI &lt;br/&gt;A Trait can be decomposed as \&quot;Trait\&quot; &#x3D; \&quot;Entity\&quot; + \&quot;Attribute\&quot;, the Entity is the part of the plant that the trait refers to e.g., for \&quot;grain colour\&quot;, entity &#x3D; \&quot;grain\&quot;
-     *
-     * @return entityPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/PATO:00098765", description = "The Permanent Unique Identifier of a Trait Entity, usually in the form of a URI <br/>A Trait can be decomposed as \"Trait\" = \"Entity\" + \"Attribute\", the Entity is the part of the plant that the trait refers to e.g., for \"grain colour\", entity = \"grain\" ")
-    public String getEntityPUI() {
-        return entityPUI;
-    }
-
-    public void setEntityPUI(String entityPUI) {
-        this.entityPUI = entityPUI;
-    }
-
-    public TraitBaseClass externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public TraitBaseClass addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public TraitBaseClass mainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-        return this;
-    }
-
-    /**
-     * A shortened version of the human readable name for a Trait
-     *
-     * @return mainAbbreviation
-     **/
-    @Schema(example = "PH", description = "A shortened version of the human readable name for a Trait")
-    public String getMainAbbreviation() {
-        return mainAbbreviation;
-    }
-
-    public void setMainAbbreviation(String mainAbbreviation) {
-        this.mainAbbreviation = mainAbbreviation;
-    }
-
-    public TraitBaseClass ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public TraitBaseClass status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Trait status (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Trait status (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public TraitBaseClass synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public TraitBaseClass addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other trait names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Height\",\"Plant Height\",\"Stalk Height\",\"Canopy Height\"]", description = "Other trait names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public TraitBaseClass traitClass(String traitClass) {
-        this.traitClass = traitClass;
-        return this;
-    }
-
-    /**
-     * A classification to describe the type of trait and the context it should be considered in. &lt;br/&gt; examples- \&quot;morphological\&quot;, \&quot;phenological\&quot;, \&quot;agronomical\&quot;, \&quot;physiological\&quot;, \&quot;abiotic stress\&quot;, \&quot;biotic stress\&quot;, \&quot;biochemical\&quot;, \&quot;quality traits\&quot;, \&quot;fertility\&quot;, etc.
-     *
-     * @return traitClass
-     **/
-    @Schema(example = "phenological", description = "A classification to describe the type of trait and the context it should be considered in. <br/> examples- \"morphological\", \"phenological\", \"agronomical\", \"physiological\", \"abiotic stress\", \"biotic stress\", \"biochemical\", \"quality traits\", \"fertility\", etc.")
-    public String getTraitClass() {
-        return traitClass;
-    }
-
-    public void setTraitClass(String traitClass) {
-        this.traitClass = traitClass;
-    }
-
-    public TraitBaseClass traitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-        return this;
-    }
-
-    /**
-     * The description of a trait
-     *
-     * @return traitDescription
-     **/
-    @Schema(example = "The height of the plant", description = "The description of a trait")
-    public String getTraitDescription() {
-        return traitDescription;
-    }
-
-    public void setTraitDescription(String traitDescription) {
-        this.traitDescription = traitDescription;
-    }
-
-    public TraitBaseClass traitName(String traitName) {
-        this.traitName = traitName;
-        return this;
-    }
-
-    /**
-     * The human readable name of a trait &lt;br/&gt;MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation
-     *
-     * @return traitName
-     **/
-    @Schema(example = "Height", description = "The human readable name of a trait <br/>MIAPPE V1.1 (DM-86) Trait - Name of the (plant or environmental) trait under observation")
-    public String getTraitName() {
-        return traitName;
-    }
-
-    public void setTraitName(String traitName) {
-        this.traitName = traitName;
-    }
-
-    public TraitBaseClass traitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-        return this;
-    }
-
-    /**
-     * The Permanent Unique Identifier of a Trait, usually in the form of a URI
-     *
-     * @return traitPUI
-     **/
-    @Schema(example = "http://my-traits.com/trait/CO_123:0000012", description = "The Permanent Unique Identifier of a Trait, usually in the form of a URI")
-    public String getTraitPUI() {
-        return traitPUI;
-    }
-
-    public void setTraitPUI(String traitPUI) {
-        this.traitPUI = traitPUI;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TraitBaseClass traitBaseClass = (TraitBaseClass) o;
-        return Objects.equals(this.additionalInfo, traitBaseClass.additionalInfo) &&
-                Objects.equals(this.alternativeAbbreviations, traitBaseClass.alternativeAbbreviations) &&
-                Objects.equals(this.attribute, traitBaseClass.attribute) &&
-                Objects.equals(this.attributePUI, traitBaseClass.attributePUI) &&
-                Objects.equals(this.entity, traitBaseClass.entity) &&
-                Objects.equals(this.entityPUI, traitBaseClass.entityPUI) &&
-                Objects.equals(this.externalReferences, traitBaseClass.externalReferences) &&
-                Objects.equals(this.mainAbbreviation, traitBaseClass.mainAbbreviation) &&
-                Objects.equals(this.ontologyReference, traitBaseClass.ontologyReference) &&
-                Objects.equals(this.status, traitBaseClass.status) &&
-                Objects.equals(this.synonyms, traitBaseClass.synonyms) &&
-                Objects.equals(this.traitClass, traitBaseClass.traitClass) &&
-                Objects.equals(this.traitDescription, traitBaseClass.traitDescription) &&
-                Objects.equals(this.traitName, traitBaseClass.traitName) &&
-                Objects.equals(this.traitPUI, traitBaseClass.traitPUI);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, alternativeAbbreviations, attribute, attributePUI, entity, entityPUI, externalReferences, mainAbbreviation, ontologyReference, status, synonyms, traitClass, traitDescription, traitName, traitPUI);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TraitBaseClass {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    alternativeAbbreviations: ").append(toIndentedString(alternativeAbbreviations)).append("\n");
-        sb.append("    attribute: ").append(toIndentedString(attribute)).append("\n");
-        sb.append("    attributePUI: ").append(toIndentedString(attributePUI)).append("\n");
-        sb.append("    entity: ").append(toIndentedString(entity)).append("\n");
-        sb.append("    entityPUI: ").append(toIndentedString(entityPUI)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    mainAbbreviation: ").append(toIndentedString(mainAbbreviation)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    traitClass: ").append(toIndentedString(traitClass)).append("\n");
-        sb.append("    traitDescription: ").append(toIndentedString(traitDescription)).append("\n");
-        sb.append("    traitName: ").append(toIndentedString(traitName)).append("\n");
-        sb.append("    traitPUI: ").append(toIndentedString(traitPUI)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitDataType.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitDataType.java
deleted file mode 100644
index 9efe6c36..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitDataType.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-/**
- * &lt;p&gt;Class of the scale, entries can be&lt;/p&gt; &lt;p&gt;\&quot;Code\&quot; -  This scale class is exceptionally used to express complex traits. Code is a nominal scale that combines the expressions of the different traits composing the complex trait. For example a severity trait might be expressed by a 2 digit and 2 character code. The first 2 digits are the percentage of the plant covered by a fungus and the 2 characters refer to the delay in development, e.g. \&quot;75VD\&quot; means \&quot;75 %\&quot; of the plant is infected and the plant is very delayed.&lt;/p&gt; &lt;p&gt;\&quot;Date\&quot; - The date class is for events expressed in a time format, See ISO 8601&lt;/p&gt; &lt;p&gt;\&quot;Duration\&quot; - The Duration class is for time elapsed between two events expressed in a time format, e.g. days, hours, months&lt;/p&gt; &lt;p&gt;\&quot;Nominal\&quot; - Categorical scale that can take one of a limited and fixed number of categories. There is no intrinsic ordering to the categories&lt;/p&gt; &lt;p&gt;\&quot;Numerical\&quot; - Numerical scales express the trait with real numbers. The numerical scale defines the unit e.g. centimeter, ton per hectare, branches&lt;/p&gt; &lt;p&gt;\&quot;Ordinal\&quot; - Ordinal scales are scales composed of ordered categories&lt;/p&gt; &lt;p&gt;\&quot;Text\&quot; - A free text is used to express the trait.&lt;/p&gt;
- */
-@JsonAdapter(TraitDataType.Adapter.class)
-public enum TraitDataType {
-    CODE("Code"),
-    DATE("Date"),
-    DURATION("Duration"),
-    NOMINAL("Nominal"),
-    NUMERICAL("Numerical"),
-    ORDINAL("Ordinal"),
-    TEXT("Text");
-
-    private final String value;
-
-    TraitDataType(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    public static TraitDataType fromValue(String input) {
-        for (TraitDataType b : TraitDataType.values()) {
-            if (b.value.equals(input)) {
-                return b;
-            }
-        }
-        return null;
-    }
-
-    public static class Adapter extends TypeAdapter<TraitDataType> {
-        @Override
-        public void write(final JsonWriter jsonWriter, final TraitDataType enumeration) throws IOException {
-            jsonWriter.value(String.valueOf(enumeration.getValue()));
-        }
-
-        @Override
-        public TraitDataType read(final JsonReader jsonReader) throws IOException {
-            Object value = jsonReader.nextString();
-            return TraitDataType.fromValue((String) (value));
-        }
-    }
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitListResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitListResponse.java
deleted file mode 100644
index 0d45f630..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitListResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * TraitListResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class TraitListResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private TraitListResponseResult result = null;
-
-    public TraitListResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public TraitListResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public TraitListResponse result(TraitListResponseResult result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public TraitListResponseResult getResult() {
-        return result;
-    }
-
-    public void setResult(TraitListResponseResult result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TraitListResponse traitListResponse = (TraitListResponse) o;
-        return Objects.equals(this._atContext, traitListResponse._atContext) &&
-                Objects.equals(this.metadata, traitListResponse.metadata) &&
-                Objects.equals(this.result, traitListResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TraitListResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitListResponseResult.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitListResponseResult.java
deleted file mode 100644
index 39fe60ab..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitListResponseResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * TraitListResponseResult
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class TraitListResponseResult {
-    @SerializedName("data")
-    private List<Trait> data = new ArrayList<Trait>();
-
-    public TraitListResponseResult data(List<Trait> data) {
-        this.data = data;
-        return this;
-    }
-
-    public TraitListResponseResult addDataItem(Trait dataItem) {
-        this.data.add(dataItem);
-        return this;
-    }
-
-    /**
-     * The &#x60;data&#x60; array is part of the BrAPI standard List Response JSON container. &#x60;data&#x60; will always contain the primary list of objects being returned by a BrAPI endpoint. &#x60;data&#x60; is also the only array impacted by the &#x60;metadata.pagination&#x60; details. When the pagination parameters change, the &#x60;data&#x60; array will reflect those changes in the JSON response.
-     *
-     * @return data
-     **/
-    @Schema(required = true, description = "The `data` array is part of the BrAPI standard List Response JSON container. `data` will always contain the primary list of objects being returned by a BrAPI endpoint. `data` is also the only array impacted by the `metadata.pagination` details. When the pagination parameters change, the `data` array will reflect those changes in the JSON response.")
-    public List<Trait> getData() {
-        return data;
-    }
-
-    public void setData(List<Trait> data) {
-        this.data = data;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TraitListResponseResult traitListResponseResult = (TraitListResponseResult) o;
-        return Objects.equals(this.data, traitListResponseResult.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(data);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TraitListResponseResult {\n");
-
-        sb.append("    data: ").append(toIndentedString(data)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitNewRequest.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitNewRequest.java
deleted file mode 100644
index f1ac02e8..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitNewRequest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import java.util.Objects;
-
-/**
- * TraitNewRequest
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class TraitNewRequest {
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash();
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TraitNewRequest {\n");
-
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitSingleResponse.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitSingleResponse.java
deleted file mode 100644
index 25457965..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/TraitSingleResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.brapi.model.v21.core.Metadata;
-
-import java.util.Objects;
-
-/**
- * TraitSingleResponse
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class TraitSingleResponse {
-    @SerializedName("@context")
-    private Context _atContext = null;
-
-    @SerializedName("metadata")
-    private Metadata metadata = null;
-
-    @SerializedName("result")
-    private Trait result = null;
-
-    public TraitSingleResponse _atContext(Context _atContext) {
-        this._atContext = _atContext;
-        return this;
-    }
-
-    /**
-     * Get _atContext
-     *
-     * @return _atContext
-     **/
-    @Schema(description = "")
-    public Context getAtContext() {
-        return _atContext;
-    }
-
-    public void setAtContext(Context _atContext) {
-        this._atContext = _atContext;
-    }
-
-    public TraitSingleResponse metadata(Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get metadata
-     *
-     * @return metadata
-     **/
-    @Schema(required = true, description = "")
-    public Metadata getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Metadata metadata) {
-        this.metadata = metadata;
-    }
-
-    public TraitSingleResponse result(Trait result) {
-        this.result = result;
-        return this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return result
-     **/
-    @Schema(required = true, description = "")
-    public Trait getResult() {
-        return result;
-    }
-
-    public void setResult(Trait result) {
-        this.result = result;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TraitSingleResponse traitSingleResponse = (TraitSingleResponse) o;
-        return Objects.equals(this._atContext, traitSingleResponse._atContext) &&
-                Objects.equals(this.metadata, traitSingleResponse.metadata) &&
-                Objects.equals(this.result, traitSingleResponse.result);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(_atContext, metadata, result);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class TraitSingleResponse {\n");
-
-        sb.append("    _atContext: ").append(toIndentedString(_atContext)).append("\n");
-        sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
-        sb.append("    result: ").append(toIndentedString(result)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/VariableBaseClass.java b/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/VariableBaseClass.java
deleted file mode 100644
index 7a44ac08..00000000
--- a/brapi-java-model-v21/src/main/java/org/brapi/model/v21/phenotype/VariableBaseClass.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- * BrAPI-Phenotyping
- * The Breeding API (BrAPI) is a Standardized REST ful Web Service API Specification for communicating Plant Breeding Data. BrAPI allows for easy data sharing between databases and tools involved in plant breeding. <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">General Reference Documentation</h2> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/RESTfulness\">URL Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Response_Structure\">Response Structure</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Dates_and_Times\">Date/Time Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Location_Coordinates\">Location Encoding</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Error_Handling\">Error Handling</a></div> <div class=\"gen-info-link\"><a href=\"https://wiki.brapi.org/index.php/Search_Services\">Search Services</a></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Core</h2> <div class=\"brapi-section-description\">The BrAPI Core module contains high level entities used for organization and management. This includes Programs, Trials, Studies, Locations, People, and Lists</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Core\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Core/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapicore21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"current-brapi-section brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Phenotyping</h2> <div class=\"brapi-section-description\">The BrAPI Phenotyping module contains entities related to phenotypic observations. This includes Observation Units, Observations, Observation Variables, Traits, Scales, Methods, and Images</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Phenotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Phenotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapiphenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Genotyping</h2> <div class=\"brapi-section-description\">The BrAPI Genotyping module contains entities related to genotyping analysis. This includes Samples, Markers, Variant Sets, Variants, Call Sets, Calls, References, Reads, and Vendor Orders</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Genotyping\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Genotyping/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigenotyping21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <div class=\"brapi-section\"> <h2 class=\"brapi-section-title\">BrAPI Germplasm</h2> <div class=\"brapi-section-description\">The BrAPI Germplasm module contains entities related to germplasm management. This includes Germplasm, Germplasm Attributes, Seed Lots, Crosses, Pedigree, and Progeny</div> <div class=\"version-number\">V2.1</div> <div class=\"link-btn\"><a href=\"https://github.com/plantbreeding/API/tree/brapi-V2.1/Specification/BrAPI-Germplasm\">GitHub</a></div> <div class=\"link-btn\"><a href=\"https://app.swaggerhub.com/apis/PlantBreedingAPI/BrAPI-Germplasm/2.1\">SwaggerHub</a></div> <div class=\"link-btn\"><a href=\"https://brapigermplasm21.docs.apiary.io\">Apiary</a></div> <div class=\"stop-float\"></div> </div>  <style> .link-btn{ float: left;  margin: 2px 10px 0 0;  padding: 0 5px;  border-radius: 5px;  background-color: #ddd; } .stop-float{   clear: both; } .version-number{   float: left;    margin: 5px 10px 0 5px; } .brapi-section-title{   margin: 0 10px 0 0;   font-size: 20px; } .current-brapi-section{   font-weight: bolder;   border-radius: 5px;    background-color: #ddd; } .brapi-section{   padding: 5px 5px;  } .brapi-section-description{   margin: 5px 0 0 5px; } </style>
- *
- * OpenAPI spec version: 2.1
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package org.brapi.model.v21.phenotype;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.threeten.bp.OffsetDateTime;
-
-import java.util.*;
-
-/**
- * VariableBaseClass
- */
-
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-10-25T17:44:48.481Z[GMT]")
-public class VariableBaseClass {
-    @SerializedName("additionalInfo")
-    private Map<String, String> additionalInfo = null;
-
-    @SerializedName("commonCropName")
-    private String commonCropName = null;
-
-    @SerializedName("contextOfUse")
-    private List<String> contextOfUse = null;
-
-    @SerializedName("defaultValue")
-    private String defaultValue = null;
-
-    @SerializedName("documentationURL")
-    private String documentationURL = null;
-
-    @SerializedName("externalReferences")
-    private List<ExternalReferencesInner> externalReferences = null;
-
-    @SerializedName("growthStage")
-    private String growthStage = null;
-
-    @SerializedName("institution")
-    private String institution = null;
-
-    @SerializedName("language")
-    private String language = null;
-
-    @SerializedName("method")
-    private ObservationVariableMethod method = null;
-
-    @SerializedName("ontologyReference")
-    private MethodOntologyReference ontologyReference = null;
-
-    @SerializedName("scale")
-    private ObservationVariableScale scale = null;
-
-    @SerializedName("scientist")
-    private String scientist = null;
-
-    @SerializedName("status")
-    private String status = null;
-
-    @SerializedName("submissionTimestamp")
-    private OffsetDateTime submissionTimestamp = null;
-
-    @SerializedName("synonyms")
-    private List<String> synonyms = null;
-
-    @SerializedName("trait")
-    private ObservationVariableTrait trait = null;
-
-    public VariableBaseClass additionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-        return this;
-    }
-
-    public VariableBaseClass putAdditionalInfoItem(String key, String additionalInfoItem) {
-        if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
-        }
-        this.additionalInfo.put(key, additionalInfoItem);
-        return this;
-    }
-
-    /**
-     * A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.
-     *
-     * @return additionalInfo
-     **/
-    @Schema(description = "A free space containing any additional information related to a particular object. A data source may provide any JSON object, unrestriced by the BrAPI specification.")
-    public Map<String, String> getAdditionalInfo() {
-        return additionalInfo;
-    }
-
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
-        this.additionalInfo = additionalInfo;
-    }
-
-    public VariableBaseClass commonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-        return this;
-    }
-
-    /**
-     * Crop name (examples: \&quot;Maize\&quot;, \&quot;Wheat\&quot;)
-     *
-     * @return commonCropName
-     **/
-    @Schema(example = "Maize", description = "Crop name (examples: \"Maize\", \"Wheat\")")
-    public String getCommonCropName() {
-        return commonCropName;
-    }
-
-    public void setCommonCropName(String commonCropName) {
-        this.commonCropName = commonCropName;
-    }
-
-    public VariableBaseClass contextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-        return this;
-    }
-
-    public VariableBaseClass addContextOfUseItem(String contextOfUseItem) {
-        if (this.contextOfUse == null) {
-            this.contextOfUse = new ArrayList<String>();
-        }
-        this.contextOfUse.add(contextOfUseItem);
-        return this;
-    }
-
-    /**
-     * Indication of how trait is routinely used. (examples: [\&quot;Trial evaluation\&quot;, \&quot;Nursery evaluation\&quot;])
-     *
-     * @return contextOfUse
-     **/
-    @Schema(example = "[\"Trial evaluation\",\"Nursery evaluation\"]", description = "Indication of how trait is routinely used. (examples: [\"Trial evaluation\", \"Nursery evaluation\"])")
-    public List<String> getContextOfUse() {
-        return contextOfUse;
-    }
-
-    public void setContextOfUse(List<String> contextOfUse) {
-        this.contextOfUse = contextOfUse;
-    }
-
-    public VariableBaseClass defaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-        return this;
-    }
-
-    /**
-     * Variable default value. (examples: \&quot;red\&quot;, \&quot;2.3\&quot;, etc.)
-     *
-     * @return defaultValue
-     **/
-    @Schema(example = "2.0", description = "Variable default value. (examples: \"red\", \"2.3\", etc.)")
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    public void setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    public VariableBaseClass documentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-        return this;
-    }
-
-    /**
-     * A URL to the human readable documentation of an object
-     *
-     * @return documentationURL
-     **/
-    @Schema(example = "https://wiki.brapi.org/documentation.html", description = "A URL to the human readable documentation of an object")
-    public String getDocumentationURL() {
-        return documentationURL;
-    }
-
-    public void setDocumentationURL(String documentationURL) {
-        this.documentationURL = documentationURL;
-    }
-
-    public VariableBaseClass externalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-        return this;
-    }
-
-    public VariableBaseClass addExternalReferencesItem(ExternalReferencesInner externalReferencesItem) {
-        if (this.externalReferences == null) {
-            this.externalReferences = new ArrayList<ExternalReferencesInner>();
-        }
-        this.externalReferences.add(externalReferencesItem);
-        return this;
-    }
-
-    /**
-     * An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.
-     *
-     * @return externalReferences
-     **/
-    @Schema(example = "[{\"referenceId\":\"doi:10.155454/12341234\",\"referenceSource\":\"DOI\"},{\"referenceId\":\"75a50e76\",\"referenceSource\":\"Remote Data Collection Upload Tool\"}]", description = "An array of external reference ids. These are references to this piece of data in an external system. Could be a simple string or a URI.")
-    public List<ExternalReferencesInner> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReferencesInner> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public VariableBaseClass growthStage(String growthStage) {
-        this.growthStage = growthStage;
-        return this;
-    }
-
-    /**
-     * Growth stage at which measurement is made (examples: \&quot;flowering\&quot;)
-     *
-     * @return growthStage
-     **/
-    @Schema(example = "flowering", description = "Growth stage at which measurement is made (examples: \"flowering\")")
-    public String getGrowthStage() {
-        return growthStage;
-    }
-
-    public void setGrowthStage(String growthStage) {
-        this.growthStage = growthStage;
-    }
-
-    public VariableBaseClass institution(String institution) {
-        this.institution = institution;
-        return this;
-    }
-
-    /**
-     * Name of institution submitting the variable
-     *
-     * @return institution
-     **/
-    @Schema(example = "The BrAPI Institute", description = "Name of institution submitting the variable")
-    public String getInstitution() {
-        return institution;
-    }
-
-    public void setInstitution(String institution) {
-        this.institution = institution;
-    }
-
-    public VariableBaseClass language(String language) {
-        this.language = language;
-        return this;
-    }
-
-    /**
-     * 2 letter ISO 639-1 code for the language of submission of the variable.
-     *
-     * @return language
-     **/
-    @Schema(example = "en", description = "2 letter ISO 639-1 code for the language of submission of the variable.")
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public VariableBaseClass method(ObservationVariableMethod method) {
-        this.method = method;
-        return this;
-    }
-
-    /**
-     * Get method
-     *
-     * @return method
-     **/
-    @Schema(required = true, description = "")
-    public ObservationVariableMethod getMethod() {
-        return method;
-    }
-
-    public void setMethod(ObservationVariableMethod method) {
-        this.method = method;
-    }
-
-    public VariableBaseClass ontologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-        return this;
-    }
-
-    /**
-     * Get ontologyReference
-     *
-     * @return ontologyReference
-     **/
-    @Schema(description = "")
-    public MethodOntologyReference getOntologyReference() {
-        return ontologyReference;
-    }
-
-    public void setOntologyReference(MethodOntologyReference ontologyReference) {
-        this.ontologyReference = ontologyReference;
-    }
-
-    public VariableBaseClass scale(ObservationVariableScale scale) {
-        this.scale = scale;
-        return this;
-    }
-
-    /**
-     * Get scale
-     *
-     * @return scale
-     **/
-    @Schema(required = true, description = "")
-    public ObservationVariableScale getScale() {
-        return scale;
-    }
-
-    public void setScale(ObservationVariableScale scale) {
-        this.scale = scale;
-    }
-
-    public VariableBaseClass scientist(String scientist) {
-        this.scientist = scientist;
-        return this;
-    }
-
-    /**
-     * Name of scientist submitting the variable.
-     *
-     * @return scientist
-     **/
-    @Schema(example = "Dr. Bob Robertson", description = "Name of scientist submitting the variable.")
-    public String getScientist() {
-        return scientist;
-    }
-
-    public void setScientist(String scientist) {
-        this.scientist = scientist;
-    }
-
-    public VariableBaseClass status(String status) {
-        this.status = status;
-        return this;
-    }
-
-    /**
-     * Variable status. (examples: \&quot;recommended\&quot;, \&quot;obsolete\&quot;, \&quot;legacy\&quot;, etc.)
-     *
-     * @return status
-     **/
-    @Schema(example = "recommended", description = "Variable status. (examples: \"recommended\", \"obsolete\", \"legacy\", etc.)")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public VariableBaseClass submissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-        return this;
-    }
-
-    /**
-     * Timestamp when the Variable was added (ISO 8601)
-     *
-     * @return submissionTimestamp
-     **/
-    @Schema(description = "Timestamp when the Variable was added (ISO 8601)")
-    public OffsetDateTime getSubmissionTimestamp() {
-        return submissionTimestamp;
-    }
-
-    public void setSubmissionTimestamp(OffsetDateTime submissionTimestamp) {
-        this.submissionTimestamp = submissionTimestamp;
-    }
-
-    public VariableBaseClass synonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-        return this;
-    }
-
-    public VariableBaseClass addSynonymsItem(String synonymsItem) {
-        if (this.synonyms == null) {
-            this.synonyms = new ArrayList<String>();
-        }
-        this.synonyms.add(synonymsItem);
-        return this;
-    }
-
-    /**
-     * Other variable names
-     *
-     * @return synonyms
-     **/
-    @Schema(example = "[\"Maize Height\",\"Stalk Height\",\"Corn Height\"]", description = "Other variable names")
-    public List<String> getSynonyms() {
-        return synonyms;
-    }
-
-    public void setSynonyms(List<String> synonyms) {
-        this.synonyms = synonyms;
-    }
-
-    public VariableBaseClass trait(ObservationVariableTrait trait) {
-        this.trait = trait;
-        return this;
-    }
-
-    /**
-     * Get trait
-     *
-     * @return trait
-     **/
-    @Schema(required = true, description = "")
-    public ObservationVariableTrait getTrait() {
-        return trait;
-    }
-
-    public void setTrait(ObservationVariableTrait trait) {
-        this.trait = trait;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VariableBaseClass variableBaseClass = (VariableBaseClass) o;
-        return Objects.equals(this.additionalInfo, variableBaseClass.additionalInfo) &&
-                Objects.equals(this.commonCropName, variableBaseClass.commonCropName) &&
-                Objects.equals(this.contextOfUse, variableBaseClass.contextOfUse) &&
-                Objects.equals(this.defaultValue, variableBaseClass.defaultValue) &&
-                Objects.equals(this.documentationURL, variableBaseClass.documentationURL) &&
-                Objects.equals(this.externalReferences, variableBaseClass.externalReferences) &&
-                Objects.equals(this.growthStage, variableBaseClass.growthStage) &&
-                Objects.equals(this.institution, variableBaseClass.institution) &&
-                Objects.equals(this.language, variableBaseClass.language) &&
-                Objects.equals(this.method, variableBaseClass.method) &&
-                Objects.equals(this.ontologyReference, variableBaseClass.ontologyReference) &&
-                Objects.equals(this.scale, variableBaseClass.scale) &&
-                Objects.equals(this.scientist, variableBaseClass.scientist) &&
-                Objects.equals(this.status, variableBaseClass.status) &&
-                Objects.equals(this.submissionTimestamp, variableBaseClass.submissionTimestamp) &&
-                Objects.equals(this.synonyms, variableBaseClass.synonyms) &&
-                Objects.equals(this.trait, variableBaseClass.trait);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(additionalInfo, commonCropName, contextOfUse, defaultValue, documentationURL, externalReferences, growthStage, institution, language, method, ontologyReference, scale, scientist, status, submissionTimestamp, synonyms, trait);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class VariableBaseClass {\n");
-
-        sb.append("    additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
-        sb.append("    commonCropName: ").append(toIndentedString(commonCropName)).append("\n");
-        sb.append("    contextOfUse: ").append(toIndentedString(contextOfUse)).append("\n");
-        sb.append("    defaultValue: ").append(toIndentedString(defaultValue)).append("\n");
-        sb.append("    documentationURL: ").append(toIndentedString(documentationURL)).append("\n");
-        sb.append("    externalReferences: ").append(toIndentedString(externalReferences)).append("\n");
-        sb.append("    growthStage: ").append(toIndentedString(growthStage)).append("\n");
-        sb.append("    institution: ").append(toIndentedString(institution)).append("\n");
-        sb.append("    language: ").append(toIndentedString(language)).append("\n");
-        sb.append("    method: ").append(toIndentedString(method)).append("\n");
-        sb.append("    ontologyReference: ").append(toIndentedString(ontologyReference)).append("\n");
-        sb.append("    scale: ").append(toIndentedString(scale)).append("\n");
-        sb.append("    scientist: ").append(toIndentedString(scientist)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    submissionTimestamp: ").append(toIndentedString(submissionTimestamp)).append("\n");
-        sb.append("    synonyms: ").append(toIndentedString(synonyms)).append("\n");
-        sb.append("    trait: ").append(toIndentedString(trait)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}

From 7c7650b398ed41c6c769d302cbe34984463e5274 Mon Sep 17 00:00:00 2001
From: timparsons <tep46@cornell.edu>
Date: Thu, 12 Oct 2023 12:00:57 -0400
Subject: [PATCH 24/28] Code cleanup

---
 .../src/main/java/org/brapi/client/v2/modules/core/ListsApi.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/ListsApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/ListsApi.java
index 8c358dc0..93ec1402 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/ListsApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/core/ListsApi.java
@@ -34,7 +34,6 @@
 import org.brapi.v2.model.core.request.BrAPIListSearchRequest;
 import org.brapi.v2.model.core.response.BrAPIListsListResponse;
 import org.brapi.v2.model.core.response.BrAPIListsSingleResponse;
-import org.brapi.v2.model.pheno.response.BrAPIObservationUnitListResponse;
 
 public class ListsApi {
     private BrAPIClient apiClient;

From ab1c7f38f354afd1ae893e2386d7dfd385feda77 Mon Sep 17 00:00:00 2001
From: timparsons <tep46@cornell.edu>
Date: Thu, 12 Oct 2023 12:01:17 -0400
Subject: [PATCH 25/28] Bumping version to 2.1.0

---
 brapi-java-client/pom.xml | 2 +-
 brapi-java-model/pom.xml  | 2 +-
 pom.xml                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/brapi-java-client/pom.xml b/brapi-java-client/pom.xml
index 4f956fbb..db0557f0 100644
--- a/brapi-java-client/pom.xml
+++ b/brapi-java-client/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.brapi</groupId>
         <artifactId>brapi</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
 
     <properties>
diff --git a/brapi-java-model/pom.xml b/brapi-java-model/pom.xml
index 06b5bc37..4cbb5501 100644
--- a/brapi-java-model/pom.xml
+++ b/brapi-java-model/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.brapi</groupId>
         <artifactId>brapi</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 030e53a7..324c10b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
   <groupId>org.brapi</groupId>
   <artifactId>brapi</artifactId>
-  <version>2.1-SNAPSHOT</version>
+  <version>2.1.0</version>
 
   <name>brapi</name>
   <url>http://www.breedinginsight.org</url>

From 82a5ff8e7a1c854eab3814f6f21f827c70df5876 Mon Sep 17 00:00:00 2001
From: timparsons <tep46@cornell.edu>
Date: Mon, 23 Oct 2023 11:35:21 -0400
Subject: [PATCH 26/28] Bringing Plates API/models in line with the rest of the
 client APIs/models

---
 .../java/org/brapi/client/v2/modules/genotype/PlatesApi.java   | 2 +-
 .../org/brapi/client/v2/modules/genotype/PlatesApiTest.java    | 2 +-
 .../brapi/v2/model/geno/request/BrAPIPlateSearchRequest.java   | 3 ++-
 .../brapi/v2/model/geno/response/BrAPIPlateListResponse.java   | 3 ++-
 .../v2/model/geno/response/BrAPIPlateListResponseResult.java   | 3 ++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/genotype/PlatesApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/genotype/PlatesApi.java
index addb9dda..f1ee0def 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/genotype/PlatesApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/genotype/PlatesApi.java
@@ -477,7 +477,7 @@ private Call searchPlatesSearchResultsDbIdGetCall(String searchResultsDbId, Inte
      * @return ApiResponse&lt;PlateListResponse&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ApiResponse<BrAPIPlateListResponse> searchPlatesSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize) throws ApiException {
+    public ApiResponse<Pair<Optional<BrAPIPlateListResponse>, Optional<BrAPIAcceptedSearchResponse>>> searchPlatesSearchResultsDbIdGet(String searchResultsDbId, Integer page, Integer pageSize) throws ApiException {
         Call call = searchPlatesSearchResultsDbIdGetCall(searchResultsDbId, page, pageSize);
         Type localVarReturnType = new TypeToken<BrAPIPlateListResponse>() {}.getType();
         return apiClient.execute(call, localVarReturnType);
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/genotype/PlatesApiTest.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/genotype/PlatesApiTest.java
index d5e31d7b..8507aa4f 100644
--- a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/genotype/PlatesApiTest.java
+++ b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/genotype/PlatesApiTest.java
@@ -145,7 +145,7 @@ public void searchPlatesSearchResultsDbIdGetTest() throws Exception {
         Integer pageSize = null;
 
         ApiException exception = assertThrows(ApiException.class, () -> {
-            ApiResponse<BrAPIPlateListResponse> response = api.searchPlatesSearchResultsDbIdGet(searchResultsDbId, page, pageSize);
+            ApiResponse<Pair<Optional<BrAPIPlateListResponse>, Optional<BrAPIAcceptedSearchResponse>>> response = api.searchPlatesSearchResultsDbIdGet(searchResultsDbId, page, pageSize);
         });
 
         // TODO: test validations
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/geno/request/BrAPIPlateSearchRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/geno/request/BrAPIPlateSearchRequest.java
index 7724f843..952e3b40 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/geno/request/BrAPIPlateSearchRequest.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/geno/request/BrAPIPlateSearchRequest.java
@@ -13,6 +13,7 @@
 package org.brapi.v2.model.geno.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.brapi.v2.model.BrAPISearchRequestParametersPaging;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,7 +23,7 @@
  * PlateSearchRequest
  */
 
-public class BrAPIPlateSearchRequest {
+public class BrAPIPlateSearchRequest extends BrAPISearchRequestParametersPaging {
     @JsonProperty("commonCropNames")
     private List<String> commonCropNames = null;
 
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/geno/response/BrAPIPlateListResponse.java b/brapi-java-model/src/main/java/org/brapi/v2/model/geno/response/BrAPIPlateListResponse.java
index 73446d83..292074e0 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/geno/response/BrAPIPlateListResponse.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/geno/response/BrAPIPlateListResponse.java
@@ -15,6 +15,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.brapi.v2.model.BrAPIContext;
 import org.brapi.v2.model.BrAPIMetadata;
+import org.brapi.v2.model.BrAPIResponse;
 
 import java.util.Objects;
 
@@ -22,7 +23,7 @@
  * PlateListResponse
  */
 
-public class BrAPIPlateListResponse {
+public class BrAPIPlateListResponse implements BrAPIResponse<BrAPIPlateListResponseResult> {
     @JsonProperty("@context")
     private BrAPIContext _atContext = null;
 
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/geno/response/BrAPIPlateListResponseResult.java b/brapi-java-model/src/main/java/org/brapi/v2/model/geno/response/BrAPIPlateListResponseResult.java
index 014c8d03..e97aedb1 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/geno/response/BrAPIPlateListResponseResult.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/geno/response/BrAPIPlateListResponseResult.java
@@ -13,6 +13,7 @@
 package org.brapi.v2.model.geno.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.brapi.v2.model.BrAPIResponseResult;
 import org.brapi.v2.model.geno.BrAPIPlate;
 
 import java.util.ArrayList;
@@ -23,7 +24,7 @@
  * PlateListResponseResult
  */
 
-public class BrAPIPlateListResponseResult {
+public class BrAPIPlateListResponseResult implements BrAPIResponseResult<BrAPIPlate> {
     @JsonProperty("data")
     private List<BrAPIPlate> data = new ArrayList<BrAPIPlate>();
 

From 6d12ba5efe9e59bf3aeee3f9eb6dac4af6a1f67c Mon Sep 17 00:00:00 2001
From: timparsons <tep46@cornell.edu>
Date: Thu, 26 Oct 2023 15:25:26 -0400
Subject: [PATCH 27/28] Bringing plates api and models in line with the rest of
 the library

---
 .../client/v2/modules/genotype/PlatesApi.java |   2 +-
 .../geno/request/BrAPIPlateSearchRequest.java |  46 +----
 .../BrAPIVendorPlateSubmissionRequest.java    |  11 +-
 ...APIVendorPlateSubmissionRequestPlates.java | 162 ------------------
 .../BrAPIVendorOrderStatusResponseResult.java |  12 +-
 5 files changed, 22 insertions(+), 211 deletions(-)
 delete mode 100644 brapi-java-model/src/main/java/org/brapi/v2/model/geno/request/BrAPIVendorPlateSubmissionRequestPlates.java

diff --git a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/genotype/PlatesApi.java b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/genotype/PlatesApi.java
index f1ee0def..d597f60c 100644
--- a/brapi-java-client/src/main/java/org/brapi/client/v2/modules/genotype/PlatesApi.java
+++ b/brapi-java-client/src/main/java/org/brapi/client/v2/modules/genotype/PlatesApi.java
@@ -403,7 +403,7 @@ public Call searchPlatesPostCall(BrAPIPlateSearchRequest body) throws ApiExcepti
     public ApiResponse<Pair<Optional<BrAPIPlateListResponse>, Optional<BrAPIAcceptedSearchResponse>>> searchPlatesPost(BrAPIPlateSearchRequest body) throws ApiException {
         Call call = searchPlatesPostCall(body);
         Type localVarReturnType = new TypeToken<BrAPIPlateListResponse>() {}.getType();
-        return apiClient.execute(call, localVarReturnType);
+        return apiClient.executeSearch(call, localVarReturnType);
     }
 
     /**
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/geno/request/BrAPIPlateSearchRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/geno/request/BrAPIPlateSearchRequest.java
index 952e3b40..1edfd9b3 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/geno/request/BrAPIPlateSearchRequest.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/geno/request/BrAPIPlateSearchRequest.java
@@ -45,12 +45,6 @@ public class BrAPIPlateSearchRequest extends BrAPISearchRequestParametersPaging
     @JsonProperty("observationUnitDbIds")
     private List<String> observationUnitDbIds = null;
 
-    @JsonProperty("page")
-    private Integer page = null;
-
-    @JsonProperty("pageSize")
-    private Integer pageSize = null;
-
     @JsonProperty("plateBarcodes")
     private List<String> plateBarcodes = null;
 
@@ -270,41 +264,15 @@ public void setObservationUnitDbIds(List<String> observationUnitDbIds) {
     }
 
     public BrAPIPlateSearchRequest page(Integer page) {
-        this.page = page;
+        super.setPage(page);
         return this;
     }
 
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
     public BrAPIPlateSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
+        super.setPageSize(pageSize);
         return this;
     }
 
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
     public BrAPIPlateSearchRequest plateBarcodes(List<String> plateBarcodes) {
         this.plateBarcodes = plateBarcodes;
         return this;
@@ -634,8 +602,8 @@ public boolean equals(Object o) {
                 Objects.equals(this.germplasmDbIds, plateSearchRequest.germplasmDbIds) &&
                 Objects.equals(this.germplasmNames, plateSearchRequest.germplasmNames) &&
                 Objects.equals(this.observationUnitDbIds, plateSearchRequest.observationUnitDbIds) &&
-                Objects.equals(this.page, plateSearchRequest.page) &&
-                Objects.equals(this.pageSize, plateSearchRequest.pageSize) &&
+                Objects.equals(super.getPage(), plateSearchRequest.getPage()) &&
+                Objects.equals(this.getPageSize(), plateSearchRequest.getPageSize()) &&
                 Objects.equals(this.plateBarcodes, plateSearchRequest.plateBarcodes) &&
                 Objects.equals(this.plateDbIds, plateSearchRequest.plateDbIds) &&
                 Objects.equals(this.plateNames, plateSearchRequest.plateNames) &&
@@ -652,7 +620,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds, germplasmNames, observationUnitDbIds, page, pageSize, plateBarcodes, plateDbIds, plateNames, programDbIds, programNames, sampleDbIds, sampleGroupDbIds, sampleNames, studyDbIds, studyNames, trialDbIds, trialNames);
+        return Objects.hash(commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, germplasmDbIds, germplasmNames, observationUnitDbIds, getPage(), getPageSize(), plateBarcodes, plateDbIds, plateNames, programDbIds, programNames, sampleDbIds, sampleGroupDbIds, sampleNames, studyDbIds, studyNames, trialDbIds, trialNames);
     }
 
 
@@ -668,8 +636,8 @@ public String toString() {
         sb.append("    germplasmDbIds: ").append(toIndentedString(germplasmDbIds)).append("\n");
         sb.append("    germplasmNames: ").append(toIndentedString(germplasmNames)).append("\n");
         sb.append("    observationUnitDbIds: ").append(toIndentedString(observationUnitDbIds)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
+        sb.append("    page: ").append(toIndentedString(getPage())).append("\n");
+        sb.append("    pageSize: ").append(toIndentedString(getPageSize())).append("\n");
         sb.append("    plateBarcodes: ").append(toIndentedString(plateBarcodes)).append("\n");
         sb.append("    plateDbIds: ").append(toIndentedString(plateDbIds)).append("\n");
         sb.append("    plateNames: ").append(toIndentedString(plateNames)).append("\n");
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/geno/request/BrAPIVendorPlateSubmissionRequest.java b/brapi-java-model/src/main/java/org/brapi/v2/model/geno/request/BrAPIVendorPlateSubmissionRequest.java
index da8833b3..d0cf9452 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/geno/request/BrAPIVendorPlateSubmissionRequest.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/geno/request/BrAPIVendorPlateSubmissionRequest.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.brapi.v2.model.geno.BrAPISampleTypeEnum;
+import org.brapi.v2.model.geno.BrAPIVendorPlate;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
@@ -24,7 +25,7 @@ public class BrAPIVendorPlateSubmissionRequest   {
 
   @JsonProperty("plates")
   @Valid
-  private List<BrAPIVendorPlateSubmissionRequestPlates> plates = new ArrayList<BrAPIVendorPlateSubmissionRequestPlates>();
+  private List<BrAPIVendorPlate> plates = new ArrayList<>();
 
   @JsonProperty("sampleType")
   private BrAPISampleTypeEnum sampleType = null;
@@ -69,12 +70,12 @@ public void setNumberOfSamples(Integer numberOfSamples) {
     this.numberOfSamples = numberOfSamples;
   }
 
-  public BrAPIVendorPlateSubmissionRequest plates(List<BrAPIVendorPlateSubmissionRequestPlates> plates) {
+  public BrAPIVendorPlateSubmissionRequest plates(List<BrAPIVendorPlate> plates) {
     this.plates = plates;
     return this;
   }
 
-  public BrAPIVendorPlateSubmissionRequest addPlatesItem(BrAPIVendorPlateSubmissionRequestPlates platesItem) {
+  public BrAPIVendorPlateSubmissionRequest addPlatesItem(BrAPIVendorPlate platesItem) {
     this.plates.add(platesItem);
     return this;
   }
@@ -86,11 +87,11 @@ public BrAPIVendorPlateSubmissionRequest addPlatesItem(BrAPIVendorPlateSubmissio
   
       
     @Valid
-    public List<BrAPIVendorPlateSubmissionRequestPlates> getPlates() {
+    public List<BrAPIVendorPlate> getPlates() {
     return plates;
   }
 
-  public void setPlates(List<BrAPIVendorPlateSubmissionRequestPlates> plates) {
+  public void setPlates(List<BrAPIVendorPlate> plates) {
     this.plates = plates;
   }
 
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/geno/request/BrAPIVendorPlateSubmissionRequestPlates.java b/brapi-java-model/src/main/java/org/brapi/v2/model/geno/request/BrAPIVendorPlateSubmissionRequestPlates.java
deleted file mode 100644
index f5828b5b..00000000
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/geno/request/BrAPIVendorPlateSubmissionRequestPlates.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.brapi.v2.model.geno.request;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.brapi.v2.model.geno.BrAPIPlateFormat;
-import org.brapi.v2.model.geno.BrAPIVendorSample;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.validation.Valid;
-
-/**
- * VendorPlateSubmissionRequestPlates
- */
-
-
-public class BrAPIVendorPlateSubmissionRequestPlates   {
-  @JsonProperty("clientPlateBarcode")
-  private String clientPlateBarcode = null;
-
-  @JsonProperty("clientPlateId")
-  private String clientPlateId = null;
-
-  @JsonProperty("sampleSubmissionFormat")
-  private BrAPIPlateFormat sampleSubmissionFormat = null;
-
-  @JsonProperty("samples")
-  @Valid
-  private List<BrAPIVendorSample> samples = null;
-
-  public BrAPIVendorPlateSubmissionRequestPlates clientPlateBarcode(String clientPlateBarcode) {
-    this.clientPlateBarcode = clientPlateBarcode;
-    return this;
-  }
-
-  /**
-   * (Optional) The value of the bar code attached to this plate
-   * @return clientPlateBarcode
-  **/
-  
-  
-    public String getClientPlateBarcode() {
-    return clientPlateBarcode;
-  }
-
-  public void setClientPlateBarcode(String clientPlateBarcode) {
-    this.clientPlateBarcode = clientPlateBarcode;
-  }
-
-  public BrAPIVendorPlateSubmissionRequestPlates clientPlateId(String clientPlateId) {
-    this.clientPlateId = clientPlateId;
-    return this;
-  }
-
-  /**
-   * The ID which uniquely identifies this plate to the client making the request
-   * @return clientPlateId
-  **/
-  
-  
-    public String getClientPlateId() {
-    return clientPlateId;
-  }
-
-  public void setClientPlateId(String clientPlateId) {
-    this.clientPlateId = clientPlateId;
-  }
-
-  public BrAPIVendorPlateSubmissionRequestPlates sampleSubmissionFormat(BrAPIPlateFormat sampleSubmissionFormat) {
-    this.sampleSubmissionFormat = sampleSubmissionFormat;
-    return this;
-  }
-
-  /**
-   * Get sampleSubmissionFormat
-   * @return sampleSubmissionFormat
-  **/
-  
-  
-    @Valid
-    public BrAPIPlateFormat getSampleSubmissionFormat() {
-    return sampleSubmissionFormat;
-  }
-
-  public void setSampleSubmissionFormat(BrAPIPlateFormat sampleSubmissionFormat) {
-    this.sampleSubmissionFormat = sampleSubmissionFormat;
-  }
-
-  public BrAPIVendorPlateSubmissionRequestPlates samples(List<BrAPIVendorSample> samples) {
-    this.samples = samples;
-    return this;
-  }
-
-  public BrAPIVendorPlateSubmissionRequestPlates addSamplesItem(BrAPIVendorSample samplesItem) {
-    if (this.samples == null) {
-      this.samples = new ArrayList<BrAPIVendorSample>();
-    }
-    this.samples.add(samplesItem);
-    return this;
-  }
-
-  /**
-   * Get samples
-   * @return samples
-  **/
-  
-      @Valid
-    public List<BrAPIVendorSample> getSamples() {
-    return samples;
-  }
-
-  public void setSamples(List<BrAPIVendorSample> samples) {
-    this.samples = samples;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BrAPIVendorPlateSubmissionRequestPlates vendorPlateSubmissionRequestPlates = (BrAPIVendorPlateSubmissionRequestPlates) o;
-    return Objects.equals(this.clientPlateBarcode, vendorPlateSubmissionRequestPlates.clientPlateBarcode) &&
-        Objects.equals(this.clientPlateId, vendorPlateSubmissionRequestPlates.clientPlateId) &&
-        Objects.equals(this.sampleSubmissionFormat, vendorPlateSubmissionRequestPlates.sampleSubmissionFormat) &&
-        Objects.equals(this.samples, vendorPlateSubmissionRequestPlates.samples);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(clientPlateBarcode, clientPlateId, sampleSubmissionFormat, samples);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class VendorPlateSubmissionRequestPlates {\n");
-    
-    sb.append("    clientPlateBarcode: ").append(toIndentedString(clientPlateBarcode)).append("\n");
-    sb.append("    clientPlateId: ").append(toIndentedString(clientPlateId)).append("\n");
-    sb.append("    sampleSubmissionFormat: ").append(toIndentedString(sampleSubmissionFormat)).append("\n");
-    sb.append("    samples: ").append(toIndentedString(samples)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/geno/response/BrAPIVendorOrderStatusResponseResult.java b/brapi-java-model/src/main/java/org/brapi/v2/model/geno/response/BrAPIVendorOrderStatusResponseResult.java
index 25411d83..3c23e858 100644
--- a/brapi-java-model/src/main/java/org/brapi/v2/model/geno/response/BrAPIVendorOrderStatusResponseResult.java
+++ b/brapi-java-model/src/main/java/org/brapi/v2/model/geno/response/BrAPIVendorOrderStatusResponseResult.java
@@ -6,8 +6,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.fasterxml.jackson.annotation.JsonValue;
-
-
+import org.brapi.v2.model.BrAPIEnum;
 
 
 /**
@@ -19,7 +18,7 @@ public class BrAPIVendorOrderStatusResponseResult   {
   /**
    * Gets or Sets status
    */
-  public enum StatusEnum {
+  public enum StatusEnum implements BrAPIEnum {
     REGISTERED("registered"),
     
     RECEIVED("received"),
@@ -45,12 +44,17 @@ public String toString() {
     @JsonCreator
     public static StatusEnum fromValue(String text) {
       for (StatusEnum b : StatusEnum.values()) {
-        if (String.valueOf(b.value).equals(text)) {
+        if (String.valueOf(b.value).equalsIgnoreCase(text)) {
           return b;
         }
       }
       return null;
     }
+
+    @Override
+    public String getBrapiValue() {
+      return value;
+    }
   }
   @JsonProperty("status")
   private StatusEnum status = null;

From ab6e426deffdeb0b79326fe67ad643534022b114 Mon Sep 17 00:00:00 2001
From: timparsons <tep46@cornell.edu>
Date: Thu, 26 Oct 2023 15:27:16 -0400
Subject: [PATCH 28/28] reverting version to SNAPSHOT for merging into develop
 branch

---
 brapi-java-client/pom.xml | 2 +-
 brapi-java-model/pom.xml  | 2 +-
 pom.xml                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/brapi-java-client/pom.xml b/brapi-java-client/pom.xml
index db0557f0..4f956fbb 100644
--- a/brapi-java-client/pom.xml
+++ b/brapi-java-client/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.brapi</groupId>
         <artifactId>brapi</artifactId>
-        <version>2.1.0</version>
+        <version>2.1-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/brapi-java-model/pom.xml b/brapi-java-model/pom.xml
index 4cbb5501..06b5bc37 100644
--- a/brapi-java-model/pom.xml
+++ b/brapi-java-model/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.brapi</groupId>
         <artifactId>brapi</artifactId>
-        <version>2.1.0</version>
+        <version>2.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 324c10b0..030e53a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
   <groupId>org.brapi</groupId>
   <artifactId>brapi</artifactId>
-  <version>2.1.0</version>
+  <version>2.1-SNAPSHOT</version>
 
   <name>brapi</name>
   <url>http://www.breedinginsight.org</url>